删除无用代码

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

@@ -487,25 +487,25 @@ public class ContingencyAction implements CustomerAction {
         }
     }
 
-    private boolean sendButton(String batchNo, String contingencyPlanId, String equipmentId, String actionName, String buttonJson) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            Map button = objectMapper.readValue(buttonJson, Map.class);
-            Map operateInstance = (Map) ((List) button.get("operate")).get(0);
-            ContingencyDeviceStatus contingencyDeviceStatus = new ContingencyDeviceStatus();
-            contingencyDeviceStatus.setActionName(actionName);
-            contingencyDeviceStatus.setButtonCode(String.valueOf(operateInstance.get("code")));
-            contingencyDeviceStatus.setConfirm("CONFIRM");
-            contingencyDeviceStatus.setContingencyPlanId(contingencyPlanId);
-            contingencyDeviceStatus.setEquipmentId(equipmentId);
-            contingencyDeviceStatus.setStepCode(String.valueOf(button.get("stepCode")));
-            contingencyDeviceStatus.setStepState(String.valueOf(operateInstance.get("stepState")));
-            riskSourceService.queryContingencyDeviceStatus(contingencyDeviceStatus);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
+//    private boolean sendButton(String batchNo, String contingencyPlanId, String equipmentId, String actionName, String buttonJson) {
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        try {
+//            Map button = objectMapper.readValue(buttonJson, Map.class);
+//            Map operateInstance = (Map) ((List) button.get("operate")).get(0);
+//            ContingencyDeviceStatus contingencyDeviceStatus = new ContingencyDeviceStatus();
+//            contingencyDeviceStatus.setActionName(actionName);
+//            contingencyDeviceStatus.setButtonCode(String.valueOf(operateInstance.get("code")));
+//            contingencyDeviceStatus.setConfirm("CONFIRM");
+//            contingencyDeviceStatus.setContingencyPlanId(contingencyPlanId);
+//            contingencyDeviceStatus.setEquipmentId(equipmentId);
+//            contingencyDeviceStatus.setStepCode(String.valueOf(button.get("stepCode")));
+//            contingencyDeviceStatus.setStepState(String.valueOf(operateInstance.get("stepState")));
+//            riskSourceService.queryContingencyDeviceStatus(contingencyDeviceStatus);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//        return false;
+//    }
 
 
     /**

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

@@ -236,11 +236,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             instanceInfo.setId(batchNo);
             instanceInfo.setName(detail.getPlanName());
             instanceInfo.setOrgCode(detail.getOrgCode());
-
-            WarehouseStructure warehouseStructure = warehouseStructureMapper.getMessageByRiskId(equipmentSpecific.getId());
-            if (warehouseStructure != null) {
-                instanceInfo.setPosition(warehouseStructure.getName());
-            }
+            instanceInfo.setPosition(equipmentSpecific.getPosition());
+            
             contingencyInstanceInfoService.addDisposalDetails(instanceInfo);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);

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

@@ -552,41 +552,39 @@ 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());
-        }
+        contingencyRo.setPosition(equipmentSpecific.getPosition());
+       
         //查询重点设备关联视频点位
-        Map<String, Object> cameraInfo = impAndFireEquipMapper.queryCamera(String.valueOf(equipment.getId()));
-        if (cameraInfo != null && !cameraInfo.isEmpty()) {
-            contingencyRo.setCameraCodes(String.valueOf(cameraInfo.get("codes")));
-            contingencyRo.setCameraIds(String.valueOf(cameraInfo.get("ids")));
-        }
+//        Map<String, Object> cameraInfo = impAndFireEquipMapper.queryCamera(String.valueOf(equipment.getId()));
+//        if (cameraInfo != null && !cameraInfo.isEmpty()) {
+//            contingencyRo.setCameraCodes(String.valueOf(cameraInfo.get("codes")));
+//            contingencyRo.setCameraIds(String.valueOf(cameraInfo.get("ids")));
+//        }
 
         //查询重点设备关联消防炮
-        Map fireMonitorInfo = equipmentSpecificMapper.queryFireMonitor(String.valueOf(equipment.getId()), fireMonitor);
+//        Map fireMonitorInfo = equipmentSpecificMapper.queryFireMonitor(String.valueOf(equipment.getId()), fireMonitor);
 //        if (fireMonitorInfo != null && !fireMonitorInfo.isEmpty()) {
 //            contingencyRo.setFireMonitorCodes(String.valueOf(fireMonitorInfo.get("codes")));
 //            contingencyRo.setFireMonitorIds(String.valueOf(fireMonitorInfo.get("ids")));
 //        }
 
-        List<PreplanPicture> pictures = iPreplanPictureDao.findByEquipmentId(Long.valueOf(equipment.getId()));
-        if (!CollectionUtils.isEmpty(pictures)) {
-            for (PreplanPicture picture : pictures) {
-                if (1 == picture.getType()) {
-                    contingencyRo.setPicture1(picture.getPicture());
-                }
-                if (2 == picture.getType()) {
-                    contingencyRo.setPicture2(picture.getPicture());
-                }
-                if (3 == picture.getType()) {
-                    contingencyRo.setPicture3(picture.getPicture());
-                }
-                if (4 == picture.getType()) {
-                    contingencyRo.setPicture4(picture.getPicture());
-                }
-            }
-        }
+//        List<PreplanPicture> pictures = iPreplanPictureDao.findByEquipmentId(Long.valueOf(equipment.getId()));
+//        if (!CollectionUtils.isEmpty(pictures)) {
+//            for (PreplanPicture picture : pictures) {
+//                if (1 == picture.getType()) {
+//                    contingencyRo.setPicture1(picture.getPicture());
+//                }
+//                if (2 == picture.getType()) {
+//                    contingencyRo.setPicture2(picture.getPicture());
+//                }
+//                if (3 == picture.getType()) {
+//                    contingencyRo.setPicture3(picture.getPicture());
+//                }
+//                if (4 == picture.getType()) {
+//                    contingencyRo.setPicture4(picture.getPicture());
+//                }
+//            }
+//        }
 
         // 获取遥信指标,暂不处理    code = 设备编码iot_code-指标项name_key
 //        List<Map> points = fireEquipPointMapper.getPointsByEquipmentIdAndType(equipment.getId(), "SWITCH");//物联属性指标 and 为true或false

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificForRiskVo.java

@@ -62,4 +62,7 @@ public class EquipmentSpecificForRiskVo {
     
     @ApiModelProperty(value = "设备类型编码")
     private String equipmentCode = "";
+    
+    @ApiModelProperty(value = "位置")
+    private String position = "";
 }

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

@@ -221,7 +221,8 @@
             wes.org_code as orgCode,
 			wes.equipment_code as equipmentCode,
 			wes.warehouse_structure_id,
-			IF(substr(wes.equipment_code ,1,4) = '9204','true','false') as push3D
+			IF(substr(wes.equipment_code ,1,4) = '9204','true','false') as push3D,
+			wes.position
         from
             wl_equipment_specific wes
         left join