更新鄱阳湖现场问提

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

@@ -43,5 +43,5 @@ public interface ContingencyPlanInstanceMapper extends BaseMapper<ContingencyPla
 
     long countWater(@Param("bizOrgCode") String bizOrgCode);
 
-    Integer getPlanInstanceCountByCondition(@Param("category") String category, @Param("recordType") String recordType, @Param("batchNo") String batchNo);
+    Integer getPlanInstanceCountByCondition(@Param("category") String category, @Param("recordType") String recordType, @Param("batchNo") String batchNo, @Param("content") String content);
 }

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

@@ -157,7 +157,10 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         int count = repository.countByBatchNo(instanceNo);
         planInstance.setSort(++count);
         ContingencyPlanInstance contingencyPlanInstance = contingencyInstance.updateExtendColumn(planInstance);
-        Integer num = contingencyPlanInstanceMapper.getPlanInstanceCountByCondition(contingencyPlanInstance.getCategory(), contingencyPlanInstance.getRecordType(), contingencyPlanInstance.getBatchNo());
+        Integer num = contingencyPlanInstanceMapper.getPlanInstanceCountByCondition(contingencyPlanInstance.getCategory(),
+                contingencyPlanInstance.getRecordType(),
+                contingencyPlanInstance.getBatchNo(),
+                contingencyPlanInstance.getContent());
         ContingencyPlanInstance instance = new ContingencyPlanInstance();
         if (0 == num) {
             instance = this.repository.save(contingencyPlanInstance);

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

@@ -173,6 +173,9 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
 
     @Override
     public Object automaticExecutePoint(Integer index) {
+        if (index == null) {
+            return false;
+        }
         String json;
         try {
             json = IOUtils.toString(planStepResource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));

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

@@ -393,6 +393,19 @@
     <select id="getPlanInstanceCountByCondition" resultType="java.lang.Integer">
         select count(1) from
             contingency_plan_instance
-        where category = #{category} AND record_type = #{recordType} AND batch_no = #{batchNo} AND is_delete = 0
+        where
+            is_delete = 0
+            <if test="category!=null and category!=''">
+                AND category = #{category}
+            </if>
+            <if test="recordType!=null and recordType!=''">
+                AND record_type = #{recordType}
+            </if>
+            <if test="batchNo!=null and batchNo!=''">
+                AND batch_no = #{batchNo}
+            </if>
+            <if test="content!=null and content!=''">
+                AND content = #{content}
+            </if>
     </select>
 </mapper>
\ No newline at end of file