修改火情概况卡片接口

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyOriginalData.java

@@ -94,6 +94,20 @@ public class ContingencyOriginalData extends BusinessEntity {
     @Column(name = "step_state")
     private String stepState;//步骤的操作状态，由所有按钮的步骤状态拼接而成
 
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    /**
+     * 位置
+     */
+    @Transient
+    private String position;
+
 
     public String getEquipmentPosition3d() {
         return equipmentPosition3d;

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.fas.business.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -355,6 +357,10 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
             Map<String, Object> msgContext = new HashMap<>(1);
             msgContext.put("content", instancesList);
             ContingencyOriginalData contingencyOriginalData = contingencyOriginalDataDao.findByBatchNo(batchNo);
+            ContingencyInstanceInfoVO infoVO = contingencyInstanceInfoMapper.selectDisposalDetails(batchNo);
+            if (!ObjectUtils.isEmpty(infoVO.getPosition())) {
+                contingencyOriginalData.setPosition(infoVO.getPosition());
+            }
             toipResponse.setMsgType("recordarea");
             toipResponse.setMsgContext(msgContext);
             toipResponse.setContingency(contingencyOriginalData);