对接设备接口+人员管理增加筛选条件

src/main/java/com/sky/ioc/controller/person/PersonController.java

@@ -30,36 +30,38 @@ public class PersonController {
             @ApiImplicitParam(name = "deptName", value = "部门", dataType = "String"),
             @ApiImplicitParam(name = "type", value = "人员类型", dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "人员状态", dataType = "Integer"),
-            @ApiImplicitParam(name = "page", value = "页码",defaultValue="1", dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页大小", defaultValue="10",dataType = "Integer")
+            @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String"),
+            @ApiImplicitParam(name = "page", value = "页码", defaultValue = "1", dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页大小", defaultValue = "10", dataType = "Integer")
     })
     @GetMapping(value = "/getPersonList")
     public ReturnMsg getPersonList(@RequestParam(name = "name", required = false) String name,
-                                @RequestParam(name = "companyName", required = false) String companyName,
-                                @RequestParam(name = "deptName", required = false) String deptName,
-                                @RequestParam(name = "type", required = false) Integer type,
-                                @RequestParam(name = "status", required = false) Integer status,
-                                @RequestParam(name = "page", required = false,defaultValue = "1") Integer page,
-                                @RequestParam(name = "pageSize", required = false,defaultValue = "10") Integer pageSize) {
-        return  personService.pageList(name,companyName,deptName,type,status,page,pageSize);
+                                   @RequestParam(name = "companyName", required = false) String companyName,
+                                   @RequestParam(name = "deptName", required = false) String deptName,
+                                   @RequestParam(name = "type", required = false) Integer type,
+                                   @RequestParam(name = "status", required = false) Integer status,
+                                   @RequestParam(name = "phone", required = false) String phone,
+                                   @RequestParam(name = "page", required = false, defaultValue = "1") Integer page,
+                                   @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return personService.pageList(name, companyName, deptName, type, status,phone, page, pageSize);
     }
 
     @ApiOperation("新建人员")
     @PostMapping(value = "/addPerson")
     public ReturnMsg addIndex(@RequestBody Person person) {
-        return  personService.addPerson(person);
+        return personService.addPerson(person);
     }
 
     @ApiOperation("编辑人员")
     @PostMapping(value = "/editPerson")
     public ReturnMsg editIndex(@RequestBody Person person) {
-        return  personService.editPerson(person);
+        return personService.editPerson(person);
     }
 
     @ApiOperation("删除人员")
     @PostMapping(value = "/delPerson")
     public ReturnMsg delIndex(@RequestParam(name = "id", required = true) Integer id) {
-        return  personService.delPersonById(id);
+        return personService.delPersonById(id);
     }
 
     @ApiOperation("批量删除人员")

src/main/java/com/sky/ioc/controller/security/EnergyDeviceController.java

@@ -0,0 +1,46 @@
+package com.sky.ioc.controller.security;
+
+import com.sky.ioc.service.energy.EnergyDeviceService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "智慧安防--智能源")
+@Slf4j
+@RequestMapping("/security_camera")
+@RestController
+public class EnergyDeviceController {
+
+    @Autowired
+    EnergyDeviceService energyDeviceService;
+
+    @ApiOperation("空调设备开关")
+    @PostMapping("/controlAirCondition")
+    public ReturnMsg controlAirCondition(@RequestParam(name = "deviceId", required = true) Integer deviceId,
+                                         @RequestParam(name = "temperature", required = true) Double temperature,
+                                         @RequestParam(name = "speed", required = true) Double speed,
+                                         @RequestParam(name = "mode", required = true) Integer mode) {
+        return energyDeviceService.openControlAirCondition(deviceId,temperature,speed,mode);
+    }
+
+    @ApiOperation("热水器设备开关")
+    @PostMapping("/openWaterHeater")
+    public ReturnMsg openWaterHeater(@RequestParam(name = "deviceId", required = true) Integer deviceId,
+                                     @RequestParam(name = "open", required = true) Integer open) {
+        return energyDeviceService.openWaterHeater(deviceId,open);
+    }
+
+    @ApiOperation("灯光设备开关")
+    @PostMapping("/openLight")
+    public ReturnMsg openLight(@RequestParam(name = "deviceId", required = true) Integer deviceId,
+                                     @RequestParam(name = "open", required = true) Integer open) {
+        return energyDeviceService.openControlLight(deviceId,open);
+    }
+
+}

src/main/java/com/sky/ioc/mapper/person/PersonMapper.java

@@ -41,11 +41,15 @@ public interface PersonMapper extends BaseMapper<Person> {
             "<if test='status!=null and status>=0 '>" +
             " and status = #{status} " +
             "</if>" +
+            "<if test='phone!=null and phone!=\"\" '>" +
+            " and phone like #{phone} " +
+            "</if>" +
             "ORDER BY id " +
             "</script>")
     List<Person> pageList(@Param("name") String name,
                           @Param("companyName") String companyName,
                           @Param("deptName") String deptName,
                           @Param("type") Integer type,
-                          @Param("status") Integer status);
+                          @Param("status") Integer status,
+                          @Param("phone")String phone);
 }

src/main/java/com/sky/ioc/service/energy/EnergyDeviceService.java

@@ -6,5 +6,9 @@ public interface EnergyDeviceService {
 
     ReturnMsg getDeviceList();
 
-    ReturnMsg OpenWaterHeater(Integer deviceId,Integer open);
+    ReturnMsg openWaterHeater(Integer deviceId,Integer open);
+
+    ReturnMsg openControlAirCondition(Integer deviceId,Double temperature,Double speed,Integer mode);
+
+    ReturnMsg openControlLight(Integer deviceId,Integer open);
 }

src/main/java/com/sky/ioc/service/energy/impl/EnergyDeviceServiceImpl.java

@@ -38,6 +38,11 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService {
     final static  String ENERGTY_DEVICE_URL="/api/energy/ENERGY/device/list?pageNum=1&pageSize=1000";
 
     final static  String WATER_HEATER_URL="/api/energy/ENERGY/device/controlWaterHeater";
+
+    final static  String CONTROLAIRCONDITION_URL="/api/energy/ENERGY/device/controlAirCondition";
+
+    final static  String LIGHT_URL="/api/energy/ENERGY/device/controlLight";
+
     @Override
     public ReturnMsg getDeviceList() {
         // 创建RestTemplate
@@ -83,11 +88,11 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService {
     }
 
     @Override
-    public ReturnMsg OpenWaterHeater(Integer deviceId, Integer open) {
+    public ReturnMsg openWaterHeater(Integer deviceId, Integer open) {
         // 创建RestTemplate
         RestTemplate restTemplate = restTemplateConfig.build();
         // 发送GET请求
-        String url = restTemplateConfig.addBaseUrl(WATER_HEATER_URL+"?deviceId="+deviceId+"&open="+open);
+        String url = restTemplateConfig.addBaseUrl(CONTROLAIRCONDITION_URL+"?deviceId="+deviceId+"&open="+open);
         ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
         // 获取响应对象里的 body 对象
         Map<String, Object> body = responseEntity.getBody();
@@ -96,10 +101,51 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService {
         // 获取响应信息
         String message = (String)body.get("msg");
         if(code==200){
+            return ReturnMsg.ok();
+        }else{
+            log.info("热水器操作失败："+message);
+            return ReturnMsg.fail(message);
+        }
+    }
 
+    @Override
+    public ReturnMsg openControlAirCondition(Integer deviceId, Double temperature, Double speed, Integer mode) {
+        // 创建RestTemplate
+        RestTemplate restTemplate = restTemplateConfig.build();
+        // 发送GET请求
+        String url = restTemplateConfig.addBaseUrl(WATER_HEATER_URL+"?deviceId="+deviceId+"&temperature="+temperature+"&speed="+speed+"&mode="+mode);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
+        // 获取响应对象里的 body 对象
+        Map<String, Object> body = responseEntity.getBody();
+        // 获取状态码
+        Integer code = (Integer)body.get("code");
+        // 获取响应信息
+        String message = (String)body.get("msg");
+        if(code==200){
             return ReturnMsg.ok();
         }else{
-            log.info("获取能源设备数据："+message);
+            log.info("空调操作失败："+message);
+            return ReturnMsg.fail(message);
+        }
+    }
+
+    @Override
+    public ReturnMsg openControlLight(Integer deviceId, Integer open) {
+        // 创建RestTemplate
+        RestTemplate restTemplate = restTemplateConfig.build();
+        // 发送GET请求
+        String url = restTemplateConfig.addBaseUrl(LIGHT_URL+"?deviceId="+deviceId+"&open="+open);
+        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
+        // 获取响应对象里的 body 对象
+        Map<String, Object> body = responseEntity.getBody();
+        // 获取状态码
+        Integer code = (Integer)body.get("code");
+        // 获取响应信息
+        String message = (String)body.get("msg");
+        if(code==200){
+            return ReturnMsg.ok();
+        }else{
+            log.info("照明设备操作失败："+message);
             return ReturnMsg.fail(message);
         }
     }

src/main/java/com/sky/ioc/service/person/PersonService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface PersonService {
 
-    ReturnMsg pageList(String name,String companyName,String deptName,Integer type,Integer status,Integer page,Integer pageSize);
+    ReturnMsg pageList(String name,String companyName,String deptName,Integer type,Integer status,String phone,Integer page,Integer pageSize);
 
     ReturnMsg addPerson(Person person);
 

src/main/java/com/sky/ioc/service/person/impl/PersonServiceImpl.java

@@ -23,7 +23,7 @@ public class PersonServiceImpl implements PersonService {
 
 
     @Override
-    public ReturnMsg pageList(String name,String companyName,String deptName,Integer type,Integer status,Integer page,Integer pageSize) {
+    public ReturnMsg pageList(String name,String companyName,String deptName,Integer type,Integer status,String phone,Integer page,Integer pageSize) {
         PageHelper.startPage(page,pageSize);
         if(StringUtils.isNotBlank(name)){
             name ="%"+name+"%";
@@ -34,7 +34,10 @@ public class PersonServiceImpl implements PersonService {
         if(StringUtils.isNotBlank(deptName)){
             deptName ="%"+deptName+"%";
         }
-        List<Person> lists = personMapper.pageList(name,companyName,deptName,type,status);
+        if(StringUtils.isNotBlank(phone)){
+            phone ="%"+phone+"%";
+        }
+        List<Person> lists = personMapper.pageList(name,companyName,deptName,type,status,phone);
         return ReturnMsg.ok(new PageInfo<>(lists));
     }