预案智能辅助

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

@@ -29,6 +29,7 @@ import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.util.CacheFactory;
 import com.yeejoin.amos.fas.business.util.CacheMap;
+import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.common.enums.ContingencyPlanStatusEnum;
 import com.yeejoin.amos.fas.common.enums.PlanRecordStatusEnum;
@@ -442,6 +443,7 @@ public class ContingencyAction implements CustomerAction {
         tempmap1.put("content", content);
         tempmap1.put("image", image);
         tempmap1.put("table", table);
+        iContingencyInstance.createInstanceRecord(contingencyRo.getBatchNo(), "", "DEFAULT", /*JSONObject.toJSONString(tempmap1)*/JSONUtil.toJson(tempmap1), "HELPAREA", "");
 //        tempmap1.put("batchNo", contingencyRo.getBatchNo());
 //        tempmap1.put("contingencyRo", contingencyRo);
         result.add(tempmap1);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyPlanInstanceRepository.java

@@ -72,7 +72,7 @@ public interface IContingencyPlanInstanceRepository extends BaseDao<ContingencyP
     List<Map<String, Object>> queryRecord(String batchNo, String recordType);
 
     @Query(value = "SELECT " +
-            " t.content stepName, t.create_date time" +
+            " t.content stepName" +
             " FROM " +
             " contingency_plan_instance t" +
             " WHERE" +
@@ -80,5 +80,5 @@ public interface IContingencyPlanInstanceRepository extends BaseDao<ContingencyP
             " AND t.record_type = ?" +
             " ORDER BY" +
             " t.create_date DESC limit 1", nativeQuery = true)
-    List<Map<String, Object>> queryRecordOne(String batchNo, String recordType);
+    String queryRecordOne(String batchNo, String recordType);
 }

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 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.JSONUtil;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
@@ -291,14 +292,13 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Override
     public ToipResponse getPlaneRecordOneByBatchNo(String batchNo) {
         // 根据批次号获取预案记录
-        List<Map<String, Object>> instancesList = contingencyPlanInstanceRepository.queryRecordOne(batchNo, "MESSAGE");
+        String instances = contingencyPlanInstanceRepository.queryRecordOne(batchNo, "HELPAREA");
         ToipResponse toipResponse = new ToipResponse();
-        if (!ObjectUtils.isEmpty(instancesList)) {
-            Map<String, Object> msgContext = new HashMap<>(1);
-            msgContext.put("content", instancesList);
+        if (StringUtil.isNotEmpty(instances)) {
+            Map<String, Object> stringObjectMap = JSONUtil.toMap(instances);
             ContingencyOriginalData contingencyOriginalData = contingencyOriginalDataDao.findByBatchNo(batchNo);
-            toipResponse.setMsgType("recordarea");
-            toipResponse.setMsgContext(msgContext);
+            toipResponse.setMsgType("helparea");
+            toipResponse.setMsgContext(stringObjectMap);
             toipResponse.setContingency(contingencyOriginalData);
         }
         return toipResponse;