item：完善预案信息执行统计结构

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
 import com.yeejoin.amos.fas.core.util.ResponseModel;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -238,4 +239,15 @@ public class ContingencyPlanController extends BaseController {
         return CommonResponseUtil2.success(contingencyPlanService.getPlanStatus());
     }
 
+    @ApiOperation(value = "获取当前登录人待处置任务及预案信息")
+    @RequestMapping(value = "/getUserOperateCountAndPlanName", method = RequestMethod.GET)
+    public ResponseModel getUserOperateCountAndPlanName() {
+        AgencyUserModel user = getUserInfo();
+        List<RoleModel> roleModelList = new ArrayList<>();
+        for (Long key : user.getOrgRoles().keySet()) {
+            roleModelList.addAll(user.getOrgRoles().get(key));
+        }
+        return CommonResponseUtil2.success(contingencyPlanService.getUserOperateCountAndPlanName(roleModelList));
+    }
+
 }

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
 import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -63,6 +64,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     private IEquipmentHandlerService equipmentHandlerService;
     @Autowired
     private IContingencyPlanInstanceRepository repository;
+    @Autowired
+    private IPlanVisual3dService planVisual3dService;
     @Qualifier("contingencyAction")
     @Autowired
     private CustomerAction customerAction;
@@ -820,4 +823,17 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         return CollectionUtils.isEmpty(planOperationRecordDao.findByStatus(0));
     }
 
+    @Override
+    public Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList) {
+        Map<String, Object> map = new HashMap<>();
+        List<PlanOperationRecord> recordList = planOperationRecordDao.findByStatus(0);
+        if (!CollectionUtils.isEmpty(recordList)) {
+            PlanOperationRecord record = recordList.get(0);
+            map.put("planName", record.getBatchNo());
+            List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(record.getBatchNo(), roleModelList, 1);
+            map.put("taskNum", list.size());
+        }
+        return map;
+    }
+
 }
\ No newline at end of file

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

@@ -6,11 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
-import com.yeejoin.amos.fas.business.dao.mapper.ContingencyInstanceInfoMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.DictMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.PlanVisual3dMapper;
-
 import com.yeejoin.amos.fas.business.dao.repository.*;
 import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
 import com.yeejoin.amos.fas.business.feign.PushFeign;
@@ -21,7 +16,6 @@ import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.util.StringUtil;
-import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
@@ -31,8 +25,6 @@ import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.io.IOUtils;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -82,7 +74,8 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Autowired
     private ContingencyInstanceInfoMapper contingencyInstanceInfoMapper;
 
-    @Autowired IContingencyPlanInstanceRepository iContingencyPlanInstanceRepository;
+    @Autowired
+    IContingencyPlanInstanceRepository iContingencyPlanInstanceRepository;
 
 
     @Autowired
@@ -486,11 +479,6 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                 roles.add(roleModel.getRoleName());
             }
         }
-//        else {
-//            // 当前预案全部动作
-//
-//        }
-
         int total = 0;
         if (ObjectUtils.isEmpty(status)) {
             total = contingencyInstanceInfoMapper.selectCountDisposalActionPage(type, null, roles, disposalId);
@@ -510,16 +498,14 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
             page.setRecords(list);
             page.setTotal(total);
         }
-
         return page;
     }
 
     @Override
-    public List<ContingencyPlanInstance> selectDisposalActionList(int current, int size, String disposalId, List<RoleModel> roleModelList, int dataType) {
+    public List<ContingencyPlanInstance> selectDisposalActionList(String disposalId, List<RoleModel> roleModelList, int dataType) {
         List<String> roles = new ArrayList<>();
         String type = "OPERATE";
         String status = "";
-        Page<ContingencyPlanInstance> page = new Page<>(current, size);
         if ("1".equals(String.valueOf(dataType))) {
             for (RoleModel roleModel : roleModelList) {
                 roles.add(roleModel.getRoleName());
@@ -532,10 +518,6 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                 roles.add(roleModel.getRoleName());
             }
         }
-//        else {
-//            // 当前预案全部动作
-//
-//        }
         return contingencyInstanceInfoMapper.selectDisposalActionList(type, status, roles, disposalId);
     }
 }

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

@@ -7,6 +7,7 @@ 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.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
@@ -136,4 +137,6 @@ public interface IContingencyPlanService {
     AtomicBoolean planReset();
 
     Boolean getPlanStatus();
+
+    Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList);
 }

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

@@ -102,6 +102,6 @@ public interface IPlanVisual3dService {
 
     void replyMessage(AgencyUserModel user, ContingencyPlanInstance dto);
 
-    List<ContingencyPlanInstance> selectDisposalActionList(int current, int size, String disposalId , List<RoleModel> roleModelList, int dataType);
+    List<ContingencyPlanInstance> selectDisposalActionList(String disposalId , List<RoleModel> roleModelList, int dataType);
 
 }