更新

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

@@ -6,29 +6,25 @@ import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo;
-import com.yeejoin.amos.fas.business.vo.EmergencyTaskContentVo;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelation;
 import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.data.domain.Page;
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.EmergencyTaskContent;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Controller
@@ -38,8 +34,11 @@ public class EmergencyTaskController extends BaseController{
 
     @Autowired
     JcsFeign jcsFeign;
+
+    @Lazy
     @Autowired
     IEmergencyTaskService iEmergencyTaskService;
+
     @Autowired
     private IDictService dictService;
 

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

@@ -2,10 +2,8 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.yeejoin.amos.fas.business.action.ContingencyAction;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
-import com.yeejoin.amos.fas.business.dao.mapper.ContingencyPlanInstanceMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository;
@@ -25,8 +23,6 @@ import com.yeejoin.amos.fas.dao.entity.EmergencyRelationTree;
 import com.yeejoin.amos.fas.dao.entity.EmergencyTaskContent;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
-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.data.domain.Page;
@@ -34,7 +30,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;

YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-shaoxing.json

@@ -74,7 +74,7 @@
     "stepName": "驻站消防队开始灭火",
     "stepStatus": "0",
     "buttonCode": "FIRETEAM_START_OUTFIRE",
-    "isParallel": "0",
+    "isParallel": "1",
     "roleCode": "Digital_Responsing_Plan_A",
     "index": 7,
     "checkYesOrNo": ""
@@ -82,7 +82,7 @@
   {
     "stepCode": "8",
     "stepName": "调整工业视频监视工业水池、现场火势情况",
-    "stepStatus": "0",
+    "stepStatus": "1",
     "buttonCode": "ADJUST_VIDEO_TO_POOL",
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_A",
@@ -173,7 +173,7 @@
     "stepName": "启动着火换流变排油装置",
     "stepStatus": "0",
     "buttonCode": "DRAIN_OIL_CONFIRM",
-    "isParallel": "0",
+    "isParallel": "1",
     "roleCode": "Digital_Responsing_Plan_A",
     "index": 13,
     "checkYesOrNo": "",
@@ -206,7 +206,7 @@
     "stepName": "驻站消防队指挥权交接",
     "stepStatus": "0",
     "buttonCode": "HANDOVER_COMMAND",
-    "isParallel": "1",
+    "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "index": 15,
     "checkYesOrNo": ""

YeeAmosFireAutoSysStart/src/main/resources/json/plan-step.json

@@ -11,7 +11,7 @@
   },
   {
     "stepCode": "1",
-    "stepName": "检查相应阀组是否停用、交流进线开关是否已跳开",
+    "stepName": "停运换流阀",
     "stepStatus": "0",
     "buttonCode": "STOP_COMMUTATION",
     "isParallel": "1",
@@ -21,39 +21,39 @@
   },
   {
     "stepCode": "2",
-    "stepName": "向各级领导、调度汇报火情",
+    "stepName": "拨打报警电话",
     "stepStatus": "0",
-    "buttonCode": "LEADER_REPORT_FIRE",
+    "buttonCode": "CALL_PHONE",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
+    "roleCode": "Digital_Responsing_Plan_A",
     "index": 2,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "3",
-    "stepName": "申请主控站转移、停用本级对端换流器",
+    "stepName": "确认油枕排油系统已开启",
     "stepStatus": "0",
-    "buttonCode": "STOP_LOCAL_END_TRANSVERTER",
+    "buttonCode": "DRAIN_OIL_CONFIRM",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
+    "roleCode": "Digital_Responsing_Plan_A",
     "index": 3,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "4",
-    "stepName": "通知专职消防队、值班领导或驻站检修负责人及保安人员",
+    "stepName": "确认水喷雾系统已开启",
     "stepStatus": "0",
-    "buttonCode": "NOTICE_STATION_ALL_PERSON",
+    "buttonCode": "OPEN_WATERSYSTEM",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
+    "roleCode": "Digital_Responsing_Plan_A",
     "index": 4,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "5",
-    "stepName": "拨打119火警电话、全站广播通报火情",
+    "stepName": "断开上级电源",
     "stepStatus": "0",
-    "buttonCode": "CALL_PHONE",
+    "buttonCode": "OFF_POWER",
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_A",
     "index": 5,
@@ -61,19 +61,19 @@
   },
   {
     "stepCode": "6",
-    "stepName": "起火换流器转检修",
+    "stepName": "停运阀厅空调系统",
     "stepStatus": "0",
-    "buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
+    "buttonCode": "STOP_AIRCON",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
+    "roleCode": "Digital_Responsing_Plan_A",
     "index": 6,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "7",
-    "stepName": "驻站消防队开始灭火",
+    "stepName": "一键开启消防炮",
     "stepStatus": "0",
-    "buttonCode": "FIRETEAM_START_OUTFIRE",
+    "buttonCode": "MONITOR_START",
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_A",
     "index": 7,
@@ -81,174 +81,72 @@
   },
   {
     "stepCode": "8",
-    "stepName": "调整工业视频监视工业水池、现场火势情况",
+    "stepName": "驻站消防队指挥权交接",
     "stepStatus": "0",
-    "buttonCode": "ADJUST_VIDEO_TO_POOL",
-    "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
+    "buttonCode": "HANDOVER_COMMAND",
+    "isParallel": "1",
+    "roleCode": "Digital_Responsing_Plan_B",
     "index": 8,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "9",
-    "stepName": "停运阀冷系统、阀厅空调系统",
+    "stepName": "确认本体排油已开启",
     "stepStatus": "0",
-    "buttonCode": "STOP_VALVE_COOL_SYS",
+    "buttonCode": "OWNER_DRAIN_OIL",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
+    "roleCode": "Digital_Responsing_Plan_B",
     "index": 9,
-    "checkYesOrNo": "",
-    "condition": [
-      {
-        "equipName": "AIRCS-风机",
-        "equipCode": "92230600UH244",
-        "equipSpeName": "",
-        "equipSpeCode": "",
-        "equipSpeIndexKey": "AIRCS_Fan_Start",
-        "standardValue": "false",
-        "inAndOr": "and"
-      }
-    ],
-    "outAndOr": "and",
-    "isAuto": 0
+    "checkYesOrNo": ""
   },
   {
     "stepCode": "10",
-    "stepName": "断开交直流电源",
+    "stepName": "启动阀厅应急预案",
     "stepStatus": "0",
-    "buttonCode": "OFF_POWER",
+    "buttonCode": "START_VALVE_HALL_CONTINGENCY",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
+    "roleCode": "Digital_Responsing_Plan_B",
     "index": 10,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "11",
-    "stepName": "确认水喷雾系统已开启",
+    "stepName": "电缆沟封堵",
     "stepStatus": "0",
-    "buttonCode": "OPEN_WATERSYSTEM",
+    "buttonCode": "PLUG_CABLETRENCH",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
+    "roleCode": "Digital_Responsing_Plan_B",
     "index": 11,
-    "checkYesOrNo": "",
-    "condition": [
-      {
-        "equipName": "雨淋阀",
-        "equipCode": "92130300BH644",
-        "equipSpeName": "",
-        "equipSpeCode": "",
-        "equipSpeIndexKey": "WSS_DelugeValve_Start",
-        "standardValue": "true",
-        "inAndOr": "and"
-      }
-    ],
-    "outAndOr": "and",
-    "isAuto": 0
+    "checkYesOrNo": ""
   },
   {
     "stepCode": "12",
-    "stepName": "开启换流变挑檐炮、广场涡扇炮",
+    "stepName": "政府消防队指挥权交接",
     "stepStatus": "0",
-    "buttonCode": "MONITOR_START",
+    "buttonCode": "HANDOVER_FIGTHHING",
     "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
+    "roleCode": "Digital_Responsing_Plan_B",
     "index": 12,
-    "condition": [
-      {
-        "equipName": "CAFS消防炮",
-        "equipCode": "92032200BUX44",
-        "equipSpeName": "",
-        "equipSpeCode": "",
-        "equipSpeIndexKey": "CAFS_GunValve_Open",
-        "standardValue": "true",
-        "inAndOr": "and"
-      }
-    ],
-    "outAndOr": "and",
-    "isAuto": 0,
     "checkYesOrNo": ""
   },
   {
     "stepCode": "13",
-    "stepName": "启动着火换流变排油装置",
-    "stepStatus": "0",
-    "buttonCode": "DRAIN_OIL_CONFIRM",
-    "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_A",
-    "index": 13,
-    "checkYesOrNo": "",
-    "condition": [
-      {
-        "equipName": "排油阀",
-        "equipCode": "92102700EBA44",
-        "equipSpeName": "",
-        "equipSpeCode": "",
-        "equipSpeIndexKey": "ONL_OilDischargeDeviceOilPillowDischargeOpen",
-        "standardValue": "true",
-        "inAndOr": "and"
-      }
-    ],
-    "outAndOr": "and",
-    "isAuto": 0
-  },
-  {
-    "stepCode": "14",
-    "stepName": "对阀侧套管、阀厅进行降温",
-    "stepStatus": "0",
-    "buttonCode": "COOL_SYS_COOL_DOWN",
-    "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
-    "index": 14,
-    "checkYesOrNo": ""
-  },
-  {
-    "stepCode": "15",
-    "stepName": "驻站消防队指挥权交接",
-    "stepStatus": "0",
-    "buttonCode": "HANDOVER_COMMAND",
-    "isParallel": "1",
-    "roleCode": "Digital_Responsing_Plan_B",
-    "index": 15,
-    "checkYesOrNo": ""
-  },
-  {
-    "stepCode": "16",
     "stepName": "确认明火扑灭",
     "stepStatus": "0",
     "buttonCode": "FIRE_EXTINCT",
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
-    "index": 16,
-    "checkYesOrNo": ""
-  },
-  {
-    "stepCode": "17",
-    "stepName": "确认无复燃情况",
-    "stepStatus": "0",
-    "buttonCode": "CONFIRM_REKINDLE",
-    "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
-    "index": 17,
-    "checkYesOrNo": ""
-  },
-  {
-    "stepCode": "18",
-    "stepName": "向各级领导、调度、指挥中心汇报已灭火",
-    "stepStatus": "0",
-    "buttonCode": "LEADER_REPORT_FIRE_EXTINCT",
-    "isParallel": "0",
-    "roleCode": "Digital_Responsing_Plan_B",
-    "index": 18,
+    "index": 13,
     "checkYesOrNo": ""
   },
   {
-    "stepCode": "19",
+    "stepCode": "14",
     "stepName": "应急处置结束",
     "stepStatus": "0",
     "buttonCode": "END_EMERGENCY",
     "isParallel": "1",
     "roleCode": "Digital_Responsing_Plan_B",
-    "index": 19,
+    "index": 14,
     "checkYesOrNo": ""
   }
 ]
\ No newline at end of file