更新

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EquipmentSpecificIndexMapper.java

@@ -26,4 +26,6 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
     Map<String, Object> countEquipIndexAndValueOfNum(@Param("list") List<Long> equipSpecificIdList, @Param("equipCodes") String[] equipCodes, @Param("equipSpeCodes") String[] equipSpeCodes, @Param("indexKeys") String[] indexKeys, @Param("value") String value);
 
     List<PlanMessage> getEquipIndexAndValue(@Param("list") List<ConditionVO> list, @Param("fireEquipments") List<Long> fireEquipments, @Param("outAndOr") String outAndOr);
+
+    int countEquipIndexAndValueNum(@Param("list") List<ConditionVO> list, @Param("fireEquipments") List<Long> fireEquipments, @Param("outAndOr") String outAndOr);
 }

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

@@ -2,13 +2,13 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificIndexMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanMessageMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPlanMessageDao;
-import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity;
 import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificIndexService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentFireEquipmentService;
 import com.yeejoin.amos.fas.business.vo.ConditionVO;
@@ -16,7 +16,6 @@ import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
 import com.yeejoin.amos.fas.common.enums.SqlKeyWordEnum;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
-import com.yeejoin.amos.fas.dao.entity.PlanDetail;
 import com.yeejoin.amos.fas.dao.entity.PlanMessage;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -53,8 +52,13 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
 
     private static final String TYPE = "or";
     private static final String VALUE = "true";
+
+    // 停运本极对端换流器
     private static final int stepIndex = 9;
 
+    // 消防泵正常启动
+    private static final int pumpStepIndex = 7;
+
     @Autowired
     private IEquipmentFireEquipmentService equipmentFireEquipmentService;
 
@@ -77,6 +81,9 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
     IPlanMessageDao planMessageDao;
 
     @Autowired
+    EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
+
+    @Autowired
     private EquipmentSpecificMapper equipmentSpecificMapper;
 
     @Value("classpath:/json/plan-step.json")
@@ -197,6 +204,10 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
             PlanStepJsonVO vo = result.stream().filter(x -> x.getIndex() == index).collect(Collectors.toList()).get(0);
             List<ConditionVO> list = vo.getCondition();
             if (!CollectionUtils.isEmpty(list)) {
+                // 获取符合条件的报文条数
+                int num = equipmentSpecificIndexMapper.countEquipIndexAndValueNum(list, fireEquipments, vo.getOutAndOr());
+
+                // 获取符合自动执行的报文数据并存储
                 List<PlanMessage> planMessages = equipmentSpecificIndexService.getEquipIndexAndValue(list, fireEquipments, vo.getOutAndOr());
                 int resultSize = planMessages.size();
                 if (0 < resultSize) {
@@ -210,7 +221,11 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
                     }).collect(Collectors.toList());
                     planMessageDao.saveAll(messages);
                 }
-                return 0 < resultSize;
+                if (pumpStepIndex == index) {
+                    return 0 < resultSize;
+                } else {
+                    return num == resultSize;
+                }
             } else {
                 return false;
             }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml

@@ -131,6 +131,39 @@
         </where>
     </select>
 
+    <select id="countEquipIndexAndValueNum" resultType="int">
+        SELECT
+            count(1)
+        FROM
+        `wl_equipment_specific_index` esi
+        LEFT JOIN wl_equipment_specific es ON esi.equipment_specific_id = es.id
+        LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
+        <where>
+            <choose>
+                <when test = "outAndOr != null and outAndOr != '' and outAndOr == 'and'">
+                    <if test="list != null and list.size() > 0">
+                        <foreach collection="list" item="item" index="index" open="(" close=")" separator="and">
+                            esi.equipment_index_key = #{item.equipSpeIndexKey}
+                        </foreach>
+                    </if>
+                </when>
+                <otherwise>
+                    <if test="list != null and list.size() > 0">
+                        <foreach collection="list" item="item" index="index" open="(" close=")" separator="or">
+                            esi.equipment_index_key = #{item.equipSpeIndexKey}
+                        </foreach>
+                    </if>
+                </otherwise>
+            </choose>
+            <if test="fireEquipments != null and fireEquipments.size() > 0">
+                AND esi.equipment_specific_id IN
+                <foreach collection="fireEquipments" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="getEquipIndexAndValue" resultType="com.yeejoin.amos.fas.dao.entity.PlanMessage">
         SELECT
             es.name AS equipName,