稳压泵启停查询iot字段更改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +49,11 @@ public class BigScreenController extends AbstractBaseController {
     @Autowired
     private IotFeign iotFeign;
 
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
+    @Value("${equipment.pressurepump.stop}")
+    private String pressurePumpStop;
     @GetMapping(value = "/list")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "系统、消防水池、工业水池、水源总容积、消防车辆(接口弃用)", notes = "系统、消防水池、工业水池、水源总容积、消防车辆")
@@ -110,8 +116,8 @@ public class BigScreenController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Stop");
+                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
+                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -121,7 +127,7 @@ public class BigScreenController extends AbstractBaseController {
                 String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
                 listObject1.addAll(listObject2);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true")) || (t.containsKey("FHS_PressurePump_Stop") && t.get("FHS_PressurePump_Stop").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("startAndStopNum", num);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -47,6 +48,12 @@ public class ConfigureController extends AbstractBaseController {
     @Autowired
     private IotFeign iotFeign;
 
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
+    @Value("${equipment.pressurepump.stop}")
+    private String pressurePumpStop;
+
     @PersonIdentify
     @RequestMapping(value = "/alarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -283,8 +290,8 @@ public class ConfigureController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Stop");
+                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
+                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -294,7 +301,7 @@ public class ConfigureController extends AbstractBaseController {
                 String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
                 listObject1.addAll(listObject2);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true")) || (t.containsKey("FHS_PressurePump_Stop") && t.get("FHS_PressurePump_Stop").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("startAndStopNum", num);
             }
@@ -343,8 +350,8 @@ public class ConfigureController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Stop");
+                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
+                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -354,7 +361,7 @@ public class ConfigureController extends AbstractBaseController {
                 String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
                 listObject1.addAll(listObject2);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true")) || (t.containsKey("FHS_PressurePump_Stop") && t.get("FHS_PressurePump_Stop").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("startAndStopNum", num);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -50,6 +51,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @Autowired
     private ISupervisionVideoService supervisionVideoService;
 
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "监盘概览水源信息")
@@ -286,38 +290,38 @@ public class SupervisionConfigureController extends AbstractBaseController {
             ResponseModel twoHourEntity = null;
             ResponseModel fourHourEntity = null;
             try {
-                mounthEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                halfHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), half, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                twoHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), two, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
-                fourHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), four, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
+                mounthEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
+                halfHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), half, nowStrLong, prefix, suffix, pressurePumpStart);
+                twoHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), two, nowStrLong, prefix, suffix, pressurePumpStart);
+                fourHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), four, nowStrLong, prefix, suffix, pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }
             if (200 == mounthEntity.getStatus()) {
                 String json1 = JSON.toJSONString(mounthEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("monthStartNum", num);
             }
             if (200 == halfHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(halfHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("halfHourStartNum", num);
             }
             if (200 == twoHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(twoHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("twoHourStartNum", num);
             }
             if (200 == fourHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(fourHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("fourHourStartNum", num);
             }