电站管理添加筛选

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java

@@ -32,6 +32,9 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "服务代理商")
     private String serviceAgent;
+    
+    @ApiModelProperty(value = "区域公司")
+    private String regionalCompaniesName;
 
     @ApiModelProperty(value = "电站类型")
     private String powerStationType;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java

@@ -19,5 +19,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
     @UserEmpower(field ={"regional_companies_code"} ,dealerField={"a.developer_code","a.regional_companies_code","a.developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and")
     List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
                                     @Param("ownersName")String ownersName,
-                                    @Param("serviceAgent")String serviceAgent);
+                                    @Param("serviceAgent")String serviceAgent,
+                                    @Param("regionalCompaniesName")String regionalCompaniesName);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -100,12 +100,14 @@ public class PowerStationController extends BaseController {
 	public ResponseModel<Page<PowerStationDto>> queryForPage(@RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size,
                                                             @RequestParam(value = "powerStationCode",required = false)String powerStationCode,
-                                                            @RequestParam(value = "ownersName",required = false)String ownersName) {
+                                                            @RequestParam(value = "ownersName",required = false)String ownersName,
+                                                            @RequestParam(value = "serviceAgent",required = false)String serviceAgent,
+                                                            @RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo));
+		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
@@ -45,47 +46,48 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerStation, PowerStationMapper> implements IPowerStationService {
-
-    @Autowired
-    IdxFeginService idxFeginService;
-
-    @Autowired
-    IPowerStationService powerStationService;
-    @Autowired
-    DesignInformationMapper designInformationMapper;
-    @Autowired
-    DesignInformationServiceImpl designInformationService;
-    @Autowired
-    PeasantHouseholdServiceImpl peasantHouseholdService;
-
-    private static final String IDX_REQUEST_STATE="200";
-    private static final String VERIFY_RESULT_YES="0";
-    private static final String VERIFY_RESULT_NO="1";
-
-    @Autowired
-    WorkflowFeignClient workflowFeignClient;
-    @Autowired
-    HouseholdContractServiceImpl householdContractServiceImpl;
-    @Autowired
-    PersonnelBusinessMapper personnelBusinessMapper;
-    @Autowired
-    ToDoTasksMapper toDoTasksMapper;
-    @Autowired
-    protected EmqKeeper emqKeeper;
-    @Autowired
-    ToDoTasksServiceImpl toDoTasksServiceImpl;
-    @Autowired
-    UserMessageMapper userMessageMapper;
-    @Autowired
-    PowerStationMapper powerStationMapper;
-    @Autowired
-    AmosRequestContext requestContext;
-    @Autowired
-    WorkflowImpl workflow;
-
-    public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
-        String serviceAgent =null;
+public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerStation, PowerStationMapper>
+		implements IPowerStationService {
+
+	@Autowired
+	IdxFeginService idxFeginService;
+
+	@Autowired
+	IPowerStationService powerStationService;
+	@Autowired
+	DesignInformationMapper designInformationMapper;
+	@Autowired
+	DesignInformationServiceImpl designInformationService;
+	@Autowired
+	PeasantHouseholdServiceImpl peasantHouseholdService;
+
+	private static final String IDX_REQUEST_STATE = "200";
+	private static final String VERIFY_RESULT_YES = "0";
+	private static final String VERIFY_RESULT_NO = "1";
+
+	@Autowired
+	WorkflowFeignClient workflowFeignClient;
+	@Autowired
+	HouseholdContractServiceImpl householdContractServiceImpl;
+	@Autowired
+	PersonnelBusinessMapper personnelBusinessMapper;
+	@Autowired
+	ToDoTasksMapper toDoTasksMapper;
+	@Autowired
+	protected EmqKeeper emqKeeper;
+	@Autowired
+	ToDoTasksServiceImpl toDoTasksServiceImpl;
+	@Autowired
+	UserMessageMapper userMessageMapper;
+	@Autowired
+	PowerStationMapper powerStationMapper;
+	@Autowired
+	AmosRequestContext requestContext;
+	@Autowired
+	WorkflowImpl workflow;
+
+	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
+			String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName) {
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
 //        Collection<List<RoleModel>> roleModels = orgRoles.values();
 //        if(roleModels !=null){
@@ -100,58 +102,57 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //            }
 //        }
 
-        //获取用户所在经销商单位
+		// 获取用户所在经销商单位
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
 //
 //        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
 //            serviceAgent=userUnitInformationDto.getAmosDealerName();
 //        }
 
-        //return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
-        return this.queryPage((int) page.getCurrent(), (int) page.getSize(),powerStationCode,ownersName,serviceAgent);
-    }
-
-    //查询电站审核记录
-    public Page<PowerStationDto> queryPage(int current, int size,
-            String powerStationCode,
-            String ownersName,String serviceAgent)   {
-
-        PageHelper.startPage(current, size);
-        List<PowerStationDto> list=   powerStationMapper.queryPage(powerStationCode,ownersName,serviceAgent);
-
-
-        PageInfo<PowerStationDto> pages = new PageInfo(list);
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
-        pagenew.setCurrent(current);
-        pagenew.setTotal(pages.getTotal());
-        pagenew.setSize(size);
-        pagenew.setRecords(pages.getList());
-
-        return pagenew;
-    }
-
-
-
-        /**
-         * 分页查询
-         */
-    public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,@Condition(Operator.like) String powerStationCode,@Condition(Operator.like) String ownersName,String serviceAgent)   {
-        return this.queryForPage(page, "rec_date", false,powerStationCode,ownersName,serviceAgent);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<PowerStationDto> queryForPowerStationList()   {
-        return this.queryForList("" , false);
-    }
-
-
-    @Override
-    @Transactional
-    public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
-        try{
-            //流程节点code
+		// return
+		// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
+		return this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
+				serviceAgent,regionalCompaniesName);
+	}
+
+	// 查询电站审核记录
+	public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
+			String serviceAgent,String regionalCompaniesName) {
+
+		PageHelper.startPage(current, size);
+		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName);
+
+		PageInfo<PowerStationDto> pages = new PageInfo(list);
+		com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
+		pagenew.setCurrent(current);
+		pagenew.setTotal(pages.getTotal());
+		pagenew.setSize(size);
+		pagenew.setRecords(pages.getList());
+
+		return pagenew;
+	}
+
+	/**
+	 * 分页查询
+	 */
+	public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,
+			@Condition(Operator.like) String powerStationCode, @Condition(Operator.like) String ownersName,
+			String serviceAgent) {
+		return this.queryForPage(page, "rec_date", false, powerStationCode, ownersName, serviceAgent);
+	}
+
+	/**
+	 * 列表查询 示例
+	 */
+	public List<PowerStationDto> queryForPowerStationList() {
+		return this.queryForList("", false);
+	}
+
+	@Override
+	@Transactional
+	public boolean savePowerStation(PowerStation powerStation, boolean flag, String name, String meg) {
+		try {
+			// 流程节点code
 //            if (flag) {
 //                String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
 //                WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext);
@@ -160,122 +161,135 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //                powerStation.setNodeRouting(workDto.getNodeRouting());
 //            }
 
-            powerStation.setRecDate(new Date());
-
-            Boolean fl= this.saveOrUpdate(powerStation);
-
-            PowerStationNodeEnum powerStationNodeEnum=   PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode());
-
-            if (flag){
-
-                ToDoTasks toDoTasks=null;
-                if(PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())||PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){
-                    //获取经销商orgcode
-                    PeasantHousehold peasantHouseholdd=   peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
-                     toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),peasantHouseholdd.getDeveloperCode());
-                    if(PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){
-                        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(),toDoTasks,meg);
-                    }else{
-                        toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg);
-                    }
-                }else{
-                    toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站审核.getCode(),  powerStation.getSequenceNbr(),   "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),null);
-                    toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg);
-                }
-            }else{
-                LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
-                wrapper.eq(ToDoTasks::getState, "待办");
-                wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr());
-                ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
-                if(doTasks!=null){
-                    doTasks.setState("已办");
-                    doTasks.setCompleteTime(new Date());
-
-                    toDoTasksMapper.updateById(doTasks);
-                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-
-                    UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
-                    userMessageMapper.insert(userMessage);
-                    emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
-
-                }
-            }
-
-            return fl;
-        }catch (Exception e){
-            e.printStackTrace();
-            throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-        }
-    }
-
-    @Override
-    public PowerStation getObjByNhId(String id, String state) {
-        LambdaQueryWrapper<PowerStation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.ne(PowerStation::getProcessStatus, state);
-        wrapper.eq(PowerStation::getPeasantHouseholdId, id);
-        return this.baseMapper.selectOne(wrapper);
-    }
-
-    @Override
-    @Transactional
-    public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId, String planInstanceId, Map<String, Object> kv) {
-        String meg="";
-        // 1. 业务相关数据落表
-        PowerStation powerStation = this.baseMapper.selectById(stationId);
-        PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
-        String result = String.valueOf(kv.get("approvalStatus"));
-        boolean flag = true;
-        if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
-
-            powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
-
-            this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv);
-        }  else {
-
-            if (VERIFY_RESULT_NO.equals(result)) {
-                powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
-            }
-            PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
-            switch (nodeByCode) {
-                case 设计审核:
-                    powerStation.setTechnologyStatus(resultObj.getName());
-                    break;
-                case 投融审核:
-                    powerStation.setDesignStatus(resultObj.getName());
-                    break;
-                case 法务审核:
-                    powerStation.setBusinessStatus(resultObj.getName());
-
-                    if (VERIFY_RESULT_YES.equals(result)) {
-                        LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
-                        lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
-                        lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
-                        householdContractServiceImpl.update(lambdaUw);
-                    }
-
-                    break;
-                case 文件审核:
-                    if (VERIFY_RESULT_YES.equals(result)) {
-                        flag = false;
-                        powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
-                    }
-                    powerStation.setDrawingReview(resultObj.getName());
-                    break;
-                default:
-                    break;
-            }
-        }
-        meg="任务明细："+nodeByCode+(VERIFY_RESULT_YES.equals(result)?"通过":"不通过");
-        // 2. 更新流程状态
-        String code = null;
-        try{
-            // 3. 工作流执行
-          //  FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
-           // if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
-            //    code = submit.getResult();
-            //    log.info("流程执行成功：{}", code);
-                // 获取流程信息
+			powerStation.setRecDate(new Date());
+
+			Boolean fl = this.saveOrUpdate(powerStation);
+
+			PowerStationNodeEnum powerStationNodeEnum = PowerStationNodeEnum
+					.getNodeByCode(powerStation.getNextProcessNode());
+
+			if (flag) {
+
+				ToDoTasks toDoTasks = null;
+				if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())
+						|| PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
+					// 获取经销商orgcode
+					PeasantHousehold peasantHouseholdd = peasantHouseholdService
+							.getById(powerStation.getPeasantHouseholdId());
+					toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
+							"用户" + name + "电站勘察待" + powerStationNodeEnum.getName(),
+							peasantHouseholdd.getDeveloperCode());
+					if (PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
+						toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(), toDoTasks,
+								meg);
+					} else {
+						toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
+					}
+				} else {
+					toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
+							"用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), null);
+					toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
+				}
+			} else {
+				LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
+				wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
+				wrapper.eq(ToDoTasks::getState, "待办");
+				wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr());
+				ToDoTasks doTasks = toDoTasksMapper.selectOne(wrapper);
+				if (doTasks != null) {
+					doTasks.setState("已办");
+					doTasks.setCompleteTime(new Date());
+
+					toDoTasksMapper.updateById(doTasks);
+					emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
+
+					UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(),
+							doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成." + meg,
+							doTasks.getAmosOrgCode());
+					userMessageMapper.insert(userMessage);
+					emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2,
+							false);
+
+				}
+			}
+
+			return fl;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+		}
+	}
+
+	@Override
+	public PowerStation getObjByNhId(String id, String state) {
+		LambdaQueryWrapper<PowerStation> wrapper = new LambdaQueryWrapper<>();
+		wrapper.ne(PowerStation::getProcessStatus, state);
+		wrapper.eq(PowerStation::getPeasantHouseholdId, id);
+		return this.baseMapper.selectOne(wrapper);
+	}
+
+	@Override
+	@Transactional
+	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
+			String planInstanceId, Map<String, Object> kv) {
+		String meg = "";
+		// 1. 业务相关数据落表
+		PowerStation powerStation = this.baseMapper.selectById(stationId);
+		PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
+		String result = String.valueOf(kv.get("approvalStatus"));
+		boolean flag = true;
+		if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)
+				|| PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+
+			powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
+
+			this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
+		} else {
+
+			if (VERIFY_RESULT_NO.equals(result)) {
+				powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
+			}
+			PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
+			switch (nodeByCode) {
+			case 设计审核:
+				powerStation.setTechnologyStatus(resultObj.getName());
+				break;
+			case 投融审核:
+				powerStation.setDesignStatus(resultObj.getName());
+				break;
+			case 法务审核:
+				powerStation.setBusinessStatus(resultObj.getName());
+
+				if (VERIFY_RESULT_YES.equals(result)) {
+					LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
+					lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
+					lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
+					householdContractServiceImpl.update(lambdaUw);
+				}
+
+				break;
+			case 文件审核:
+				if (VERIFY_RESULT_YES.equals(result)) {
+					flag = false;
+					powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
+				}
+				powerStation.setDrawingReview(resultObj.getName());
+				break;
+			default:
+				break;
+			}
+		}
+		meg = "任务明细：" + nodeByCode + (VERIFY_RESULT_YES.equals(result) ? "通过" : "不通过");
+		// 2. 更新流程状态
+		String code = null;
+		try {
+			// 3. 工作流执行
+			// FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId,
+			// planInstanceId, null, null, null, kv);
+			// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
+			// code = submit.getResult();
+			// log.info("流程执行成功：{}", code);
+			// 获取流程信息
 //                FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
 //                if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
 //                    JSONObject resultObj = record.getResult();
@@ -283,63 +297,62 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //
 //                }
 
-
-                //执行工作流
-            BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
-            StandardDto standardDto = new StandardDto();
-            if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
-
-                standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
-                standardDto.setResult("0");
-                standardDto.setTaskId(powerStation.getFlowTaskId());
-                VariableDto variable = new VariableDto();
-                variable.setApprovalStatus("0");
-                variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
-                variable.setOperationTime(String.valueOf(kv.get("approveDate")));
-                variable.setOperator("");
-                standardDto.setVariable(variable);
-            }else{
-                standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
-                standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
-                standardDto.setTaskId(powerStation.getFlowTaskId());
-                VariableDto variable = new VariableDto();
-                variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
-                variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):"");
-                variable.setOperationTime(String.valueOf(kv.get("approveDate")));
-                variable.setOperator(String.valueOf(kv.get("approveName")));
-                standardDto.setVariable(variable);
-            }
-
-
-                BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
-                powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
-                powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
-                powerStation.setNodeRouting(basicGridAcceptance.getNextNodeKey()!=null?PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()):"");
-                powerStation.setNextProcessNode(basicGridAcceptance.getNextNodeKey());
-                powerStation.setPromoter(basicGridAcceptance.getPromoter());
-                powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
-                powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
-
-                powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
-                if(!flag){
-                    //更新农户状态
-                    String peasantHouseholdId = powerStation.getPeasantHouseholdId();
-                    PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
-                    peasantHousehold.setSurveyOrNot(3);
-                    peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
-                    peasantHouseholdService.saveOrUpdate(peasantHousehold);
-                }
-            //}
-        }catch (Exception e){
-            e.printStackTrace();
-            throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-
-        }
-        return code;
-
-
-
-
+			// 执行工作流
+			BasicGridAcceptance basicGridAcceptance = new BasicGridAcceptance();
+			StandardDto standardDto = new StandardDto();
+			if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)
+					|| PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+
+				standardDto.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
+				standardDto.setResult("0");
+				standardDto.setTaskId(powerStation.getFlowTaskId());
+				VariableDto variable = new VariableDto();
+				variable.setApprovalStatus("0");
+				variable.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
+				variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+				variable.setOperator("");
+				standardDto.setVariable(variable);
+			} else {
+				standardDto.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
+				standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
+				standardDto.setTaskId(powerStation.getFlowTaskId());
+				VariableDto variable = new VariableDto();
+				variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
+				variable.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
+				variable.setOperationTime(String.valueOf(kv.get("approveDate")));
+				variable.setOperator(String.valueOf(kv.get("approveName")));
+				standardDto.setVariable(variable);
+			}
+
+			BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto,
+					requestContext.getUserId());
+			powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
+			powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
+			powerStation.setNodeRouting(basicGridAcceptance.getNextNodeKey() != null
+					? PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey())
+					: "");
+			powerStation.setNextProcessNode(basicGridAcceptance.getNextNodeKey());
+			powerStation.setPromoter(basicGridAcceptance.getPromoter());
+			powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
+			powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
+
+			powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
+			if (!flag) {
+				// 更新农户状态
+				String peasantHouseholdId = powerStation.getPeasantHouseholdId();
+				PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper()
+						.selectById(Long.valueOf(peasantHouseholdId));
+				peasantHousehold.setSurveyOrNot(3);
+				peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
+				peasantHouseholdService.saveOrUpdate(peasantHousehold);
+			}
+			// }
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+
+		}
+		return code;
 
 //        String meg="";
 //        // 1. 业务相关数据落表
@@ -417,118 +430,115 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //
 //        }
 //        return code;
-    }
-
-
-    public WorkDto getNodeInfoCode(String flowTaskId){
-        WorkDto workDto=null;
-     try{
-            FeignClientResult<JSONObject> jSONObject= workflowFeignClient.getNodeInfo(flowTaskId);
-        if(IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))){
-            JSONObject js=jSONObject.getResult();
-            if(js==null){
-                throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-            }
-            LinkedHashMap  taskInfo= js.get("taskInfo")!=null?(LinkedHashMap)js.get("taskInfo"):null;
-            String nextProcessNode=taskInfo!=null?taskInfo.get("taskDefinitionKey").toString():null;
-            List<LinkedHashMap>  executor= js.get("executor")!=null?( List<LinkedHashMap>)js.get("executor"):null;
-            String nodeRole=null;
-            if(!executor.isEmpty()){
-                List<String> idList = executor.stream().map(e->e.get("groupId").toString()).collect(Collectors.toList());
-                nodeRole=StringUtils.join(idList,",");
-            }
-
-            LinkedHashMap  extensionInfo= js.get("extensionInfo")!=null?(LinkedHashMap)js.get("extensionInfo"):null;
-            String nodeRouting=extensionInfo!=null?extensionInfo.get("nodeRole").toString():null;
-            workDto=new WorkDto(nodeRouting,  nodeRole,  nextProcessNode);
-        }
-
-        return  workDto;
-    }catch (Exception e){
-        e.printStackTrace();
-        throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-
-    }
-}
-
-    public String getTaskNoAuth(String processInstanceId){
-        String flowTaskId=null;
-     try{
-            JSONObject jSONObject= workflowFeignClient.getTaskNoAuth(processInstanceId);
-        if(IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))){
-            LinkedHashMap jsd= jSONObject.get("data")!=null?(LinkedHashMap)jSONObject.get("data"):null;
-            flowTaskId=jsd!=null?jsd.get("id").toString():null;
-        }
-        if(flowTaskId==null){
-            throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-        }
-        return  flowTaskId;
-    }catch (Exception e){
-         e.printStackTrace();
-        throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
-
-    }
-    }
-
-   // 设计信息填充
-
-
-public void updateSeve(String nodeCode,String peasantHouseholdId, Map<String, Object> kv ){
-    LambdaQueryWrapper<DesignInformation> wrapper = new LambdaQueryWrapper<>();
-    wrapper.eq(DesignInformation::getPeasantHouseholdId, peasantHouseholdId);
-    DesignInformation  designInformation=designInformationMapper.selectOne(wrapper);
-    if(designInformation!=null){
-        DesignInformation designInformationnew=this.mapToBean(kv,DesignInformation.class);
-
-
-
-        if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
-            designInformation.setPeasantHouseholdId(peasantHouseholdId);
-            designInformation.setComponentLayout(designInformationnew.getComponentLayout());
-            designInformation.setComponentBracket(designInformationnew.getComponentBracket());
-            designInformation.setConnectionLine(designInformationnew.getConnectionLine());
-            designInformation.setOnceLine(designInformationnew.getOnceLine());
-            designInformationMapper.updateById(designInformation);
-        }else{
-           // designInformationnew.setTypicalDiagram(designInformationnew.getTypicalDiagram());
-            designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
-            designInformationnew.setComponentLayout(designInformation.getComponentLayout());
-            designInformationnew.setComponentBracket(designInformation.getComponentBracket());
-            designInformationnew.setConnectionLine(designInformation.getConnectionLine());
-            designInformationnew.setOnceLine(designInformation.getOnceLine());
-            designInformationnew.setSequenceNbr(designInformation.getSequenceNbr());
-            designInformationnew.setRecDate(designInformation.getRecDate());
-            designInformationnew.setRecUserId(designInformation.getRecUserId());
-            designInformationnew.setRecUserName(designInformation.getRecUserName());
-            designInformationnew.setIsDelete(designInformation.getIsDelete());
-            designInformationnew.setCable(designInformation.getCable());
-            designInformationMapper.updateById(designInformationnew);
-        }
-    }else{
-        DesignInformation designInformationnew=this.mapToBean(kv,DesignInformation.class);
-        designInformationnew.setTypicalDiagram((List<Object>)kv.get("typicalDiagram")) ;
-        designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
-        designInformationMapper.insert(designInformationnew);
-
-    }
-
-}
-
-
- public  <T> T mapToBean(Map<String, Object> map, Class<T> clazz) {
-     ObjectMapper objectMapper= new ObjectMapper();
-
-        T bean =null;
-        try {
-            bean = clazz.newInstance();
-            bean = objectMapper.convertValue(map,clazz);
-
-        }catch (Exception e){
-            throw new BaseException(" 数据转化异常！","400","数据转化异常！");
-        }
-        return bean;
-    }
-
+	}
+
+	public WorkDto getNodeInfoCode(String flowTaskId) {
+		WorkDto workDto = null;
+		try {
+			FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
+			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
+				JSONObject js = jSONObject.getResult();
+				if (js == null) {
+					throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+				}
+				LinkedHashMap taskInfo = js.get("taskInfo") != null ? (LinkedHashMap) js.get("taskInfo") : null;
+				String nextProcessNode = taskInfo != null ? taskInfo.get("taskDefinitionKey").toString() : null;
+				List<LinkedHashMap> executor = js.get("executor") != null ? (List<LinkedHashMap>) js.get("executor")
+						: null;
+				String nodeRole = null;
+				if (!executor.isEmpty()) {
+					List<String> idList = executor.stream().map(e -> e.get("groupId").toString())
+							.collect(Collectors.toList());
+					nodeRole = StringUtils.join(idList, ",");
+				}
+
+				LinkedHashMap extensionInfo = js.get("extensionInfo") != null ? (LinkedHashMap) js.get("extensionInfo")
+						: null;
+				String nodeRouting = extensionInfo != null ? extensionInfo.get("nodeRole").toString() : null;
+				workDto = new WorkDto(nodeRouting, nodeRole, nextProcessNode);
+			}
+
+			return workDto;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+
+		}
+	}
+
+	public String getTaskNoAuth(String processInstanceId) {
+		String flowTaskId = null;
+		try {
+			JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
+			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
+				LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
+				flowTaskId = jsd != null ? jsd.get("id").toString() : null;
+			}
+			if (flowTaskId == null) {
+				throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+			}
+			return flowTaskId;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+
+		}
+	}
+
+	// 设计信息填充
+
+	public void updateSeve(String nodeCode, String peasantHouseholdId, Map<String, Object> kv) {
+		LambdaQueryWrapper<DesignInformation> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(DesignInformation::getPeasantHouseholdId, peasantHouseholdId);
+		DesignInformation designInformation = designInformationMapper.selectOne(wrapper);
+		if (designInformation != null) {
+			DesignInformation designInformationnew = this.mapToBean(kv, DesignInformation.class);
+
+			if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+				designInformation.setPeasantHouseholdId(peasantHouseholdId);
+				designInformation.setComponentLayout(designInformationnew.getComponentLayout());
+				designInformation.setComponentBracket(designInformationnew.getComponentBracket());
+				designInformation.setConnectionLine(designInformationnew.getConnectionLine());
+				designInformation.setOnceLine(designInformationnew.getOnceLine());
+				designInformationMapper.updateById(designInformation);
+			} else {
+				// designInformationnew.setTypicalDiagram(designInformationnew.getTypicalDiagram());
+				designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
+				designInformationnew.setComponentLayout(designInformation.getComponentLayout());
+				designInformationnew.setComponentBracket(designInformation.getComponentBracket());
+				designInformationnew.setConnectionLine(designInformation.getConnectionLine());
+				designInformationnew.setOnceLine(designInformation.getOnceLine());
+				designInformationnew.setSequenceNbr(designInformation.getSequenceNbr());
+				designInformationnew.setRecDate(designInformation.getRecDate());
+				designInformationnew.setRecUserId(designInformation.getRecUserId());
+				designInformationnew.setRecUserName(designInformation.getRecUserName());
+				designInformationnew.setIsDelete(designInformation.getIsDelete());
+				designInformationnew.setCable(designInformation.getCable());
+				designInformationMapper.updateById(designInformationnew);
+			}
+		} else {
+			DesignInformation designInformationnew = this.mapToBean(kv, DesignInformation.class);
+			designInformationnew.setTypicalDiagram((List<Object>) kv.get("typicalDiagram"));
+			designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
+			designInformationMapper.insert(designInformationnew);
+
+		}
+
+	}
+
+	public <T> T mapToBean(Map<String, Object> map, Class<T> clazz) {
+		ObjectMapper objectMapper = new ObjectMapper();
+
+		T bean = null;
+		try {
+			bean = clazz.newInstance();
+			bean = objectMapper.convertValue(map, clazz);
+
+		} catch (Exception e) {
+			throw new BaseException(" 数据转化异常！", "400", "数据转化异常！");
+		}
+		return bean;
+	}
 
 //    private CollectionToList(Collection<? extends E> c){
 //        Object[] objects = c.toArray();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/KafkaAnalyseController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jxiop.biz.Enum.SmartAnalyseEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallInfoDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
@@ -35,366 +36,437 @@ import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*;
 @RequestMapping(value = "/kafkaAnalyse")
 public class KafkaAnalyseController {
 
-    public final DecimalFormat df = new DecimalFormat("0.0");
-    @Autowired
-    FanConditionVariablesMessage fanConditionVariablesMessage;
-    @Autowired
-    RedisUtils redisUtils;
-    @Autowired
-    IPermissionService permissionService;
-    @Autowired
-    IdxBizFanHealthLevelMapper idxBizFanHealthLevelMapper;
-    @Autowired
-    IdxBizPvHealthLevelMapper idxBizPvHealthLevelMapper;
-    @Autowired
-    IndicatorDataMapper indicatorDataMapper;
-    @Autowired
-    IdxBizFanHealthIndexMapper idxBizFanHealthIndexMapper;
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getFanConditionVariables")
-    @ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 风机 - 新", notes = "计算相关性分析 - 风机 - 新")
-    public ResponseModel<Object> getFanConditionVariables() {
-        if (redisUtils.hasKey(kafkaTopicConsumer)) {
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getFanConditionVariables();
-        redisUtils.set(kafkaTopicConsumer, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getPvConditionVariables")
-    @ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 光伏 - 新", notes = "计算相关性分析 - 光伏 - 新")
-    public ResponseModel<Object> getPvConditionVariables() {
-        if (redisUtils.hasKey(kafkaTopicConsumerPv)) {
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getPvConditionVariables();
-        redisUtils.set(kafkaTopicConsumerPv, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getFanConditionVariablesGKHF")
-    @ApiOperation(httpMethod = "POST", value = "工况划分 - 风电 - 新", notes = "工况划分 - 风电 - 新")
-    public ResponseModel<Object> getFanConditionVariablesGKHF() {
-        if (redisUtils.hasKey(kafkaTopicConsumerGKHFFan)) {
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getFanConditionVariablesGKHF();
-        redisUtils.set(kafkaTopicConsumerGKHFFan, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getPvConditionVariablesPvGKHF")
-    @ApiOperation(httpMethod = "POST", value = "工况划分 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
-    public ResponseModel<Object> getPvConditionVariablesPvGKFX() {
-        if (redisUtils.hasKey(kafkaTopicConsumerGKHFPv)) {
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getPvConditionVariablesPvGKFX();
-        redisUtils.set(kafkaTopicConsumerGKHFPv, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getFanConditionVariablesZXZ")
-    @ApiOperation(httpMethod = "POST", value = "中心值 - 风电 - 新", notes = "中心值 - 风电 - 新")
-    public ResponseModel<Object> getFanConditionVariablesZXZ() {
-        if (redisUtils.hasKey(kafkaTopicConsumerZXZFan)) {
+	public final DecimalFormat df = new DecimalFormat("0.0");
+	@Autowired
+	FanConditionVariablesMessage fanConditionVariablesMessage;
+	@Autowired
+	RedisUtils redisUtils;
+	@Autowired
+	IPermissionService permissionService;
+	@Autowired
+	IdxBizFanHealthLevelMapper idxBizFanHealthLevelMapper;
+	@Autowired
+	IdxBizPvHealthLevelMapper idxBizPvHealthLevelMapper;
+	@Autowired
+	IndicatorDataMapper indicatorDataMapper;
+	@Autowired
+	IdxBizFanHealthIndexMapper idxBizFanHealthIndexMapper;
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取执行结果", notes = "获取执行结果")
+	@GetMapping(value = "/isRun")   
+	public ResponseModel<String> isRun(@RequestParam(required = true) String key) {
+		String result = "非法key值";
+		if (kafkaTopicConsumer.equals(key) || kafkaTopicConsumerPv.equals(key) || kafkaTopicConsumerGKHFFan.equals(key)
+				|| kafkaTopicConsumerGKHFPv.equals(key) || kafkaTopicConsumerZXZFan.equals(key)
+				|| kafkaTopicConsumerZXZPv.equals(key)) {
+			if (redisUtils.hasKey(key)) {
+				result = "正在计算中";
+			} else {
+				result = "未计算";
+			}
+		}
+		return ResponseHelper.buildResponse(result);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取执行结果", notes = "获取执行结果")
+	@GetMapping(value = "/start")
+	public ResponseModel<Object> start(@RequestParam(required = true) String key) {
+		String result = "非法key值";
+		if (kafkaTopicConsumer.equals(key)) {
+			return getFanConditionVariables();
+		} else if (kafkaTopicConsumerPv.equals(key)) {
+			return getPvConditionVariables();
+		} else if (kafkaTopicConsumerGKHFFan.equals(key)) {
+			return getFanConditionVariablesGKHF();
+		} else if (kafkaTopicConsumerGKHFPv.equals(key)) {
+			return getPvConditionVariablesPvGKFX();
+		} else if (kafkaTopicConsumerZXZFan.equals(key)) {
+			return getFanConditionVariablesZXZ();
+		} else if (kafkaTopicConsumerZXZPv.equals(key)) {
+			return getPvConditionVariablesZXZ();
+		}
+		return ResponseHelper.buildResponse(result);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getFanConditionVariables")
+	@ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 风机 - 新", notes = "计算相关性分析 - 风机 - 新")
+	public ResponseModel<Object> getFanConditionVariables() {
+		if (redisUtils.hasKey(kafkaTopicConsumer)) {
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getFanConditionVariables();
+		redisUtils.set(kafkaTopicConsumer, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getPvConditionVariables")
+	@ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 光伏 - 新", notes = "计算相关性分析 - 光伏 - 新")
+	public ResponseModel<Object> getPvConditionVariables() {
+		if (redisUtils.hasKey(kafkaTopicConsumerPv)) {
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getPvConditionVariables();
+		redisUtils.set(kafkaTopicConsumerPv, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getFanConditionVariablesGKHF")
+	@ApiOperation(httpMethod = "POST", value = "工况划分 - 风电 - 新", notes = "工况划分 - 风电 - 新")
+	public ResponseModel<Object> getFanConditionVariablesGKHF() {
+		if (redisUtils.hasKey(kafkaTopicConsumerGKHFFan)) {
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getFanConditionVariablesGKHF();
+		redisUtils.set(kafkaTopicConsumerGKHFFan, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getPvConditionVariablesPvGKHF")
+	@ApiOperation(httpMethod = "POST", value = "工况划分 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
+	public ResponseModel<Object> getPvConditionVariablesPvGKFX() {
+		if (redisUtils.hasKey(kafkaTopicConsumerGKHFPv)) {
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getPvConditionVariablesPvGKFX();
+		redisUtils.set(kafkaTopicConsumerGKHFPv, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getFanConditionVariablesZXZ")
+	@ApiOperation(httpMethod = "POST", value = "中心值 - 风电 - 新", notes = "中心值 - 风电 - 新")
+	public ResponseModel<Object> getFanConditionVariablesZXZ() {
+		if (redisUtils.hasKey(kafkaTopicConsumerZXZFan)) {
 //            redisUtils.del(kafkaTopicConsumerZXZFan);
 //            redisUtils.getExpire(kafkaTopicConsumerZXZFan);
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getFanConditionVariablesZXZ();
-        redisUtils.set(kafkaTopicConsumerZXZFan, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/getPvConditionVariablesZXZ")
-    @ApiOperation(httpMethod = "POST", value = "中心值 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
-    public ResponseModel<Object> getPvConditionVariablesZXZ() {
-        if (redisUtils.hasKey(kafkaTopicConsumerZXZPv)) {
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getFanConditionVariablesZXZ();
+		redisUtils.set(kafkaTopicConsumerZXZFan, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/getPvConditionVariablesZXZ")
+	@ApiOperation(httpMethod = "POST", value = "中心值 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
+	public ResponseModel<Object> getPvConditionVariablesZXZ() {
+		if (redisUtils.hasKey(kafkaTopicConsumerZXZPv)) {
 //            redisUtils.del(kafkaTopicConsumerZXZPv);
-            return ResponseHelper.buildResponse("计算中");
-        }
-        fanConditionVariablesMessage.getPvConditionVariablesZXZ();
-        redisUtils.set(kafkaTopicConsumerZXZPv, RequestContext.getTraceId(), 300);
-        return ResponseHelper.buildResponse("开始计算");
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @GetMapping(value = "/getAddressInfo")
-    @ApiOperation(httpMethod = "GET", value = "getAddressInfo", notes = "getAddressInfo")
-    public ResponseModel<List<IndicatorData>> getAddressInfo() {
-
-        List<String> addressInfo = idxBizFanHealthIndexMapper.getAddressInfo();
-        String join = String.join(",", addressInfo);
-        List<IndicatorData> indicatorData = indicatorDataMapper.selectByAddresses(join, "1668801435891929089");
-        return ResponseHelper.buildResponse(indicatorData);
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "全景诊断回溯")
-    @GetMapping("/getFullViewRecall")
-    public ResponseModel<List<FullViewRecallInfoDTO>> getFullViewRecall(@RequestParam(required = false, value = "analysisType") String analysisType) {
-        List<String> gatewayIds = this.getGatewayIds();
-        List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType, gatewayIds);
-        Map<String, Double> stationHealthIndexMap = stationIndexInfo.stream().collect(Collectors.toMap(t -> t.get("station").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
-
-
-        List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper.getEquipmentIndexInfoByParam(analysisType, gatewayIds);
-        Map<String, Double> equipmentIndexInfoMap = equipmentIndexInfo.stream().collect(Collectors.toMap(t -> t.get("equipmentName").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
-
-
-        List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper.getSubSystemIndexInfoByParam(analysisType, gatewayIds);
-        Map<String, Double> subSystemIndexInfoMap = subSystemIndexInfo.stream().collect(Collectors.toMap(t -> t.get("subSystem").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
-
-
-        List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper.getPointNameIndexInfoByParam(analysisType, gatewayIds);
-        Map<String, Double> pointNameIndexInfoMap = pointNameIndexInfo.stream().collect(Collectors.toMap(t -> t.get("gatewayIndexAddress").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
-
-
-        List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
-
-        List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(gatewayIds);
-        Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list.stream()
-                .collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,
-                        Collectors.groupingBy(FullViewRecallDataDTO::getStation,
-                                Collectors.groupingBy(FullViewRecallDataDTO::getEquipmentName,
-                                        Collectors.groupingBy(FullViewRecallDataDTO::getSubSystem,
-                                                Collectors.groupingBy(FullViewRecallDataDTO::getPointName))))));
-        int areaInt = 1;
-        int pointNameInt = 1;
-        int stationInt = 1;
-        int equipmentInt = 1;
-        int subSystemInt = 1;
-        Double healthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(null, null, analysisType).doubleValue();
-
-        healthScoreInfo = Double.parseDouble(df.format(healthScoreInfo));
-        LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
-        query.isNull(IdxBizFanHealthLevel::getStatus);
-        query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "全域");
-        query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, healthScoreInfo);
-        query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, healthScoreInfo);
-        IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
-
-        FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO();
-        allMapDto.setKey("0");
-        allMapDto.setName("全域设备健康状态指数");
-        allMapDto.setScoreRange("");
-        allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel());
-        allMapDto.setScore(healthScoreInfo);
-        allMapDto.setIsRoot(true);
-        allMapDto.setCategory("category");
-        allMapDto.setChildren(new ArrayList<>());
-        allMapDto.setParentKey("0");
-
-        for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> areaMap : resultMap.entrySet()) {
-            Double areaLowScore = null;
-            Double areaHighScore = null;
-
-            Double areaHealthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(areaMap.getKey(), null, analysisType).doubleValue();
-            areaHealthScoreInfo = Double.parseDouble(df.format(areaHealthScoreInfo));
-            LambdaQueryWrapper<IdxBizFanHealthLevel> areaQuery = new LambdaQueryWrapper<>();
-            areaQuery.isNull(IdxBizFanHealthLevel::getStatus);
-            areaQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "片区");
-            areaQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, areaHealthScoreInfo);
-            areaQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, areaHealthScoreInfo);
-            IdxBizFanHealthLevel areaIdxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(areaQuery);
-
-            FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO();
-            areaMapDto.setKey("0-" + areaInt);
-            areaMapDto.setName(areaMap.getKey());
-            areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel());
-            areaMapDto.setScore(areaHealthScoreInfo);
-            areaMapDto.setParentKey(allMapDto.getKey());
-            allMapDto.getChildren().add(areaMapDto);
-            areaInt++;
-            List<FullViewRecallInfoDTO> areaMapList = new ArrayList<>();
-            for (Map.Entry<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>> stationMap : areaMap.getValue().entrySet()) {
-                Double stationLowScore = null;
-                Double stationHighScore = null;
-                if (areaLowScore == null && areaHighScore == null) {
-                    areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
-                    areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
-                } else {
-                    if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) < areaLowScore) {
-                        areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
-                    }
-                    if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) > areaHighScore) {
-                        areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
-                    }
-                }
-
-                FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO();
-                stationDto.setKey(areaMapDto.getKey() + "-" + stationInt);
-                stationDto.setName(stationMap.getKey());
-
-                stationDto.setStatus("");
-                stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0));
-                LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>();
-                stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey());
-                stationQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "场站");
-                stationQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, stationDto.getScore());
-                stationQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, stationDto.getScore());
-                IdxBizFanHealthLevel stationLevel = idxBizFanHealthLevelMapper.selectOne(stationQuery);
-                stationDto.setStatus(ObjectUtils.isNotEmpty(stationLevel) ? stationLevel.getHealthLevel() : "");
-                if (ObjectUtils.isEmpty(stationLevel)) {
-                    LambdaQueryWrapper<IdxBizPvHealthLevel> stationPvQuery = new LambdaQueryWrapper<>();
-                    stationPvQuery.like(IdxBizPvHealthLevel::getStatus, stationMap.getKey());
-                    stationPvQuery.eq(IdxBizPvHealthLevel::getAnalysisObjType, "场站");
-                    stationPvQuery.lt(IdxBizPvHealthLevel::getGroupLowerLimit, stationDto.getScore());
-                    stationPvQuery.ge(IdxBizPvHealthLevel::getGroupUpperLimit, stationDto.getScore());
-                    IdxBizPvHealthLevel stationPvLevel = idxBizPvHealthLevelMapper.selectOne(stationPvQuery);
-                    if (ObjectUtils.isNotEmpty(stationPvLevel)) {
-                        stationDto.setStatus(stationPvLevel.getHealthLevel());
-                    }
-                }
-                stationDto.setParentKey(areaMapDto.getKey());
-                areaMapDto.getChildren().add(stationDto);
-                stationInt++;
-                for (Map.Entry<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>> equipmentMap : stationMap.getValue().entrySet()) {
-
-
-                    if (stationLowScore == null && stationHighScore == null) {
-                        stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
-                        stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
-                    } else {
-                        if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) < stationLowScore) {
-                            stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
-                        }
-                        if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) > stationHighScore) {
-                            stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
-                        }
-                    }
-
-                    FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO();
-                    equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt);
-                    equipmentMapDto.setName(equipmentMap.getKey());
-                    equipmentMapDto.setScoreRange("");
-                    IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
-                    equipmentMapDto.setStatus(levelInfo.getHealthLevel());
-                    equipmentMapDto.setScore(equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
-                    equipmentMapDto.setParentKey(stationDto.getKey());
-                    stationDto.getChildren().add(equipmentMapDto);
-                    equipmentInt++;
-                    for (Map.Entry<String, Map<String, List<FullViewRecallDataDTO>>> subSystemMap : equipmentMap.getValue().entrySet()) {
-                        FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO();
-                        subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt);
-                        subSystemMapDto.setName(subSystemMap.getKey());
-                        subSystemMapDto.setScoreRange("");
+			return ResponseHelper.buildResponse("计算中");
+		}
+		fanConditionVariablesMessage.getPvConditionVariablesZXZ();
+		redisUtils.set(kafkaTopicConsumerZXZPv, RequestContext.getTraceId(), 300);
+		return ResponseHelper.buildResponse("开始计算");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/getAddressInfo")
+	@ApiOperation(httpMethod = "GET", value = "getAddressInfo", notes = "getAddressInfo")
+	public ResponseModel<List<IndicatorData>> getAddressInfo() {
+
+		List<String> addressInfo = idxBizFanHealthIndexMapper.getAddressInfo();
+		String join = String.join(",", addressInfo);
+		List<IndicatorData> indicatorData = indicatorDataMapper.selectByAddresses(join, "1668801435891929089");
+		return ResponseHelper.buildResponse(indicatorData);
+	}
+
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "全景诊断回溯")
+	@GetMapping("/getFullViewRecall")
+	public ResponseModel<List<FullViewRecallInfoDTO>> getFullViewRecall(
+			@RequestParam(required = false, value = "analysisType") String analysisType) {
+		List<String> gatewayIds = this.getGatewayIds();
+		List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType,
+				gatewayIds);
+		Map<String, Double> stationHealthIndexMap = stationIndexInfo.stream().collect(Collectors
+				.toMap(t -> t.get("station").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
+
+		List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper
+				.getEquipmentIndexInfoByParam(analysisType, gatewayIds);
+		Map<String, Double> equipmentIndexInfoMap = equipmentIndexInfo.stream().collect(Collectors.toMap(
+				t -> t.get("equipmentName").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
+
+		List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper
+				.getSubSystemIndexInfoByParam(analysisType, gatewayIds);
+		Map<String, Double> subSystemIndexInfoMap = subSystemIndexInfo.stream().collect(Collectors
+				.toMap(t -> t.get("subSystem").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
+
+		List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper
+				.getPointNameIndexInfoByParam(analysisType, gatewayIds);
+		Map<String, Double> pointNameIndexInfoMap = pointNameIndexInfo.stream()
+				.collect(Collectors.toMap(t -> t.get("gatewayIndexAddress").toString(),
+						t -> Double.parseDouble(t.get("healthIndex").toString())));
+
+		List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
+
+		List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(gatewayIds);
+		Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list
+				.stream()
+				.collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,
+						Collectors.groupingBy(FullViewRecallDataDTO::getStation,
+								Collectors.groupingBy(FullViewRecallDataDTO::getEquipmentName,
+										Collectors.groupingBy(FullViewRecallDataDTO::getSubSystem,
+												Collectors.groupingBy(FullViewRecallDataDTO::getPointName))))));
+		int areaInt = 1;
+		int pointNameInt = 1;
+		int stationInt = 1;
+		int equipmentInt = 1;
+		int subSystemInt = 1;
+		Double healthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(null, null, analysisType)
+				.doubleValue();
+
+		healthScoreInfo = Double.parseDouble(df.format(healthScoreInfo));
+		LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
+		query.isNull(IdxBizFanHealthLevel::getStatus);
+		query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "全域");
+		query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, healthScoreInfo);
+		query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, healthScoreInfo);
+		IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
+
+		FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO();
+		allMapDto.setKey("0");
+		allMapDto.setName("全域设备健康状态指数");
+		allMapDto.setScoreRange("");
+		allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel());
+		allMapDto.setScore(healthScoreInfo);
+		allMapDto.setIsRoot(true);
+		allMapDto.setCategory("category");
+		allMapDto.setChildren(new ArrayList<>());
+		allMapDto.setParentKey("0");
+
+		for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> areaMap : resultMap
+				.entrySet()) {
+			Double areaLowScore = null;
+			Double areaHighScore = null;
+
+			Double areaHealthScoreInfo = idxBizFanHealthIndexMapper
+					.getHealthScoreInfoByParam(areaMap.getKey(), null, analysisType).doubleValue();
+			areaHealthScoreInfo = Double.parseDouble(df.format(areaHealthScoreInfo));
+			LambdaQueryWrapper<IdxBizFanHealthLevel> areaQuery = new LambdaQueryWrapper<>();
+			areaQuery.isNull(IdxBizFanHealthLevel::getStatus);
+			areaQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "片区");
+			areaQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, areaHealthScoreInfo);
+			areaQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, areaHealthScoreInfo);
+			IdxBizFanHealthLevel areaIdxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(areaQuery);
+
+			FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO();
+			areaMapDto.setKey("0-" + areaInt);
+			areaMapDto.setName(areaMap.getKey());
+			areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel());
+			areaMapDto.setScore(areaHealthScoreInfo);
+			areaMapDto.setParentKey(allMapDto.getKey());
+			allMapDto.getChildren().add(areaMapDto);
+			areaInt++;
+			List<FullViewRecallInfoDTO> areaMapList = new ArrayList<>();
+			for (Map.Entry<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>> stationMap : areaMap
+					.getValue().entrySet()) {
+				Double stationLowScore = null;
+				Double stationHighScore = null;
+				if (areaLowScore == null && areaHighScore == null) {
+					areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
+					areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
+				} else {
+					if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) < areaLowScore) {
+						areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
+					}
+					if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) > areaHighScore) {
+						areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
+					}
+				}
+
+				FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO();
+				stationDto.setKey(areaMapDto.getKey() + "-" + stationInt);
+				stationDto.setName(stationMap.getKey());
+
+				stationDto.setStatus("");
+				stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0));
+				LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>();
+				stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey());
+				stationQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "场站");
+				stationQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, stationDto.getScore());
+				stationQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, stationDto.getScore());
+				IdxBizFanHealthLevel stationLevel = idxBizFanHealthLevelMapper.selectOne(stationQuery);
+				stationDto.setStatus(ObjectUtils.isNotEmpty(stationLevel) ? stationLevel.getHealthLevel() : "");
+				if (ObjectUtils.isEmpty(stationLevel)) {
+					LambdaQueryWrapper<IdxBizPvHealthLevel> stationPvQuery = new LambdaQueryWrapper<>();
+					stationPvQuery.like(IdxBizPvHealthLevel::getStatus, stationMap.getKey());
+					stationPvQuery.eq(IdxBizPvHealthLevel::getAnalysisObjType, "场站");
+					stationPvQuery.lt(IdxBizPvHealthLevel::getGroupLowerLimit, stationDto.getScore());
+					stationPvQuery.ge(IdxBizPvHealthLevel::getGroupUpperLimit, stationDto.getScore());
+					IdxBizPvHealthLevel stationPvLevel = idxBizPvHealthLevelMapper.selectOne(stationPvQuery);
+					if (ObjectUtils.isNotEmpty(stationPvLevel)) {
+						stationDto.setStatus(stationPvLevel.getHealthLevel());
+					}
+				}
+				stationDto.setParentKey(areaMapDto.getKey());
+				areaMapDto.getChildren().add(stationDto);
+				stationInt++;
+				for (Map.Entry<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>> equipmentMap : stationMap
+						.getValue().entrySet()) {
+
+					if (stationLowScore == null && stationHighScore == null) {
+						stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
+						stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
+					} else {
+						if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) < stationLowScore) {
+							stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
+						}
+						if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) > stationHighScore) {
+							stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
+						}
+					}
+
+					FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO();
+					equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt);
+					equipmentMapDto.setName(equipmentMap.getKey());
+					equipmentMapDto.setScoreRange("");
+					IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(),
+							"设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
+					equipmentMapDto.setStatus(levelInfo.getHealthLevel());
+					equipmentMapDto.setScore(equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
+					equipmentMapDto.setParentKey(stationDto.getKey());
+					stationDto.getChildren().add(equipmentMapDto);
+					equipmentInt++;
+					for (Map.Entry<String, Map<String, List<FullViewRecallDataDTO>>> subSystemMap : equipmentMap
+							.getValue().entrySet()) {
+						FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO();
+						subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt);
+						subSystemMapDto.setName(subSystemMap.getKey());
+						subSystemMapDto.setScoreRange("");
 //                        subSystemMapDto.setStatus(null);
 
-                        IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "子系统", subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
-                        subSystemMapDto.setStatus(levelInfoZxt.getHealthLevel());
-
-                        subSystemMapDto.setScore(subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
-                        subSystemMapDto.setParentKey(equipmentMapDto.getKey());
-                        equipmentMapDto.getChildren().add(subSystemMapDto);
-                        subSystemInt++;
-                        for (Map.Entry<String, List<FullViewRecallDataDTO>> pointNameMap : subSystemMap.getValue().entrySet()) {
-                            FullViewRecallInfoDTO pointNameMapDto = new FullViewRecallInfoDTO();
-                            pointNameMapDto.setKey(subSystemMapDto.getKey() + "-" + pointNameInt);
-                            pointNameMapDto.setName(pointNameMap.getKey());
-
-                            FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0);
-
-                            pointNameMapDto.setScoreRange("");
-
-                            IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "测点", pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
-                            pointNameMapDto.setStatus(levelInfoBL.getHealthLevel());
-
-                            pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
-                            pointNameMapDto.setParentKey(subSystemMapDto.getKey());
-                            subSystemMapDto.getChildren().add(pointNameMapDto);
-
-                            pointNameInt++;
-                        }
-                    }
-                }
-                stationDto.setScoreRange("(最低：" + stationLowScore + "分, 最高：" + stationHighScore + "分)");
-            }
-
-            areaMapDto.setScoreRange("(最低：" + areaLowScore + "分, 最高：" + areaHighScore + "分)");
-        }
-        List<FullViewRecallInfoDTO> resultList = new ArrayList<>();
-        resultList.add(allMapDto);
-        resultList = getFullViewRecallResultByCurrentUser(resultList);
-        return ResponseHelper.buildResponse(resultList);
-    }
-
-
-    private IdxBizFanHealthLevel getHealthLevelByScore(List<IdxBizFanHealthLevel> healthLevelInfoList, String station, String type, Double score) {
-
-        IdxBizFanHealthLevel resultDto = new IdxBizFanHealthLevel();
-
-        String stationType = "风电站";
-        List<IdxBizFanHealthLevel> collect = healthLevelInfoList.stream().filter(item -> item.getAnalysisObjType().contains(station)).collect(Collectors.toList());
-        for (IdxBizFanHealthLevel item : collect) {
-            if (item.getAnalysisObjType().contains("子阵")) {
-                stationType = "光伏站";
-                break;
-            }
-        }
-        for (IdxBizFanHealthLevel item : collect) {
-            if (type.equals("设备") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
-                resultDto = item;
-                break;
-            }
-            if (type.equals("子系统") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
-                resultDto = item;
-                break;
-            }
-            if (type.equals("测点") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
-                resultDto = item;
-                break;
-            }
-            if (type.equals("设备") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("子阵") && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
-                resultDto = item;
-                break;
-            }
-            if (type.equals("子系统") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("设备") && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
-                resultDto = item;
-                break;
-            }
-        }
-        return resultDto;
-    }
-
-    private List<String> getGatewayIds() {
-        List<String> permissions = permissionService.getCurrentUserPermissions();
-        if (Objects.isNull(permissions)) {
-            permissions = Collections.emptyList();
-        }
-        return permissions;
-    }
-
-    private List<FullViewRecallInfoDTO> getFullViewRecallResultByCurrentUser(List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS) {
-        List<FullViewRecallInfoDTO> result = new ArrayList<>();
-        if (fullViewRecallInfoDTOS.size() > 0) {
-            String rootNodeName = permissionService.getCurrentUserPersmissions();
-            if (rootNodeName.equals("all")) {
-                return fullViewRecallInfoDTOS;
-            } else {
-                List<String> stringList = Arrays.asList(rootNodeName,rootNodeName.replace("片区","区域"),rootNodeName.replace("区域","片区"),rootNodeName.replace("电站","电场"),rootNodeName.replace("电场","电站"));
-                List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
-                if (fullViewRecallInfoDTOS1.size() > 0) {
-                    return fullViewRecallInfoDTOS1;
-                } else {
-                 List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS2 = fullViewRecallInfoDTOS.get(0).getChildren();
-                    for (FullViewRecallInfoDTO fullViewRecallInfoDTO : fullViewRecallInfoDTOS2) {
-                       List<FullViewRecallInfoDTO>  fullViewRecallInfoDTOS3=fullViewRecallInfoDTO.getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
-                       if (fullViewRecallInfoDTOS3.size()>0){
-                           return fullViewRecallInfoDTOS3;
-                       }
-                    }
-                }
-            }
-        }
-        return result;
-    }
+						IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList,
+								stationMap.getKey(), "子系统",
+								subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
+						subSystemMapDto.setStatus(levelInfoZxt.getHealthLevel());
+
+						subSystemMapDto.setScore(subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
+						subSystemMapDto.setParentKey(equipmentMapDto.getKey());
+						equipmentMapDto.getChildren().add(subSystemMapDto);
+						subSystemInt++;
+						for (Map.Entry<String, List<FullViewRecallDataDTO>> pointNameMap : subSystemMap.getValue()
+								.entrySet()) {
+							FullViewRecallInfoDTO pointNameMapDto = new FullViewRecallInfoDTO();
+							pointNameMapDto.setKey(subSystemMapDto.getKey() + "-" + pointNameInt);
+							pointNameMapDto.setName(pointNameMap.getKey());
+
+							FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0);
+
+							pointNameMapDto.setScoreRange("");
+
+							IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList,
+									stationMap.getKey(), "测点",
+									pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_"
+											+ fullViewRecallDataDTO.getIndexAddress(), 100.0));
+							pointNameMapDto.setStatus(levelInfoBL.getHealthLevel());
+
+							pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(
+									fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(),
+									100.0));
+							pointNameMapDto.setParentKey(subSystemMapDto.getKey());
+							subSystemMapDto.getChildren().add(pointNameMapDto);
+
+							pointNameInt++;
+						}
+					}
+				}
+				stationDto.setScoreRange("(最低：" + stationLowScore + "分, 最高：" + stationHighScore + "分)");
+			}
+
+			areaMapDto.setScoreRange("(最低：" + areaLowScore + "分, 最高：" + areaHighScore + "分)");
+		}
+		List<FullViewRecallInfoDTO> resultList = new ArrayList<>();
+		resultList.add(allMapDto);
+		resultList = getFullViewRecallResultByCurrentUser(resultList);
+		return ResponseHelper.buildResponse(resultList);
+	}
+
+	private IdxBizFanHealthLevel getHealthLevelByScore(List<IdxBizFanHealthLevel> healthLevelInfoList, String station,
+			String type, Double score) {
+
+		IdxBizFanHealthLevel resultDto = new IdxBizFanHealthLevel();
+
+		String stationType = "风电站";
+		List<IdxBizFanHealthLevel> collect = healthLevelInfoList.stream()
+				.filter(item -> item.getAnalysisObjType().contains(station)).collect(Collectors.toList());
+		for (IdxBizFanHealthLevel item : collect) {
+			if (item.getAnalysisObjType().contains("子阵")) {
+				stationType = "光伏站";
+				break;
+			}
+		}
+		for (IdxBizFanHealthLevel item : collect) {
+			if (type.equals("设备") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type)
+					&& score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
+				resultDto = item;
+				break;
+			}
+			if (type.equals("子系统") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type)
+					&& score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
+				resultDto = item;
+				break;
+			}
+			if (type.equals("测点") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit()
+					&& score <= item.getGroupUpperLimit()) {
+				resultDto = item;
+				break;
+			}
+			if (type.equals("设备") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("子阵")
+					&& score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
+				resultDto = item;
+				break;
+			}
+			if (type.equals("子系统") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("设备")
+					&& score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
+				resultDto = item;
+				break;
+			}
+		}
+		return resultDto;
+	}
+
+	private List<String> getGatewayIds() {
+		List<String> permissions = permissionService.getCurrentUserPermissions();
+		if (Objects.isNull(permissions)) {
+			permissions = Collections.emptyList();
+		}
+		return permissions;
+	}
+
+	private List<FullViewRecallInfoDTO> getFullViewRecallResultByCurrentUser(
+			List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS) {
+		List<FullViewRecallInfoDTO> result = new ArrayList<>();
+		if (fullViewRecallInfoDTOS.size() > 0) {
+			String rootNodeName = permissionService.getCurrentUserPersmissions();
+			if (rootNodeName.equals("all")) {
+				return fullViewRecallInfoDTOS;
+			} else {
+				List<String> stringList = Arrays.asList(rootNodeName, rootNodeName.replace("片区", "区域"),
+						rootNodeName.replace("区域", "片区"), rootNodeName.replace("电站", "电场"),
+						rootNodeName.replace("电场", "电站"));
+				List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren()
+						.stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
+				if (fullViewRecallInfoDTOS1.size() > 0) {
+					return fullViewRecallInfoDTOS1;
+				} else {
+					List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS2 = fullViewRecallInfoDTOS.get(0).getChildren();
+					for (FullViewRecallInfoDTO fullViewRecallInfoDTO : fullViewRecallInfoDTOS2) {
+						List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS3 = fullViewRecallInfoDTO.getChildren()
+								.stream().filter(item -> stringList.contains(item.getName()))
+								.collect(Collectors.toList());
+						if (fullViewRecallInfoDTOS3.size() > 0) {
+							return fullViewRecallInfoDTOS3;
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/Constant.java

@@ -13,20 +13,21 @@ import java.util.Date;
 public interface Constant {
 
     // 风电相关性消费者
-    String kafkaTopicConsumer = "FanConditionVariables";
+    String kafkaTopicConsumer = "FAN_XGX";
     // 光伏相关性消费者
-    String kafkaTopicConsumerPv = "PvConditionVariables";
+    String kafkaTopicConsumerPv = "PV_XGX";
 
 
     // 风电 工况区间划分
-    String kafkaTopicConsumerGKHFFan = "FanConditionVariablesGKHF";
+    String kafkaTopicConsumerGKHFFan = "FAN_QJHF";
     // 光伏 工况区间划分
-    String kafkaTopicConsumerGKHFPv = "PvConditionVariablesGKHF";
+    String kafkaTopicConsumerGKHFPv = "PV_QJHF";
 
 
     // 风电 中心值计算
-    String kafkaTopicConsumerZXZFan = "FanConditionVariablesGZXZ";
+    String kafkaTopicConsumerZXZFan = "FAN_ZXZ";
     // 光伏 中心值计算
-    String kafkaTopicConsumerZXZPv = "PvConditionVariablesZXZ";
+    String kafkaTopicConsumerZXZPv = "PV_ZXZ";
+    
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
-
 import cn.hutool.core.util.DesensitizedUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -63,331 +62,331 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper> implements IPersonBasicService {
-
-    @Autowired
-    PersonBasicMapper personBasicMapper;
-
-
-    //人员账号信息service
-    @Autowired
-    PersonAccountServiceImpl personAccountService;
-    //人员归属信息service
-    @Autowired
-    PersonAscriptionServiceImpl personAscriptionService;
-    //人员资质信息service
-    @Autowired
-    PersonCertificateServiceImpl personCertificateService;
-    //人员教育信息
-    @Autowired
-    PersonSkillEducationServiceImpl personSkillEducationService;
-    @Value("${amos.secret.key}")
-    String secretKey;
-    @Autowired
-    QuerueProduce querueProduce;
-
-    @Autowired
-    private AmosFeignService amosFeignService;
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-    @Autowired
-    protected EmqKeeper emqKeeper;
-
-
-    @Autowired
-    private AgencyuserFeign agencyuserFeign;
-
-    @Autowired
-    private UserEmpowerMapper userEmpowerMapper;
-
-    /**
-     * 人员赋码触发风险模型
-     */
-    public static final String RYFM_DATA_MQTT_TOPIC = "ryfm/data/analysis";
-
-
-    /**
-     * 人员红黄码恢复为绿码
-     */
-    public static final String RYFM_GREEN = "ryfm/person/green";
-
-
-
-    private String UPDATE="UPDATE";
-    private String INSERT="INSERT";
-    @Autowired
-    PersonAccountFedMapper personAccountFedMapper;
-    /**
-     * 分页查询
-     */
-    public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<PersonBasicDto> queryForPersonBasicList() {
-        return this.queryForList("", false);
-    }
-
-    public void addRedisPostAndCerInfo() {
-        List<DictionarieValueModel> elevatorCategory = null;
-        try {
-            elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Map<String, String> collect = elevatorCategory.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
-        redisUtils.set(Constants.JXIOP_DICT_POST, collect);
-
-        List<DictionarieValueModel> elevator = null;
-        try {
-            elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Map<String, String> collect2 = elevator.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
-        redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2);
-    }
-
-
-    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) {
-        RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
-        riskBizInfoVo.setWarningObjectName(personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
-        riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
-        riskBizInfoVo.setSourceAttribution(personBasic.getProjectOrgCode());
-        riskBizInfoVo.setSourceAttributionDesc(personAccount.getProjectName());
-        riskBizInfoVo.setWarningObjectType("RYFM");
-        List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
-        RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
-        dynamicDetailsVo.setTabName("预警详情");
-        detailsVos.add(dynamicDetailsVo);
-        riskBizInfoVo.setDynamicDetails(detailsVos);
-        CustomizeItems customizeItems = new CustomizeItems();
-        customizeItems.setWarningContent(content);
-        riskBizInfoVo.setCustomizeItems(customizeItems);
-        return riskBizInfoVo;
-    }
-
-
-    /**
-     * 新增
-     */
-    @Transactional
-    public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) throws Exception {
-        if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
-            addRedisPostAndCerInfo();
-        }
-        // 岗位所需证书信息
-        Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
-        // 证书临期信息
-        Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
-
-        //获取人员基本信息数据
-        PersonUser personUser = model.getPersonUser();
-        //获取人员账号信息
-        PersonAccount personAccount = model.getPersonAccount();
-        personUser.setPhone(personAccount.getPhoneNum());
-        //人员基础信息
-        PersonBasic personBasic = new PersonBasic();
-        BeanUtils.copyProperties(personUser, personBasic);
-        //默认红码
-        personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
-        personBasic.setQrcodeDesc("证书不全");
-        // 该岗位应获得的证书
-        List<String> list2 = new ArrayList<>();
-        if (StringUtils.isNotEmpty(personUser.getPostName())) {
-            String certificates = postNameMap.get(personUser.getPostName());
-            if (!StringUtils.isEmpty(certificates)) {
-                list2 = Arrays.asList(certificates.split(","));
-            }
-        }
-        List<String> list = new ArrayList(list2);
-        //人员资质信息
-        Integer isInMonth = 0;
-        Integer isOver = 0;
-        CertificationInfo personCertificate = model.getPersonCertificate();
-
-        // 过期的证书
-        List<String> overCertificateList = new ArrayList<>();
-        // 临期证书
-        List<String> inMonthCertificateList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
-            for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
-                    int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
-                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
-                    if (list.contains(item.getCertificateName()) &&
-                            DateUtils.dateCompare(date, new Date()) == -1) {
-                        isOver = 1;
-                        overCertificateList.add(item.getCertificateName());
-                    }
-                    if (list.contains(item.getCertificateName()) &&
-                            DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) &&
-                            DateUtils.dateCompare(date, new Date()) == 1) {
-                        isInMonth = 1;
-                        inMonthCertificateList.add(item.getCertificateName());
-                    }
-                }
-                list.remove(item.getCertificateName());
-            }
-        }
-        // 缺证
-        List<String> noCertificateList = new ArrayList<>(list);
-        List<String> strings = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(overCertificateList)) {
-            strings.add("过期证书：" + String.join("，" , overCertificateList));
-        }
-        if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
-            strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
-        }
-        if (CollectionUtils.isNotEmpty(noCertificateList)) {
-            strings.add("缺少证书：" + String.join("，" , noCertificateList));
-        }
-        String join = "";
-        if (CollectionUtils.isNotEmpty(strings)) {
-            join = String.join("；", strings);
-        }
-        personBasic.setMissingCertificate(join);
-
-        if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
-            personBasic.setQrcodeDesc("证书齐全");
-            personBasic.setQrcodeDate(new Date());
-        } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
-            personBasic.setQrcodeDesc("证书不全");
-            personBasic.setQrcodeDate(new Date());
-        } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
-            personBasic.setQrcodeDesc("证书临期");
-            personBasic.setQrcodeDate(new Date());
-        }
-        CompanyModel companyModel = new CompanyModel();
-        //单位
-        companyModel = this.getCompanyModel(personAccount.getProjectId());
-        personBasic.setProjectOrgCode(companyModel.getOrgCode());
-
-
-        if (personUser.getNativePlace()!=null) {
-            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
-        }
-        this.baseMapper.insert(personBasic);
-
-        if ("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc())) {
-            personBasic.setProjectOrgCode(companyModel.getOrgCode());
-            personAccount.setProjectName(companyModel.getCompanyName());
-            BizMessage bizMessage = new BizMessage();
-            bizMessage.setIndexKey("RYFM");
-            bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-            RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
-            bizMessage.setBizInfo(riskBizInfoVo);
-            bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
-            try {
-                emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
-            } catch (MqttException e) {
-                e.printStackTrace();
-            }
-        }
-        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
-            personCertificate.getCertificationInfo().forEach(item -> {
-                item.setPersonId(personBasic.getSequenceNbr());
-                personCertificateService.save(item);
-            });
-        }
-        //人员技能学历信息
-        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
-        BeanUtils.copyProperties(personUser, personSkillEducation);
-        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
-        personSkillEducationService.save(personSkillEducation);
-
-        //人员账号信息
-        personAccount.setPersonId(personBasic.getSequenceNbr());
-        personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
-        personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
-        personAccountService.save(personAccount);
-        //新增平台账号
-        //组装数据
-        AgencyUserModel usd = new AgencyUserModel();
-        //应用
-        usd.setAppCodes(personAccount.getApplication());
-        //手机号
-        usd.setMobile(personUser.getPhone());
-        //角色
-        Map<Long, List<Long>> map = new HashMap<>();
-        List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if (personAccount.getDepartmentId() != null) {
-
-            map.put(personAccount.getDepartmentId(), cdids);
-        } else {
-            map.put(personAccount.getProjectId(), cdids);
-        }
-        usd.setOrgRoleSeqs(map);
-        //密码
-        usd.setPassword(personAccount.getPassword());
-        //二次密码
-        usd.setRePassword(personAccount.getSecondaryPassword());
-        //用户名
-        usd.setRealName(personAccount.getName());
-        //账号
-        usd.setUserName(personAccount.getAccountName());
-        usd.setLockStatus("UNLOCK");
-        //新增平台用户
-        AgencyUserModel agencyUserModel = this.setcreateUser(usd);
-        //设置userID
-        usd.setUserId(agencyUserModel.getUserId());
-        //设置工号
-        usd.setUserName(personAccount.getJobNumber());
-        //创建支持工号登录
-        this.createLoginInfo(usd);
-        //查询部门
-        DepartmentModel departmentModel = null;
-        if (personAccount.getDepartmentId() != null) {
-            departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
-        }
-
-        if (departmentModel != null) {
-            //personBasic.setProjectOrgCode(departmentModel.getOrgCode());
-            personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
-        }
+public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper>
+		implements IPersonBasicService {
+
+	@Autowired
+	PersonBasicMapper personBasicMapper;
+
+	// 人员账号信息service
+	@Autowired
+	PersonAccountServiceImpl personAccountService;
+	// 人员归属信息service
+	@Autowired
+	PersonAscriptionServiceImpl personAscriptionService;
+	// 人员资质信息service
+	@Autowired
+	PersonCertificateServiceImpl personCertificateService;
+	// 人员教育信息
+	@Autowired
+	PersonSkillEducationServiceImpl personSkillEducationService;
+	@Value("${amos.secret.key}")
+	String secretKey;
+	@Autowired
+	QuerueProduce querueProduce;
+
+	@Autowired
+	private AmosFeignService amosFeignService;
+
+	@Autowired
+	private RedisUtils redisUtils;
+
+	@Autowired
+	protected EmqKeeper emqKeeper;
+
+	@Autowired
+	private AgencyuserFeign agencyuserFeign;
+
+	@Autowired
+	private UserEmpowerMapper userEmpowerMapper;
+
+	/**
+	 * 人员赋码触发风险模型
+	 */
+	public static final String RYFM_DATA_MQTT_TOPIC = "ryfm/data/analysis";
+
+	/**
+	 * 人员红黄码恢复为绿码
+	 */
+	public static final String RYFM_GREEN = "ryfm/person/green";
+
+	private String UPDATE = "UPDATE";
+	private String INSERT = "INSERT";
+	@Autowired
+	PersonAccountFedMapper personAccountFedMapper;
+
+	/**
+	 * 分页查询
+	 */
+	public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
+		return this.queryForPage(page, null, false);
+	}
+
+	/**
+	 * 列表查询 示例
+	 */
+	public List<PersonBasicDto> queryForPersonBasicList() {
+		return this.queryForList("", false);
+	}
+
+	public void addRedisPostAndCerInfo() {
+		List<DictionarieValueModel> elevatorCategory = null;
+		try {
+			elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Map<String, String> collect = elevatorCategory.stream().collect(
+				Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+		redisUtils.set(Constants.JXIOP_DICT_POST, collect);
+
+		List<DictionarieValueModel> elevator = null;
+		try {
+			elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Map<String, String> collect2 = elevator.stream().collect(
+				Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+		redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2);
+	}
+
+	public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) {
+		RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
+		riskBizInfoVo.setWarningObjectName(
+				personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
+		riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
+		riskBizInfoVo.setSourceAttribution(personBasic.getProjectOrgCode());
+		riskBizInfoVo.setSourceAttributionDesc(personAccount.getProjectName());
+		riskBizInfoVo.setWarningObjectType("RYFM");
+		List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
+		RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
+		dynamicDetailsVo.setTabName("预警详情");
+		detailsVos.add(dynamicDetailsVo);
+		riskBizInfoVo.setDynamicDetails(detailsVos);
+		CustomizeItems customizeItems = new CustomizeItems();
+		customizeItems.setWarningContent(content);
+		riskBizInfoVo.setCustomizeItems(customizeItems);
+		return riskBizInfoVo;
+	}
+
+	/**
+	 * 新增
+	 */
+	@Transactional
+	public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) throws Exception {
+		if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
+			addRedisPostAndCerInfo();
+		}
+		// 岗位所需证书信息
+		Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
+		// 证书临期信息
+		Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
+
+		// 获取人员基本信息数据
+		PersonUser personUser = model.getPersonUser();
+		// 获取人员账号信息
+		PersonAccount personAccount = model.getPersonAccount();
+		personUser.setPhone(personAccount.getPhoneNum());
+		// 人员基础信息
+		PersonBasic personBasic = new PersonBasic();
+		BeanUtils.copyProperties(personUser, personBasic);
+		// 默认红码
+		personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+		personBasic.setQrcodeDesc("证书不全");
+		// 该岗位应获得的证书
+		List<String> list2 = new ArrayList<>();
+		if (StringUtils.isNotEmpty(personUser.getPostName())) {
+			String certificates = postNameMap.get(personUser.getPostName());
+			if (!StringUtils.isEmpty(certificates)) {
+				list2 = Arrays.asList(certificates.split(","));
+			}
+		}
+		List<String> list = new ArrayList(list2);
+		// 人员资质信息
+		Integer isInMonth = 0;
+		Integer isOver = 0;
+		CertificationInfo personCertificate = model.getPersonCertificate();
+
+		// 过期的证书
+		List<String> overCertificateList = new ArrayList<>();
+		// 临期证书
+		List<String> inMonthCertificateList = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+			for (PersonCertificate item : personCertificate.getCertificationInfo()) {
+				if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
+					int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3
+							: Integer.parseInt(item.getValidPeriod());
+					Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
+					if (list.contains(item.getCertificateName()) && DateUtils.dateCompare(date, new Date()) == -1) {
+						isOver = 1;
+						overCertificateList.add(item.getCertificateName());
+					}
+					if (list.contains(item.getCertificateName())
+							&& DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer
+									.valueOf(certificatesMap.get(item.getCertificateName()))
+							&& DateUtils.dateCompare(date, new Date()) == 1) {
+						isInMonth = 1;
+						inMonthCertificateList.add(item.getCertificateName());
+					}
+				}
+				list.remove(item.getCertificateName());
+			}
+		}
+		// 缺证
+		List<String> noCertificateList = new ArrayList<>(list);
+		List<String> strings = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(overCertificateList)) {
+			strings.add("过期证书：" + String.join("，", overCertificateList));
+		}
+		if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
+			strings.add("临期证书：" + String.join("，", inMonthCertificateList));
+		}
+		if (CollectionUtils.isNotEmpty(noCertificateList)) {
+			strings.add("缺少证书：" + String.join("，", noCertificateList));
+		}
+		String join = "";
+		if (CollectionUtils.isNotEmpty(strings)) {
+			join = String.join("；", strings);
+		}
+		personBasic.setMissingCertificate(join);
+
+		if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
+			personBasic.setQrcodeDesc("证书齐全");
+			personBasic.setQrcodeDate(new Date());
+		} else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+			personBasic.setQrcodeDesc("证书不全");
+			personBasic.setQrcodeDate(new Date());
+		} else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
+			personBasic.setQrcodeDesc("证书临期");
+			personBasic.setQrcodeDate(new Date());
+		}
+		CompanyModel companyModel = new CompanyModel();
+		// 单位
+		companyModel = this.getCompanyModel(personAccount.getProjectId());
+		personBasic.setProjectOrgCode(companyModel.getOrgCode());
+
+		if (personUser.getNativePlace() != null) {
+			personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+		}
+		this.baseMapper.insert(personBasic);
+
+		if ("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc())) {
+			personBasic.setProjectOrgCode(companyModel.getOrgCode());
+			personAccount.setProjectName(companyModel.getCompanyName());
+			BizMessage bizMessage = new BizMessage();
+			bizMessage.setIndexKey("RYFM");
+			bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
+			RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
+			bizMessage.setBizInfo(riskBizInfoVo);
+			bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
+			try {
+				emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC,
+						JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
+			} catch (MqttException e) {
+				e.printStackTrace();
+			}
+		}
+		if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+			personCertificate.getCertificationInfo().forEach(item -> {
+				item.setPersonId(personBasic.getSequenceNbr());
+				personCertificateService.save(item);
+			});
+		}
+		// 人员技能学历信息
+		PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+		BeanUtils.copyProperties(personUser, personSkillEducation);
+		personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+		personSkillEducationService.save(personSkillEducation);
+
+		// 人员账号信息
+		personAccount.setPersonId(personBasic.getSequenceNbr());
+		personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
+		personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
+		personAccountService.save(personAccount);
+		// 新增平台账号
+		// 组装数据
+		AgencyUserModel usd = new AgencyUserModel();
+		// 应用
+		usd.setAppCodes(personAccount.getApplication());
+		// 手机号
+		usd.setMobile(personUser.getPhone());
+		// 角色
+		Map<Long, List<Long>> map = new HashMap<>();
+		List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim()))
+				.collect(Collectors.toList()); // 测点数组
+		if (personAccount.getDepartmentId() != null) {
+
+			map.put(personAccount.getDepartmentId(), cdids);
+		} else {
+			map.put(personAccount.getProjectId(), cdids);
+		}
+		usd.setOrgRoleSeqs(map);
+		// 密码
+		usd.setPassword(personAccount.getPassword());
+		// 二次密码
+		usd.setRePassword(personAccount.getSecondaryPassword());
+		// 用户名
+		usd.setRealName(personAccount.getName());
+		// 账号
+		usd.setUserName(personAccount.getAccountName());
+		usd.setLockStatus("UNLOCK");
+		// 新增平台用户
+		AgencyUserModel agencyUserModel = this.setcreateUser(usd);
+		// 设置userID
+		usd.setUserId(agencyUserModel.getUserId());
+		// 设置工号
+		usd.setUserName(personAccount.getJobNumber());
+		// 创建支持工号登录
+		this.createLoginInfo(usd);
+		// 查询部门
+		DepartmentModel departmentModel = null;
+		if (personAccount.getDepartmentId() != null) {
+			departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
+		}
+
+		if (departmentModel != null) {
+			// personBasic.setProjectOrgCode(departmentModel.getOrgCode());
+			personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
+		}
 //            personBasic.setProjectOrgCode(companyModel.getOrgCode());
 //
 //
 //        if (personUser.getNativePlace()!=null) {
 //            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
 //        }
-        personAccount.setPuserId(agencyUserModel.getUserId());
-        personAccount.setProjectName(companyModel.getCompanyName());
+		personAccount.setPuserId(agencyUserModel.getUserId());
+		personAccount.setProjectName(companyModel.getCompanyName());
 //        this.personBasicMapper.updateById(personBasic);
-        this.personAccountService.updateById(personAccount);
-        //----------------------------权限表中新增数据-----------------------------
-        StdUserEmpower stdUserEmpower = new StdUserEmpower();
-        stdUserEmpower.setPermissionType("YTH");
-        stdUserEmpower.setRecDate(new Date());
-        stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
-        stdUserEmpower.setAmosUserId(personAccount.getPuserId());
-        userEmpowerMapper.insert(stdUserEmpower);
-
-       //----------------------------户用管理端区域公司---------------------------
-
-        StdUserEmpower stdUserEmpowerhygf = new StdUserEmpower();
-        List<CompanyModel>  co=   userEmpowerMapper.getCompanyBoList("region",null,null);
-        List<String> re=  personAccount.getRegionalCompaniesSeq();
-
-        String  flag=personAccount.getRegionalCompaniesSeqFlag();
-        if(flag!=null&&!flag.isEmpty()){
-          if(flag.equals("all")){
-              List<String> all=new ArrayList<>();
-              all.add("all");
-              stdUserEmpowerhygf.setAmosOrgCode(all);
-          }else{
-              stdUserEmpowerhygf.setAmosOrgCode(re);
-          }
-        }
-        List<String> exre=  personAccount.getExternalRegionalCompaniesSeq();
+		this.personAccountService.updateById(personAccount);
+		// ----------------------------权限表中新增数据-----------------------------
+		StdUserEmpower stdUserEmpower = new StdUserEmpower();
+		stdUserEmpower.setPermissionType("YTH");
+		stdUserEmpower.setRecDate(new Date());
+		stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+		stdUserEmpower.setAmosUserId(personAccount.getPuserId());
+		userEmpowerMapper.insert(stdUserEmpower);
+
+		// ----------------------------户用管理端区域公司---------------------------
+
+		StdUserEmpower stdUserEmpowerhygf = new StdUserEmpower();
+		List<CompanyModel> co = userEmpowerMapper.getCompanyBoList("region", null, null);
+		List<String> re = personAccount.getRegionalCompaniesSeq();
+
+		String flag = personAccount.getRegionalCompaniesSeqFlag();
+		if (flag != null && !flag.isEmpty()) {
+			if (flag.equals("all")) {
+				List<String> all = new ArrayList<>();
+				all.add("all");
+				stdUserEmpowerhygf.setAmosOrgCode(all);
+			} else {
+				stdUserEmpowerhygf.setAmosOrgCode(re);
+			}
+		}
+		List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
 //        if(exre!=null&&!exre.isEmpty()){
 //            List<String> pexre=new ArrayList<>();
 //            List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
@@ -398,278 +397,275 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 //            }
 //            stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
 //        }
-        stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
-        stdUserEmpowerhygf.setPermissionType("HYGF");
-        stdUserEmpowerhygf.setRecDate(new Date());
-        stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
-        userEmpowerMapper.insert(stdUserEmpowerhygf);
-
-
-
-
-
-
-
-        //----------------------------权限表中新增数据-----------------------------
-        PersonAccountFed personAccountFed = new PersonAccountFed();
-        BeanUtils.copyProperties(personAccount, personAccountFed);
-        personAccountFed.setSyncState(0);
-        personAccountFed.setSyncDate(new Date());
-        personAccountFedMapper.insert(personAccountFed);
-
-        Map<String, Object> data=new HashMap<>();
-        data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr());
-        ProduceMsg produceMsg=  new ProduceMsg(data, INSERT,agencyUserModel.getUserId());
-        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
-
-    }
-
-
-    @Transactional
-    public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr) throws ParseException {
-
-        if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
-            addRedisPostAndCerInfo();
-        }
-        // 岗位所需证书信息
-        Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
-        // 证书临期信息
-        Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
-
-        //获取人员基本信息数据
-        PersonUser personUser = model.getPersonUser();
-        //获取人员账号信息
-        PersonAccount personAccount = model.getPersonAccount();
-        PersonAccount oldpersonAccount = new PersonAccount();
-        personUser.setPhone(personAccount.getPhoneNum());
-
-        //人员基础信息
-        PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr);
-        personBasic.setSequenceNbr(sequenceNbr);
-        personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
-        personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
-
-        //人员归属信息
-        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
-        BeanUtils.copyProperties(personUser, personSkillEducation);
-        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
-        PersonSkillEducation personSkillEducationd = personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
-        personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
-        personSkillEducationService.updateById(personSkillEducation);
-
-        //获取人员资质信息
-        CertificationInfo personCertificate = model.getPersonCertificate();
-
-        LambdaUpdateWrapper<PersonCertificate> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(PersonCertificate::getPersonId, personBasic.getSequenceNbr());
-        personCertificateService.remove(wrapper);
-
-        //默认红码
+		stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
+		stdUserEmpowerhygf.setPermissionType("HYGF");
+		stdUserEmpowerhygf.setRecDate(new Date());
+		stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
+		userEmpowerMapper.insert(stdUserEmpowerhygf);
+
+		// ----------------------------权限表中新增数据-----------------------------
+		PersonAccountFed personAccountFed = new PersonAccountFed();
+		BeanUtils.copyProperties(personAccount, personAccountFed);
+		personAccountFed.setSyncState(0);
+		personAccountFed.setSyncDate(new Date());
+		personAccountFedMapper.insert(personAccountFed);
+
+		Map<String, Object> data = new HashMap<>();
+		data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
+		ProduceMsg produceMsg = new ProduceMsg(data, INSERT, agencyUserModel.getUserId());
+		querueProduce.produceMsg(JSON.toJSONString(produceMsg));
+
+	}
+
+	@Transactional
+	public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr)
+			throws ParseException {
+
+		if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
+			addRedisPostAndCerInfo();
+		}
+		// 岗位所需证书信息
+		Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
+		// 证书临期信息
+		Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
+
+		// 获取人员基本信息数据
+		PersonUser personUser = model.getPersonUser();
+		// 获取人员账号信息
+		PersonAccount personAccount = model.getPersonAccount();
+		PersonAccount oldpersonAccount = new PersonAccount();
+		personUser.setPhone(personAccount.getPhoneNum());
+
+		// 人员基础信息
+		PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr);
+		personBasic.setSequenceNbr(sequenceNbr);
+		personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
+		personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
+
+		// 人员归属信息
+		PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+		BeanUtils.copyProperties(personUser, personSkillEducation);
+		personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+		PersonSkillEducation personSkillEducationd = personSkillEducationService
+				.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
+		personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
+		personSkillEducationService.updateById(personSkillEducation);
+
+		// 获取人员资质信息
+		CertificationInfo personCertificate = model.getPersonCertificate();
+
+		LambdaUpdateWrapper<PersonCertificate> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.eq(PersonCertificate::getPersonId, personBasic.getSequenceNbr());
+		personCertificateService.remove(wrapper);
+
+		// 默认红码
 //        personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
-        // 该岗位应获得的证书
-        List<String> list2 = new ArrayList<>();
-        if (StringUtils.isNotEmpty(personUser.getPostName())) {
-            String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
-            if (!StringUtils.isEmpty(certificates)) {
-                list2 = Arrays.asList(certificates.split(","));
-            }
-        }
-        List<String> list = new ArrayList(list2);
-        //人员资质信息
-        Integer isInMonth = 0;
-        Integer isOver = 0;
-        // 过期的证书
-        List<String> overCertificateList = new ArrayList<>();
-        // 临期证书
-        List<String> inMonthCertificateList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
-            for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
-                    int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
-                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
-                    if (list.contains(item.getCertificateName()) &&
-                            DateUtils.dateCompare(date, new Date()) == -1) {
-                        isOver = 1;
-                        overCertificateList.add(item.getCertificateName());
-                    }
-                    if (list.contains(item.getCertificateName()) &&
-                            DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) &&
-                            DateUtils.dateCompare(date, new Date()) == 1) {
-                        isInMonth = 1;
-                        inMonthCertificateList.add(item.getCertificateName());
-                    }
-                    item.setPersonId(personBasic.getSequenceNbr());
-                    personCertificateService.save(item);
-                }
-                list.remove(item.getCertificateName());
-            }
-        }
-        // 缺证
-        List<String> noCertificateList = new ArrayList<>(list);
-
-        List<String> strings = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(overCertificateList)) {
-            strings.add("过期证书：" + String.join("，" , overCertificateList));
-        }
-        if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
-            strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
-        }
-        if (CollectionUtils.isNotEmpty(noCertificateList)) {
-            strings.add("缺少证书：" + String.join("，" , noCertificateList));
-        }
-
-        String join = "";
-        if (CollectionUtils.isNotEmpty(strings)) {
-            join = String.join("；", strings);
-        }
-        String missingCertificateOld = personBasic.getMissingCertificate();
-        personBasic.setMissingCertificate(join);
-        CompanyModel companyModel = new CompanyModel();
-        //单位
-        companyModel = this.getCompanyModel(personAccount.getProjectId());
-
-        String qrcodeColorOld = personBasic.getQrcodeColor();
-        if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
-            personBasic.setQrcodeDesc("证书齐全");
-            personBasic.setQrcodeDate(new Date());
-        } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
-            personBasic.setQrcodeDesc("证书不全");
-            personBasic.setQrcodeDate(new Date());
-        } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
-            personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
-            personBasic.setQrcodeDesc("证书临期");
-            personBasic.setQrcodeDate(new Date());
-        }
-        personBasic.setProjectOrgCode(companyModel.getOrgCode());
-        personAccount.setProjectName(companyModel.getCompanyName());
-
-
-
-
-        //人员账号信息
-        personAccount.setPersonId(sequenceNbr);
-        oldpersonAccount=personAccountService.getById(personAccount.getSequenceNbr());
-        personAccountService.updateById(personAccount);
-        //新增平台账号
-        //组装数据
-        AgencyUserModel usd = new AgencyUserModel();
-        //应用
-        usd.setAppCodes(personAccount.getApplication());
-        //手机号
-        usd.setMobile(personUser.getPhone());
-        //角色
-        Map<Long, List<Long>> map = new HashMap<>();
-        List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if (personAccount.getDepartmentId() != null) {
-
-            map.put(personAccount.getDepartmentId(), cdids);
-        } else {
-            map.put(personAccount.getProjectId(), cdids);
-        }
-        usd.setOrgRoleSeqs(map);
-        //密码
-        usd.setPassword(personAccount.getPassword());
-        //二次密码
-        usd.setRePassword(personAccount.getSecondaryPassword());
-        //用户名
-        usd.setRealName(personAccount.getName());
-        //账号
-        usd.setUserName(personAccount.getAccountName());
-        usd.setLockStatus("UNLOCK");
-        usd.setUserId(personAccount.getPuserId());
-        usd.setOriginalPassword(oldpersonAccount.getPassword());
-        //新增平台用户
-        AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
-        log.info("更新平台账户信息：："+ JSONObject.toJSONString(usd));
-        //设置userID
-        usd.setUserId(agencyUserModel.getUserId());
-        //设置工号
-        usd.setUserName(personAccount.getJobNumber());
-        //创建支持工号登录
-        this.updateLoginInfo(oldpersonAccount.getJobNumber(),usd);
-        //查询部门
-        DepartmentModel departmentModel = null;
-        if (personAccount.getDepartmentId() != null) {
-            departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
-        }
-        BeanUtils.copyProperties(personUser, personBasic, "qrcodeDesc", "qrcodeColor");
-        if (departmentModel != null) {
-            //personBasic.setProjectOrgCode(departmentModel.getOrgCode());
-            personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
-        }
-            personBasic.setProjectOrgCode(companyModel.getOrgCode());
-
-        if (personUser.getNativePlace() != null) {
-            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
-        }
-        personAccount.setProjectName(companyModel.getCompanyName());
-
-        if (!join.equals(missingCertificateOld)) {
-            personBasic.setRecDate(new Date());
-            this.personBasicMapper.updateById(personBasic);
-            if (("证书不全".equals(personBasic.getQrcodeDesc()) ||
-                    "证书临期".equals(personBasic.getQrcodeDesc()))) {
-                BizMessage bizMessage = new BizMessage();
-                bizMessage.setIndexKey("RYFM");
-                bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
-                bizMessage.setBizInfo(riskBizInfoVo);
-                bizMessage.setDataSource("人员赋码");
-                try {
-                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                }
-            } else if ("证书齐全".equals(personBasic.getQrcodeDesc())) {
-                HashMap<String, String> personMap = new HashMap<>();
-                personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr()));
-                personMap.put("qrCodeColor", qrcodeColorOld);
-                personMap.put("warningObjectType", "RYFM");
-                personMap.put("sourceAttribution", personBasic.getProjectOrgCode());
-                personMap.put("sourceAttributionDesc", personAccount.getProjectName());
-                personMap.put("warningSourceType", "人员赋码");
-                try {
-                    emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN, JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false);
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                }
-            }
-        } else {
-            this.personBasicMapper.updateById(personBasic);
-        }
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
-        if(ObjectUtils.isEmpty(stdUserEmpower)){
-            stdUserEmpower = new StdUserEmpower();
-            stdUserEmpower.setRecDate(new Date());
-            stdUserEmpower.setPermissionType("YTH");
-            stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
-            stdUserEmpower.setAmosUserId(personAccount.getPuserId());
-            userEmpowerMapper.insert(stdUserEmpower);
-        }else {
-            stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
-            stdUserEmpower.setRecDate(new Date());
-            userEmpowerMapper.updateById(stdUserEmpower);
-        }
-        //户用角色权限
-
-        StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
-        if(ObjectUtils.isEmpty(stdUserEmpowerhygf)){
-            stdUserEmpowerhygf=new StdUserEmpower();
-            List<CompanyModel>  co=   userEmpowerMapper.getCompanyBoList("region",null,null);
-            List<String> re=  personAccount.getRegionalCompaniesSeq();
-            String  flag=personAccount.getRegionalCompaniesSeqFlag();
-            if(flag!=null&&!flag.isEmpty()){
-                if(flag.equals("all")){
-                    List<String> all=new ArrayList<>();
-                    all.add("all");
-                    stdUserEmpowerhygf.setAmosOrgCode(all);
-                }else{
-                    stdUserEmpowerhygf.setAmosOrgCode(re);
-                }
-            }
-            List<String> exre=  personAccount.getExternalRegionalCompaniesSeq();
+		// 该岗位应获得的证书
+		List<String> list2 = new ArrayList<>();
+		if (StringUtils.isNotEmpty(personUser.getPostName())) {
+			String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
+			if (!StringUtils.isEmpty(certificates)) {
+				list2 = Arrays.asList(certificates.split(","));
+			}
+		}
+		List<String> list = new ArrayList(list2);
+		// 人员资质信息
+		Integer isInMonth = 0;
+		Integer isOver = 0;
+		// 过期的证书
+		List<String> overCertificateList = new ArrayList<>();
+		// 临期证书
+		List<String> inMonthCertificateList = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+			for (PersonCertificate item : personCertificate.getCertificationInfo()) {
+				if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
+					int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3
+							: Integer.parseInt(item.getValidPeriod());
+					Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
+					if (list.contains(item.getCertificateName()) && DateUtils.dateCompare(date, new Date()) == -1) {
+						isOver = 1;
+						overCertificateList.add(item.getCertificateName());
+					}
+					if (list.contains(item.getCertificateName())
+							&& DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer
+									.valueOf(certificatesMap.get(item.getCertificateName()))
+							&& DateUtils.dateCompare(date, new Date()) == 1) {
+						isInMonth = 1;
+						inMonthCertificateList.add(item.getCertificateName());
+					}
+					item.setPersonId(personBasic.getSequenceNbr());
+					personCertificateService.save(item);
+				}
+				list.remove(item.getCertificateName());
+			}
+		}
+		// 缺证
+		List<String> noCertificateList = new ArrayList<>(list);
+
+		List<String> strings = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(overCertificateList)) {
+			strings.add("过期证书：" + String.join("，", overCertificateList));
+		}
+		if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
+			strings.add("临期证书：" + String.join("，", inMonthCertificateList));
+		}
+		if (CollectionUtils.isNotEmpty(noCertificateList)) {
+			strings.add("缺少证书：" + String.join("，", noCertificateList));
+		}
+
+		String join = "";
+		if (CollectionUtils.isNotEmpty(strings)) {
+			join = String.join("；", strings);
+		}
+		String missingCertificateOld = personBasic.getMissingCertificate();
+		personBasic.setMissingCertificate(join);
+		CompanyModel companyModel = new CompanyModel();
+		// 单位
+		companyModel = this.getCompanyModel(personAccount.getProjectId());
+
+		String qrcodeColorOld = personBasic.getQrcodeColor();
+		if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
+			personBasic.setQrcodeDesc("证书齐全");
+			personBasic.setQrcodeDate(new Date());
+		} else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+			personBasic.setQrcodeDesc("证书不全");
+			personBasic.setQrcodeDate(new Date());
+		} else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
+			personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
+			personBasic.setQrcodeDesc("证书临期");
+			personBasic.setQrcodeDate(new Date());
+		}
+		personBasic.setProjectOrgCode(companyModel.getOrgCode());
+		personAccount.setProjectName(companyModel.getCompanyName());
+
+		// 人员账号信息
+		personAccount.setPersonId(sequenceNbr);
+		oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
+		personAccountService.updateById(personAccount);
+		// 新增平台账号
+		// 组装数据
+		AgencyUserModel usd = new AgencyUserModel();
+		// 应用
+		usd.setAppCodes(personAccount.getApplication());
+		// 手机号
+		usd.setMobile(personUser.getPhone());
+		// 角色
+		Map<Long, List<Long>> map = new HashMap<>();
+		List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim()))
+				.collect(Collectors.toList()); // 测点数组
+		if (personAccount.getDepartmentId() != null) {
+
+			map.put(personAccount.getDepartmentId(), cdids);
+		} else {
+			map.put(personAccount.getProjectId(), cdids);
+		}
+		usd.setOrgRoleSeqs(map);
+		// 密码
+		usd.setPassword(personAccount.getPassword());
+		// 二次密码
+		usd.setRePassword(personAccount.getSecondaryPassword());
+		// 用户名
+		usd.setRealName(personAccount.getName());
+		// 账号
+		usd.setUserName(personAccount.getAccountName());
+		usd.setLockStatus("UNLOCK");
+		usd.setUserId(personAccount.getPuserId());
+		usd.setOriginalPassword(oldpersonAccount.getPassword());
+		// 新增平台用户
+		AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
+		log.info("更新平台账户信息：：" + JSONObject.toJSONString(usd));
+		// 设置userID
+		usd.setUserId(agencyUserModel.getUserId());
+		// 设置工号
+		usd.setUserName(personAccount.getJobNumber());
+		// 创建支持工号登录
+		this.updateLoginInfo(oldpersonAccount.getJobNumber(), usd);
+		// 查询部门
+		DepartmentModel departmentModel = null;
+		if (personAccount.getDepartmentId() != null) {
+			departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
+		}
+		BeanUtils.copyProperties(personUser, personBasic, "qrcodeDesc", "qrcodeColor");
+		if (departmentModel != null) {
+			// personBasic.setProjectOrgCode(departmentModel.getOrgCode());
+			personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
+		}
+		personBasic.setProjectOrgCode(companyModel.getOrgCode());
+
+		if (personUser.getNativePlace() != null) {
+			personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+		}
+		personAccount.setProjectName(companyModel.getCompanyName());
+
+		if (!join.equals(missingCertificateOld)) {
+			personBasic.setRecDate(new Date());
+			this.personBasicMapper.updateById(personBasic);
+			if (("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc()))) {
+				BizMessage bizMessage = new BizMessage();
+				bizMessage.setIndexKey("RYFM");
+				bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
+				RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
+				bizMessage.setBizInfo(riskBizInfoVo);
+				bizMessage.setDataSource("人员赋码");
+				try {
+					emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC,
+							JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
+				} catch (MqttException e) {
+					e.printStackTrace();
+				}
+			} else if ("证书齐全".equals(personBasic.getQrcodeDesc())) {
+				HashMap<String, String> personMap = new HashMap<>();
+				personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr()));
+				personMap.put("qrCodeColor", qrcodeColorOld);
+				personMap.put("warningObjectType", "RYFM");
+				personMap.put("sourceAttribution", personBasic.getProjectOrgCode());
+				personMap.put("sourceAttributionDesc", personAccount.getProjectName());
+				personMap.put("warningSourceType", "人员赋码");
+				try {
+					emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN,
+							JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false);
+				} catch (MqttException e) {
+					e.printStackTrace();
+				}
+			}
+		} else {
+			this.personBasicMapper.updateById(personBasic);
+		}
+		StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
+				.eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
+		if (ObjectUtils.isEmpty(stdUserEmpower)) {
+			stdUserEmpower = new StdUserEmpower();
+			stdUserEmpower.setRecDate(new Date());
+			stdUserEmpower.setPermissionType("YTH");
+			stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+			stdUserEmpower.setAmosUserId(personAccount.getPuserId());
+			userEmpowerMapper.insert(stdUserEmpower);
+		} else {
+			stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+			stdUserEmpower.setRecDate(new Date());
+			userEmpowerMapper.updateById(stdUserEmpower);
+		}
+		// 户用角色权限
+
+		StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
+				.eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
+		if (ObjectUtils.isEmpty(stdUserEmpowerhygf)) {
+			stdUserEmpowerhygf = new StdUserEmpower();
+			List<CompanyModel> co = userEmpowerMapper.getCompanyBoList("region", null, null);
+			List<String> re = personAccount.getRegionalCompaniesSeq();
+			String flag = personAccount.getRegionalCompaniesSeqFlag();
+			if (flag != null && !flag.isEmpty()) {
+				if (flag.equals("all")) {
+					List<String> all = new ArrayList<>();
+					all.add("all");
+					stdUserEmpowerhygf.setAmosOrgCode(all);
+				} else {
+					stdUserEmpowerhygf.setAmosOrgCode(re);
+				}
+			}
+			List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
 //            if(exre!=null&&!exre.isEmpty()){
 //                List<String> pexre=new ArrayList<>();
 //                List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
@@ -680,27 +676,27 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 //                }
 //                stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
 //            }
-            stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
-            stdUserEmpowerhygf.setPermissionType("HYGF");
-            stdUserEmpowerhygf.setRecDate(new Date());
-            stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
-            userEmpowerMapper.insert(stdUserEmpowerhygf);
-        }else {
+			stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
+			stdUserEmpowerhygf.setPermissionType("HYGF");
+			stdUserEmpowerhygf.setRecDate(new Date());
+			stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
+			userEmpowerMapper.insert(stdUserEmpowerhygf);
+		} else {
 //            List<CompanyModel>  co=   userEmpowerMapper.getCompanyBoList("region",null,null);
-            List<String> re=  personAccount.getRegionalCompaniesSeq();
-            String  flag=personAccount.getRegionalCompaniesSeqFlag();
-            if(flag!=null&&!flag.isEmpty()){
-                if(flag.equals("all")){
-                    List<String> all=new ArrayList<>();
-                    all.add("all");
-                    stdUserEmpowerhygf.setAmosOrgCode(all);
-                }else{
-                    stdUserEmpowerhygf.setAmosOrgCode(re);
-                }
-            }else{
-                stdUserEmpowerhygf.setAmosOrgCode(re);
-            }
-            List<String> exre=  personAccount.getExternalRegionalCompaniesSeq();
+			List<String> re = personAccount.getRegionalCompaniesSeq();
+			String flag = personAccount.getRegionalCompaniesSeqFlag();
+			if (flag != null && !flag.isEmpty()) {
+				if (flag.equals("all")) {
+					List<String> all = new ArrayList<>();
+					all.add("all");
+					stdUserEmpowerhygf.setAmosOrgCode(all);
+				} else {
+					stdUserEmpowerhygf.setAmosOrgCode(re);
+				}
+			} else {
+				stdUserEmpowerhygf.setAmosOrgCode(re);
+			}
+			List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
 //            if(exre!=null&&!exre.isEmpty()){
 //                List<String> pexre=new ArrayList<>();
 //                List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
@@ -711,260 +707,268 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 //                }
 //                stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
 //            }
-            stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
-            stdUserEmpowerhygf.setPermissionType("HYGF");
-            stdUserEmpowerhygf.setRecDate(new Date());
-            stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
-            userEmpowerMapper.updateById(stdUserEmpowerhygf);
-        }
-        personAccountService.updateById(personAccount);
-
-        PersonAccountFed personAccountFed = new PersonAccountFed();
-        BeanUtils.copyProperties(personAccount, personAccountFed);
-        personAccountFed.setSyncState(1);
-        personAccountFed.setSyncDate(new Date());
-        personAccountFedMapper.updateById(personAccountFed);
-
-        Map<String, Object> data=new HashMap<>();
-        data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr());
-        ProduceMsg produceMsg=  new ProduceMsg(data, UPDATE,agencyUserModel.getUserId());
-        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
-        return model;
-    }
-
-    @Transactional
-    public PersonDto getPerson(Long sequenceNbr,String type) {
-        PersonDto personDto = new PersonDto();
-        PersonUser personUser = new PersonUser();
-        QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper();
-        wrapper1.eq("sequence_nbr", sequenceNbr);
-        wrapper1.eq("is_delete", 0);
-
-        //人员基础信息
-        PersonBasic personBasic = this.getOne(wrapper1);
-        BeanUtils.copyProperties(personBasic, personUser);
-        //人员技能学历信息
-        QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
-        wrapper2.eq("person_id", sequenceNbr);
-        PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2);
-        BeanUtils.copyProperties(personSkillEducation, personUser);
-
-        //人员资质信息
-        LambdaQueryWrapper<PersonCertificate> personCertificateLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        personCertificateLambdaQueryWrapper.eq(PersonCertificate::getPersonId, sequenceNbr);
-        List<PersonCertificate> list = personCertificateService.list(personCertificateLambdaQueryWrapper);
-        CertificationInfo certificationInfo = new CertificationInfo();
-        certificationInfo.setCertificationInfo(list);
-
-        QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
-        wrapper4.eq("person_id", sequenceNbr);
-        //人员账号信息
-        PersonAccount personAccount = personAccountService.getOne(wrapper4);
-        personAccount.setPhoneNum(personBasic.getPhone());
-        //对于密码进行解密
-        if("look".equals(type)){
-            personAccount.setIdNumber(DesensitizedUtil.idCardNum(personAccount.getIdNumber(),0,4));
-        }else{
-            personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
-            personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
-        }
-        if (personBasic.getNativePlace() != null) {
-            personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
-        }
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
-        if(!ObjectUtils.isEmpty(stdUserEmpower)){
-            personAccount.setYthPermission(stdUserEmpower.getAmosOrgCode().get(0));
-        }
-
-
-
-        StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
-        if(!ObjectUtils.isEmpty(stdUserEmpowerhygf)){
-
-            if(stdUserEmpowerhygf.getAmosOrgCode()==null||stdUserEmpowerhygf.getAmosOrgCode().size()==0){
+			stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
+			stdUserEmpowerhygf.setPermissionType("HYGF");
+			stdUserEmpowerhygf.setRecDate(new Date());
+			stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
+			userEmpowerMapper.updateById(stdUserEmpowerhygf);
+		}
+		personAccountService.updateById(personAccount);
+
+		PersonAccountFed personAccountFed = new PersonAccountFed();
+		BeanUtils.copyProperties(personAccount, personAccountFed);
+		personAccountFed.setSyncState(1);
+		personAccountFed.setSyncDate(new Date());
+		personAccountFedMapper.updateById(personAccountFed);
+
+		Map<String, Object> data = new HashMap<>();
+		data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
+		ProduceMsg produceMsg = new ProduceMsg(data, UPDATE, agencyUserModel.getUserId());
+		querueProduce.produceMsg(JSON.toJSONString(produceMsg));
+		return model;
+	}
+
+	@Transactional
+	public PersonDto getPerson(Long sequenceNbr, String type) {
+		PersonDto personDto = new PersonDto();
+		PersonUser personUser = new PersonUser();
+		QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper();
+		wrapper1.eq("sequence_nbr", sequenceNbr);
+		wrapper1.eq("is_delete", 0);
+
+		// 人员基础信息
+		PersonBasic personBasic = this.getOne(wrapper1);
+		BeanUtils.copyProperties(personBasic, personUser);
+		// 人员技能学历信息
+		QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
+		wrapper2.eq("person_id", sequenceNbr);
+		PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2);
+		BeanUtils.copyProperties(personSkillEducation, personUser);
+
+		// 人员资质信息
+		LambdaQueryWrapper<PersonCertificate> personCertificateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		personCertificateLambdaQueryWrapper.eq(PersonCertificate::getPersonId, sequenceNbr);
+		List<PersonCertificate> list = personCertificateService.list(personCertificateLambdaQueryWrapper);
+		CertificationInfo certificationInfo = new CertificationInfo();
+		certificationInfo.setCertificationInfo(list);
+
+		QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
+		wrapper4.eq("person_id", sequenceNbr);
+		// 人员账号信息
+		PersonAccount personAccount = personAccountService.getOne(wrapper4);
+		personAccount.setPhoneNum(personBasic.getPhone());
+		// 对于密码进行解密
+		if ("look".equals(type)) {
+			personAccount.setIdNumber(DesensitizedUtil.idCardNum(personAccount.getIdNumber(), 0, 4));
+		} else {
+			personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
+			personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
+		}
+		if (personBasic.getNativePlace() != null) {
+			personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
+		}
+		StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
+				.eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
+		if (!ObjectUtils.isEmpty(stdUserEmpower)) {
+			personAccount.setYthPermission(stdUserEmpower.getAmosOrgCode().get(0));
+		}
+
+		StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
+				.eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
+		if (!ObjectUtils.isEmpty(stdUserEmpowerhygf)) {
+
+			if (stdUserEmpowerhygf.getAmosOrgCode() == null || stdUserEmpowerhygf.getAmosOrgCode().size() == 0) {
 //                List<String> list2 = new ArrayList<>();
 //                list2.add("all");
-                personAccount.setRegionalCompaniesSeq(null);
+				personAccount.setRegionalCompaniesSeq(null);
 
-            }else if(stdUserEmpowerhygf.getAmosOrgCode().size()==1&&stdUserEmpowerhygf.getAmosOrgCode().get(0).equals("all")){
+			} else if (stdUserEmpowerhygf.getAmosOrgCode().size() == 1
+					&& stdUserEmpowerhygf.getAmosOrgCode().get(0).equals("all")) {
 
-                personAccount.setRegionalCompaniesSeqFlag("all");
-                personAccount.setRegionalCompaniesSeq(null);
+				personAccount.setRegionalCompaniesSeqFlag("all");
+				personAccount.setRegionalCompaniesSeq(null);
 
-            }else{
+			} else {
 
-                personAccount.setRegionalCompaniesSeqFlag("no");
-                personAccount.setRegionalCompaniesSeq(stdUserEmpowerhygf.getAmosOrgCode());
+				personAccount.setRegionalCompaniesSeqFlag("no");
+				personAccount.setRegionalCompaniesSeq(stdUserEmpowerhygf.getAmosOrgCode());
 
-            }
-            personAccount.setExternalRegionalCompaniesSeq(stdUserEmpowerhygf.getEliminateAmosOrgCode());
+			}
+			personAccount.setExternalRegionalCompaniesSeq(stdUserEmpowerhygf.getEliminateAmosOrgCode());
 
-        }
-        personDto.setPersonUser(personUser);
-        personDto.setPersonCertificate(certificationInfo);
-        personDto.setPersonAccount(personAccount);
-        return personDto;
-    }
+		}
+		personDto.setPersonUser(personUser);
+		personDto.setPersonCertificate(certificationInfo);
+		personDto.setPersonAccount(personAccount);
+		return personDto;
+	}
 
-    @Transactional
-    public int deletePerson(String[] ids) {
+	@Transactional
+	public int deletePerson(String[] ids) {
 
-        //查询所有平台用户
-        QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
-        wrapper.in("person_id", ids);
-        List<PersonAccount> list = personAccountService.list(wrapper);
-        List<String> userid = new ArrayList<>();
+		// 查询所有平台用户
+		QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
+		wrapper.in("person_id", ids);
+		List<PersonAccount> list = personAccountService.list(wrapper);
+		List<String> userid = new ArrayList<>();
 //        List<String> loginId = new ArrayList<>();
-        for (PersonAccount personAccount : list) {
-            userid.add(personAccount.getPuserId());
+		for (PersonAccount personAccount : list) {
+			userid.add(personAccount.getPuserId());
 //            loginId.add(personAccount.getJobNumber());
-        }
-        //删除平台
-        int deleteResult = personBasicMapper.deleteList(ids);
-        this.deleuser(String.join(",", userid));
+		}
+		// 删除平台
+		int deleteResult = personBasicMapper.deleteList(ids);
+		this.deleuser(String.join(",", userid));
 ////        this.deleteLoginInfo(String.join(",", loginId));
 //        this.deleteLoginInfo(loginId.get(1));
-        QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper();
-        wrapper1.in("person_id",ids);
-        personAccountFedMapper.delete(wrapper1);
-        userEmpowerMapper.delete(new QueryWrapper<StdUserEmpower>().in("amos_user_id", userid).eq("permission_type", "YTH"));
-        return deleteResult;
-    }
-
-    //新增平台用户
-    private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
-        FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto);
-
-        AgencyUserModel user = new AgencyUserModel();
-
-        if (!ObjectUtils.isEmpty(amosUser)) {
-            if (amosUser.getStatus() == 200) {
-                user = amosUser.getResult();
-            } else {
-                throw new RuntimeException(amosUser.getMessage());
-            }
-        }
-        return user;
-    }
-    private LoginInfoModel createLoginInfo(AgencyUserModel userDto) {
-        FeignClientResult<LoginInfoModel> amosLoginfo = null;
-        try {
-            amosLoginfo = Privilege.agencyUserClient.createLoginInfo(userDto);
-        } catch (Exception e) {
-            FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userDto.getUserId(),true);
-            throw new RuntimeException(e);
-        }
-        return amosLoginfo.getResult();
-    }
-
-    //修改平台用户
-    private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
-        FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.update(userDto, userId);
-        FeignClientResult<AgencyUserModel> amosUser1 = Privilege.agencyUserClient.modifyPassword(userId,userDto);
-        AgencyUserModel user = new AgencyUserModel();
-        if (!ObjectUtils.isEmpty(amosUser)) {
-            if (amosUser.getStatus() == 200) {
-                user = amosUser.getResult();
-            } else {
-                throw new RuntimeException(amosUser.getMessage());
-            }
-        }
-        if (!ObjectUtils.isEmpty(amosUser1)) {
-            if (amosUser1.getStatus() == 200) {
-                user = amosUser1.getResult();
-            } else {
-                throw new RuntimeException(amosUser1.getMessage());
-            }
-        }
-        return user;
-    }
-    private LoginInfoModel updateLoginInfo(String loginId,AgencyUserModel userDto) {
-        FeignClientResult<LoginInfoModel> amosLoginfo = null;
-        try {
-            amosLoginfo = Privilege.agencyUserClient.updateLoginInfo(userDto,loginId);
-            //amosLoginfo = agencyuserFeign.updateLoginInfo(userDto, loginId);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return amosLoginfo.getResult();
-    }
-    private DepartmentModel getdepartmentModel(Long departmentId) {
-        FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
-
-        DepartmentModel departmentModel = new DepartmentModel();
-
-        if (!ObjectUtils.isEmpty(de)) {
-            if (de.getStatus() == 200) {
-                departmentModel = de.getResult();
-            } else {
-                throw new RuntimeException(de.getMessage());
-            }
-        }
-        return departmentModel;
-    }
-
-    public CompanyModel getCompanyModel(Long projectId) {
-        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
-        CompanyModel companyModel = new CompanyModel();
-
-        if (!ObjectUtils.isEmpty(cResult)) {
-            if (cResult.getStatus() == 200) {
-                companyModel = cResult.getResult();
-            } else {
-                throw new RuntimeException(cResult.getMessage());
-            }
-        }
-        return companyModel;
-    }
-
-    private void deleuser(String userid) {
-        FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid,true);
-
-        if (!ObjectUtils.isEmpty(cResult)) {
-            if (cResult.getStatus() != 200) {
-                throw new RuntimeException(cResult.getMessage());
-            }
-        }
-    }
-
-    private String deleteLoginInfo(String loginId) {
-        FeignClientResult<String> amosLoginfo = null;
-        try {
-            amosLoginfo = Privilege.agencyUserClient.deleteLoginInfo(loginId);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return amosLoginfo.getResult();
-    }
-    /**
-     * 分页查询
-     */
-    public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
-                                         String name,
-                                         String accountName,
-                                         String projectName, String orgCode) {
-
-        List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(), name,
-                accountName,
-                projectName, orgCode);
-        List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name,
-                accountName,
-                projectName, orgCode);
-        page.setTotal(listcount.size());
-        page.setRecords(list);
-        return page;
-    }
-
-    public List<Map<String, Object>> getPersonYardStatistics(String parentCode) {
-        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode);
-        resultList.forEach(item -> {
-            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
-            item.put("name", name);
-            item.put("value", Integer.parseInt(item.get("value").toString()));
-        });
-        return resultList;
-    }
-
+		QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper();
+		wrapper1.in("person_id", ids);
+		personAccountFedMapper.delete(wrapper1);
+		userEmpowerMapper
+				.delete(new QueryWrapper<StdUserEmpower>().in("amos_user_id", userid).eq("permission_type", "YTH"));
+		return deleteResult;
+	}
+
+	// 新增平台用户
+	private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
+		FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto);
+
+		AgencyUserModel user = new AgencyUserModel();
+
+		if (!ObjectUtils.isEmpty(amosUser)) {
+			if (amosUser.getStatus() == 200) {
+				user = amosUser.getResult();
+			} else {
+				throw new RuntimeException(amosUser.getMessage());
+			}
+		}
+		return user;
+	}
+
+	private LoginInfoModel createLoginInfo(AgencyUserModel userDto) {
+		FeignClientResult<LoginInfoModel> amosLoginfo = null;
+		try {
+			amosLoginfo = Privilege.agencyUserClient.createLoginInfo(userDto);
+		} catch (Exception e) {
+			FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userDto.getUserId(),
+					true);
+			throw new RuntimeException(e);
+		}
+		return amosLoginfo.getResult();
+	}
+
+	// 修改平台用户
+	private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
+		FeignClientResult<AgencyUserModel> amosUser = null;
+		FeignClientResult<AgencyUserModel> amosUser1 = null;
+		try {
+			amosUser = Privilege.agencyUserClient.update(userDto, userId);
+			amosUser1 = Privilege.agencyUserClient.modifyPassword(userId, userDto);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		AgencyUserModel user = new AgencyUserModel();
+		if (!ObjectUtils.isEmpty(amosUser)) {
+			if (amosUser.getStatus() == 200) {
+				user = amosUser.getResult();
+			} else {
+				throw new RuntimeException(amosUser.getMessage());
+			}
+		}
+		if (!ObjectUtils.isEmpty(amosUser1)) {
+			if (amosUser1.getStatus() == 200) {
+				user = amosUser1.getResult();
+			} else {
+				throw new RuntimeException(amosUser1.getMessage());
+			}
+		}
+		return user;
+	}
+
+	private LoginInfoModel updateLoginInfo(String loginId, AgencyUserModel userDto) {
+		FeignClientResult<LoginInfoModel> amosLoginfo = null;
+		try {
+			amosLoginfo = Privilege.agencyUserClient.updateLoginInfo(userDto, loginId);
+			// amosLoginfo = agencyuserFeign.updateLoginInfo(userDto, loginId);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		return amosLoginfo.getResult();
+	}
+
+	private DepartmentModel getdepartmentModel(Long departmentId) {
+		FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
+
+		DepartmentModel departmentModel = new DepartmentModel();
+
+		if (!ObjectUtils.isEmpty(de)) {
+			if (de.getStatus() == 200) {
+				departmentModel = de.getResult();
+			} else {
+				throw new RuntimeException(de.getMessage());
+			}
+		}
+		return departmentModel;
+	}
+
+	public CompanyModel getCompanyModel(Long projectId) {
+		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
+		CompanyModel companyModel = new CompanyModel();
+
+		if (!ObjectUtils.isEmpty(cResult)) {
+			if (cResult.getStatus() == 200) {
+				companyModel = cResult.getResult();
+			} else {
+				throw new RuntimeException(cResult.getMessage());
+			}
+		}
+		return companyModel;
+	}
+
+	private void deleuser(String userid) {
+		FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid, true);
+
+		if (!ObjectUtils.isEmpty(cResult)) {
+			if (cResult.getStatus() != 200) {
+				throw new RuntimeException(cResult.getMessage());
+			}
+		}
+	}
+
+	private String deleteLoginInfo(String loginId) {
+		FeignClientResult<String> amosLoginfo = null;
+		try {
+			amosLoginfo = Privilege.agencyUserClient.deleteLoginInfo(loginId);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		return amosLoginfo.getResult();
+	}
+
+	/**
+	 * 分页查询
+	 */
+	public Page<UserMapperDto> queryPage(Page<UserMapperDto> page, String name, String accountName, String projectName,
+			String orgCode) {
+
+		List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(),
+				name, accountName, projectName, orgCode);
+		List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name, accountName, projectName, orgCode);
+		page.setTotal(listcount.size());
+		page.setRecords(list);
+		return page;
+	}
+
+	public List<Map<String, Object>> getPersonYardStatistics(String parentCode) {
+		List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode);
+		resultList.forEach(item -> {
+			String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+			item.put("name", name);
+			item.put("value", Integer.parseInt(item.get("value").toString()));
+		});
+		return resultList;
+	}
 
 //    public Page<Map<String, Object>> getPersonYardByPage(String parentCode,
 //                                                         Integer current,