稳压泵bug

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

@@ -115,13 +115,14 @@ public class BigScreenController extends AbstractBaseController {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (200 == entity1.getStatus() && !ObjectUtils.isEmpty(entity1.getResult()) &&
-                    200 == entity2.getStatus() && !ObjectUtils.isEmpty(entity2.getResult())) {
+            if (200 == entity1.getStatus() && 200 == entity2.getStatus()) {
                 String json1 = JSON.toJSONString(entity1.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                String json2 = JSON.toJSONString(entity1.getResult());
+                String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
-                int num = listObject1.size() + listObject2.size();
+                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());
+                int num = collect.size();
                 item.put("startAndStopNum", num);
             }
             item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "1" : "0");

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

@@ -254,13 +254,14 @@ public class ConfigureController extends AbstractBaseController {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (200 == entity1.getStatus() && !ObjectUtils.isEmpty(entity1.getResult()) &&
-                    200 == entity2.getStatus() && !ObjectUtils.isEmpty(entity2.getResult())) {
+            if (200 == entity1.getStatus() && 200 == entity2.getStatus()) {
                 String json1 = JSON.toJSONString(entity1.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                String json2 = JSON.toJSONString(entity1.getResult());
+                String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
-                int num = listObject1.size() + listObject2.size();
+                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());
+                int num = collect.size();
                 item.put("startAndStopNum", num);
             }
             item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "正常" : "异常");
@@ -313,13 +314,14 @@ public class ConfigureController extends AbstractBaseController {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (200 == entity1.getStatus() && !ObjectUtils.isEmpty(entity1.getResult()) &&
-                    200 == entity2.getStatus() && !ObjectUtils.isEmpty(entity2.getResult())) {
+            if (200 == entity1.getStatus() && 200 == entity2.getStatus()) {
                 String json1 = JSON.toJSONString(entity1.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
-                String json2 = JSON.toJSONString(entity1.getResult());
+                String json2 = JSON.toJSONString(entity2.getResult());
                 List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
-                int num = listObject1.size() + listObject2.size();
+                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());
+                int num = collect.size();
                 item.put("startAndStopNum", num);
             }
             item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? "正常" : "异常");

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2651,6 +2651,7 @@
             wl_equipment_specific_index i
         WHERE
             i.equipment_specific_id = #{id,jdbcType=VARCHAR}
+            AND i.equipment_index_key in ('FHS_PressurePump_Start', 'FHS_PressurePump_Stop')
         ORDER BY
             i.update_date DESC
             LIMIT 1