修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentFireEquipmentServiceImpl.java

@@ -56,10 +56,10 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
     private static final String VALUE = "true";
 
     // 停运本极对端换流器
-    private static final int stepIndex = 9;
+//    private static final int stepIndex = 9;
 
     // 消防泵正常启动
-    private static final int pumpStepIndex = 7;
+//    private static final int pumpStepIndex = 7;
 
     @Autowired
     private IEquipmentFireEquipmentService equipmentFireEquipmentService;
@@ -172,7 +172,6 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
         }
         return false;
     }
-
     @Override
     public Object automaticExecutePoint(Integer index) {
         if (ObjectUtils.isEmpty(index)) {
@@ -191,20 +190,20 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
             String fireEquipId = String.valueOf(map.get("fireEquipId"));
             List<Long> fireEquipments = new ArrayList<>();
             // 若是停运本极对端换流器，则需查出本极对应的电力设备列表，暂用电力设备名称过滤出本极电力设备，注意此处的电力设备按照标准有两极（极I，极II）
-            if (stepIndex == index) {
-                Optional<Equipment> equipment = iEquipmentDao.findById(Long.valueOf(fireEquipId));
-                if (equipment.get() != null) {
-                    String fireEquipNamePrefix = equipment.get().getName().substring(0, 2);
-                    List<String> fireEquipIdList = equipmentSpecificMapper.getFireEquipIdsByNamePrefix(fireEquipNamePrefix);
-                    String[] strings = fireEquipIdList.toArray(new String[fireEquipIdList.size()]);
-                    // 获取消防设备id列表
-                    fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(strings);
-                }
-            } else {
-                String[] fireEquipIds = new String[]{fireEquipId};
-                // 获取消防设备id列表
-                fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(fireEquipIds);
-            }
+//            if (stepIndex == index) {
+//                Optional<Equipment> equipment = iEquipmentDao.findById(Long.valueOf(fireEquipId));
+//                if (equipment.get() != null) {
+//                    String fireEquipNamePrefix = equipment.get().getName().substring(0, 2);
+//                    List<String> fireEquipIdList = equipmentSpecificMapper.getFireEquipIdsByNamePrefix(fireEquipNamePrefix);
+//                    String[] strings = fireEquipIdList.toArray(new String[fireEquipIdList.size()]);
+//                    // 获取消防设备id列表
+//                    fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(strings);
+//                }
+//            } else {
+            String[] fireEquipIds = new String[]{fireEquipId};
+            // 获取消防设备id列表
+            fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(fireEquipIds);
+//            }
 
             PlanStepJsonVO vo = result.stream().filter(x -> x.getIndex() == index).collect(Collectors.toList()).get(0);
             List<ConditionVO> list = vo.getCondition();
@@ -232,11 +231,11 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
                         planMessageDao.save(message);
                     }
                 }
-                if (pumpStepIndex == index) {
-                    return 0 < resultSize;
-                } else {
-                    return (0 < resultSize && num == resultSize);
-                }
+//                if (pumpStepIndex == index) {
+//                    return 0 < resultSize;
+//                } else {
+                return (0 < resultSize && num == resultSize);
+//                }
             } else {
                 return false;
             }

YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-poyanghu.json

@@ -12,7 +12,7 @@
   },
   {
     "stepCode": "15",
-    "stepName": "全站广播通报火情",
+    "stepName": "全站广播通报火情、通知驻站消防队",
     "stepStatus": "0",
     "buttonCode": "ALL_STATION_PA",
     "isParallel": "1",
@@ -34,7 +34,7 @@
   },
   {
     "stepCode": "16",
-    "stepName": "停运起火换流器",
+    "stepName": "停运起火换流器、驻站消防队开始灭火",
     "stepStatus": "0",
     "buttonCode": "STOP_FIRE_TRANSVERTER",
     "isParallel": "0",