修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -44,6 +44,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -125,6 +126,7 @@ public class ContingencyAction implements CustomerAction {
     @Autowired
     private IPlanStepService planStepService;
 
+    @Lazy
     @Autowired
     private IEmergencyTaskService emergencyTaskService;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FileController.java

@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -234,10 +234,10 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             //更新模型状态
             PlanDetail planDetail = PlanDetailOp.get();
             planDetail.setStatus(vo.getStatus());
-            PlanDetail detail = planDetailDao.save(planDetail);
+            PlanDetail detail = planDetailDao.saveAndFlush(planDetail);
             //更新预案执行记录表的批次号
             operationRecord.setBatchNo(batchNo);
-            PlanOperationRecord record = planOperationRecordDao.save(operationRecord);
+            PlanOperationRecord record = planOperationRecordDao.saveAndFlush(operationRecord);
             // 保存预案基本信息
             instanceInfo.setId(batchNo);
             instanceInfo.setName(detail.getPlanName());

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

@@ -191,20 +191,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 {
+            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 +232,11 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
                         planMessageDao.save(message);
                     }
                 }
-//                if (pumpStepIndex == index) {
-//                    return 0 < resultSize;
-//                } else {
+                if (pumpStepIndex == index) {
+                    return 0 < resultSize;
+                } else {
                     return (0 < resultSize && num == resultSize);
-//                }
+                }
             } else {
                 return false;
             }

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

@@ -557,7 +557,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
         BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
         contingencyOriginalData.setFireEquipmentPosition(contingencyRo.getPosition());
-        iContingencyOriginalDataDao.save(contingencyOriginalData);
+        iContingencyOriginalDataDao.saveAndFlush(contingencyOriginalData);
  
         log.info("开始调用规则 参数 contingencyRo{},reservePlan{},equipmentNames" + contingencyRo.toString() + "," + equipment.getReservePlan() + "," + ArrayUtils.toArray(equipment.getName()));
         Object result = ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));

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

@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.media.jfxmedia.logging.Logger;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
@@ -20,7 +17,6 @@ import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanStepService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
-import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.*;
@@ -38,14 +34,13 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -127,6 +122,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Autowired
     JcsFeign jcsFeign;
 
+    @Lazy
     @Autowired
     private IEmergencyTaskService emergencyTaskService;
 

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -954,4 +954,17 @@
             ALTER TABLE `contingency_plan_instance` MODIFY COLUMN `category` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '一级分类' AFTER `record_type`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1682647357-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="c_emergency_relation" columnName="id" />
+            </not>
+        </preConditions>
+        <comment>c_emergency_relation</comment>
+        <sql>
+            ALTER TABLE `c_emergency_relation` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file