item：应急处置流程优化

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

@@ -502,8 +502,9 @@ public class ContingencyAction implements CustomerAction {
             this.sendcmd("optionarea", paramObj, result);
             ContingencyPlanInstance instance = contingencyInstance.getMessageById(contingencyPlanId);
             if (instance != null) {
-                ContingencyPlanInstance planInstance = contingencyInstance.updateExtendColumn(instance);
-                contingencyPlanInstanceMapper.updateMessageById(planInstance);
+//                ContingencyPlanInstance planInstance = contingencyInstance.updateExtendColumn(instance);
+                instance.setRoleCode(contingencyInstance.getPlanStepRoleCodeByButtonCode(buttonCode));
+                contingencyPlanInstanceMapper.updateMessageById(instance);
             }
 
             MessageVO messageVO = new MessageVO();

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -236,7 +237,13 @@ public class ContingencyPlanController extends BaseController {
     @ApiOperation(value = "获取预案状态")
     @RequestMapping(value = "/getPlanStatus", method = RequestMethod.GET)
     public ResponseModel getPlanStatus() {
-        return CommonResponseUtil2.success(contingencyPlanService.getPlanStatus());
+        return CommonResponseUtil2.success(CollectionUtils.isEmpty(contingencyPlanService.getPlanStatus()));
+    }
+
+    @ApiOperation(value = "获取执行预案序列号")
+    @RequestMapping(value = "/getPlanBatchNo", method = RequestMethod.GET)
+    public ResponseModel getPlanBatchNo() {
+        return CommonResponseUtil2.success(contingencyPlanService.getPlanBatchNo());
     }
 
     @ApiOperation(value = "获取当前登录人待处置任务及预案信息")

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

@@ -365,8 +365,8 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
                 contingencyPlanInstance.setContent(operateJson);
                 if (buttonState.equals("CONFIRM")) {
                     contingencyPlanInstance.setRunstate(true);
-                    ContingencyPlanInstance planInstance = contingencyInstance.updateExtendColumn(contingencyPlanInstance);
-                    BeanUtils.copyProperties(planInstance, contingencyPlanInstance);
+//                    ContingencyPlanInstance planInstance = contingencyInstance.updateExtendColumn(contingencyPlanInstance);
+//                    BeanUtils.copyProperties(planInstance, contingencyPlanInstance);
                     String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
                     webMqttComponent.publish(topic, "应急处置执行任务完成提醒");
                 }
@@ -455,13 +455,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.getme();
         AgencyUserModel user = (AgencyUserModel) feignClientResult.getResult();
 
-        String json = "";
-        try {
-            json = IOUtils.toString(planStepResource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            throw new RuntimeException("获取预案相关角色信息失败！");
-        }
-        List<PlanStepJsonVO> result = JSONObject.parseArray(json, PlanStepJsonVO.class);
+        List<PlanStepJsonVO> result = getPlanStepJsonVOS();
         List<String> roleCode = result.stream().map(PlanStepJsonVO::getRoleCode).distinct().collect(Collectors.toList());
 
         List<RoleModel> roleModelList = new ArrayList<>();
@@ -490,6 +484,17 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
         return contingencyPlanInstance;
     }
 
+    private List<PlanStepJsonVO> getPlanStepJsonVOS() {
+        String json = "";
+        try {
+            json = IOUtils.toString(planStepResource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException("获取预案相关角色信息失败！");
+        }
+        List<PlanStepJsonVO> result = JSONObject.parseArray(json, PlanStepJsonVO.class);
+        return result;
+    }
+
     private void sendPlanAlarm(String batchNo, String buttonCode) {
         //确警后推送报警数据
     	List<FirePlanAlarmBo> list = new ArrayList<FirePlanAlarmBo>();
@@ -550,4 +555,16 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
     public ContingencyPlanInstance getMessageById(String id) {
         return contingencyPlanInstanceMapper.getMessageById(id);
     }
+
+    @Override
+    public String getPlanStepRoleCodeByButtonCode(String buttonCode) {
+        if (StringUtils.isNotBlank(buttonCode)) {
+            List<PlanStepJsonVO> result = getPlanStepJsonVOS();
+            List<PlanStepJsonVO> collect = result.stream().filter(x -> buttonCode.equalsIgnoreCase(x.getButtonCode())).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(collect)) {
+                return collect.get(0).getRoleCode();
+            }
+        }
+        return null;
+    }
 }

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

@@ -841,8 +841,18 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     }
 
     @Override
-    public Boolean getPlanStatus() {
-        return CollectionUtils.isEmpty(planOperationRecordDao.findByStatus(0));
+    public List<PlanOperationRecord> getPlanStatus() {
+        return planOperationRecordDao.findByStatus(0);
+//        return CollectionUtils.isEmpty(planOperationRecordDao.findByStatus(0));
+    }
+
+    @Override
+    public String getPlanBatchNo() {
+        List<PlanOperationRecord> records = planOperationRecordDao.findByStatus(0);
+        if (!CollectionUtils.isEmpty(records)) {
+            return records.get(0).getBatchNo();
+        }
+        return "";
     }
 
     @Override

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

@@ -38,4 +38,11 @@ public interface IContingencyInstance {
      * @return
      */
     ContingencyPlanInstance getMessageById(String id);
+
+    /**
+     * 通过buttonCode获取执行角色编码
+     * @param buttonCode
+     * @return
+     */
+    String getPlanStepRoleCodeByButtonCode(String buttonCode);
 }

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.fas.business.vo.ContingencyPlanResponseVo;
 import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.dao.entity.PlanDetail;
+import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.transaction.annotation.Transactional;
@@ -136,7 +137,9 @@ public interface IContingencyPlanService {
 
     AtomicBoolean planReset();
 
-    Boolean getPlanStatus();
+    List<PlanOperationRecord> getPlanStatus();
 
     Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList);
+
+    String getPlanBatchNo();
 }