修复应急4.0预案卡片bug

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

@@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyPlanService;
 import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.vo.*;
+import com.yeejoin.amos.fas.common.enums.ContingencyPlanStatusEnum;
 import com.yeejoin.amos.fas.config.Permission;
+import com.yeejoin.amos.fas.core.enums.NumberEnum;
+import com.yeejoin.amos.fas.core.enums.ReserveEnum;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
 import com.yeejoin.amos.fas.core.util.ResponseModel;
+import com.yeejoin.amos.fas.dao.entity.PlanDetail;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
@@ -329,4 +333,10 @@ public class ContingencyPlanController extends BaseController {
         return CommonResponseUtil2.success(contingencyPlanService.getPlanInfo(planId));
     }
 
+    @ApiOperation(value = "获取当前预案信息")
+    @GetMapping(value = "/plan/current")
+    public ResponseModel getPlanCurrentInfo() {
+        return CommonResponseUtil2.success(contingencyPlanService.getPlanCurrentInfo());
+    }
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -148,4 +148,6 @@ public interface IContingencyPlanService {
     Page<ContingencyPlanInstanceVO> selectTaskActionPage(int current, int size, String batchNo, String runState, String updateDate, List<String> roleList, List<String> steps);
 
     Map<String, Object> getPlanInfo(Long planId);
+
+    Map<String, Object> getPlanCurrentInfo();
 }

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

@@ -38,4 +38,6 @@ public class PlanDetailVo extends PlanDetail {
 
     private String zid;
 
+    private String category;
+
 }

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

@@ -84,6 +84,8 @@
     , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
     , (SELECT count(1) FROM c_plan_operation_record cpor WHERE plan_id = cpd.id) executionTimes
     ,fpp.picture
+    , (CASE WHEN c.category='1850' OR c.category='1830' OR c.category='1831' OR c.category='1832' OR c.category='1833' THEN '换流变'
+        WHEN c.category='1851' THEN '主变' WHEN c.category='1852' THEN '高抗' ELSE '换流变' END) AS category
     FROM
     c_plan_detail cpd
     left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0

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

@@ -108,30 +108,13 @@
     }
   },
   {
-    "buttonCode": "DRAIN_OIL_CONFIRM",
-    "checkYesOrNo": "",
-    "index": 5,
-    "isAuto": 0,
-    "isParallel": "0",
-    "outAndOr": "and",
-    "roleCode": "Digital_Responsing_Plan_A",
-    "showLine": false,
-    "stepCode": "5",
-    "stepName": "启动应急排油",
-    "stepStatus": "0",
-    "time": "",
-    "videos": {
-
-    }
-  },
-  {
     "buttonCode": "START_TURBOFAN_ROBOT",
     "checkYesOrNo": "",
-    "index": 6,
+    "index": 5,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "6",
+    "stepCode": "5",
     "stepName": "启动CAFS举高灭火机器人",
     "stepStatus": "0",
     "time": "",
@@ -142,11 +125,11 @@
   {
     "buttonCode": "APPLY_FOR_OVERHAUL",
     "checkYesOrNo": "",
-    "index": 7,
+    "index": 6,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_A",
     "showLine": false,
-    "stepCode": "7",
+    "stepCode": "6",
     "stepName": "申请调检修",
     "stepStatus": "0",
     "time": "",
@@ -194,11 +177,11 @@
   {
     "buttonCode": "OFF_POWER",
     "checkYesOrNo": "",
-    "index": 8,
+    "index": 7,
     "isParallel": "1",
     "roleCode": "Digital_Responsing_Plan_A",
     "showLine": false,
-    "stepCode": "8",
+    "stepCode": "7",
     "stepName": "断开交、直流电源",
     "stepStatus": "0",
     "time": "",
@@ -209,11 +192,11 @@
   {
     "buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
     "checkYesOrNo": "",
-    "index": 9,
+    "index": 8,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "9",
+    "stepCode": "8",
     "stepName": "执行转检修操作",
     "stepStatus": "0",
     "time": "",
@@ -224,11 +207,11 @@
   {
     "buttonCode": "PLUG_CABLETRENCH",
     "checkYesOrNo": "",
-    "index": 10,
+    "index": 9,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "10",
+    "stepCode": "9",
     "stepName": "电缆沟封堵",
     "stepStatus": "0",
     "time": "",
@@ -239,11 +222,11 @@
   {
     "buttonCode": "HANDOVER_FIGTHHING",
     "checkYesOrNo": "",
-    "index": 11,
+    "index": 10,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "11",
+    "stepCode": "10",
     "stepName": "政府消防队指挥权交接",
     "stepStatus": "0",
     "time": "",
@@ -254,11 +237,11 @@
   {
     "buttonCode": "FIRE_EXTINCT",
     "checkYesOrNo": "",
-    "index": 12,
+    "index": 11,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "12",
+    "stepCode": "11",
     "stepName": "确认明火扑灭，确认着火设备温度降为环境温度",
     "stepStatus": "0",
     "time": "",
@@ -269,11 +252,11 @@
   {
     "buttonCode": "ACCIDENT_REPORT",
     "checkYesOrNo": "",
-    "index": 13,
+    "index": 12,
     "isParallel": "0",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "13",
+    "stepCode": "12",
     "stepName": "检查现场情况，汇报调度",
     "stepStatus": "0",
     "time": "",
@@ -284,11 +267,11 @@
   {
     "buttonCode": "END_EMERGENCY",
     "checkYesOrNo": "",
-    "index": 14,
+    "index": 13,
     "isParallel": "1",
     "roleCode": "Digital_Responsing_Plan_B",
     "showLine": false,
-    "stepCode": "14",
+    "stepCode": "13",
     "stepName": "退出预案",
     "stepStatus": "0",
     "time": "",