任务 14551

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

@@ -52,8 +52,6 @@ public class BigScreenController extends AbstractBaseController {
     @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 = "系统、消防水池、工业水池、水源总容积、消防车辆")
@@ -116,8 +114,8 @@ public class BigScreenController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
-                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
+                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -127,7 +125,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(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("false"))).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

@@ -62,8 +62,6 @@ public class ConfigureController extends AbstractBaseController {
     @Value("${equipment.pressurepump.start}")
     private String pressurePumpStart;
 
-    @Value("${equipment.pressurepump.stop}")
-    private String pressurePumpStop;
 
     @Value("${stationCode}")
     private String stationCode;
@@ -334,8 +332,8 @@ public class ConfigureController extends AbstractBaseController {
             ResponseModel entity1 = null;
             ResponseModel entity2 = null;
             try {
-                entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
-                entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
+                entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -345,7 +343,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(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("false"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("startAndStopNum", num);
             }
@@ -395,8 +393,8 @@ public class ConfigureController extends AbstractBaseController {
                 ResponseModel entity1 = null;
                 ResponseModel entity2 = null;
                 try {
-                    entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
-                    entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStop);
+                    entity1 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "true", pressurePumpStart);
+                    entity2 = iotFeign.selectListNew(getAppKey(), getProduct(), getToken(),iotCode, startDateStr, nowStrLong,  "false", pressurePumpStart);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -406,7 +404,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(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStop) && t.get(pressurePumpStop).equals("true"))).collect(Collectors.toList());
+                    List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true")) || (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("false"))).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

@@ -58,8 +58,6 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @Value("${equipment.pressurepump.start}")
     private String pressurePumpStart;
 
-    @Value("${equipment.pressurepump.stop}")
-    private String pressurePumpStop;
 
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -245,10 +245,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${equipment.pressurepump.start}")
     private String pressurePumpStart;
 
-    @Value("${equipment.pressurepump.stop}")
-    private String pressurePumpStop;
-
-
 
     @Value("${emergency.disposal.indicators}")
     private String emergencyDisposalIndicators;

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -116,8 +116,7 @@ equipment.scrap.cron=0 0 9 * * ?
 
 # 稳压泵启动信号
 equipment.pressurepump.start=FHS_PressurePump_Start
-# 稳压泵停止信号
-equipment.pressurepump.stop=FHS_PressurePump_Stop
+
 
 # 站端标识
 state.code=GW190301