item：火灾概况故障区域bug修改

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

@@ -102,4 +102,7 @@ public class ContingencyRo implements Serializable {
    
     @Label("是否模拟数据")
 	private Boolean isMock;
+
+    @Label("位置")
+	private String position;
 }

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.fas.business.service.model.Operate;
 import com.yeejoin.amos.fas.business.service.model.OperateGroup;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.vo.ButtonJsonVO;
+import com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.common.enums.PlanReplyMessageEnum;
@@ -233,6 +234,12 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
             ContingencyRo contingencyRo = new ContingencyRo();
             contingencyRo.setButtonCode(buttonCode);
             contingencyRo.setButtonState(buttonState);
+
+            ContingencyInstanceInfoVO infoVO = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
+            if (!ObjectUtils.isEmpty(infoVO.getPosition())) {
+                contingencyOriginalData.setPosition(infoVO.getPosition());
+            }
+
             BeanUtils.copyProperties(contingencyOriginalData, contingencyRo);
             contingencyRo.setStep(stepCode);
             contingencyRo.setStepState(stepMap.get(stepKey));

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

@@ -121,6 +121,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
     @Autowired
     private FmeaMapper fmeaMapper;
 
+    @Autowired
+    private WarehouseStructureMapper warehouseStructureMapper;
+
     @Value("${station.name}")
     private String stationName;
 
@@ -549,6 +552,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         contingencyRo.setEquipmentOrgCode(equipment.getOrgCode());
         contingencyRo.getParams().put("equipmentId", equipment.getId());
         contingencyRo.setIsMock(isMock);
+        WarehouseStructure warehouseStructure = warehouseStructureMapper.getMessageById(equipmentSpecific.getWarehouseStructureId());
+        if (warehouseStructure != null) {
+            contingencyRo.setPosition(warehouseStructure.getName());
+        }
         //查询重点设备关联视频点位
         Map<String, Object> cameraInfo = impAndFireEquipMapper.queryCamera(String.valueOf(equipment.getId()));
         if (cameraInfo != null && !cameraInfo.isEmpty()) {