From 22f5538c13a68a81bcb47714f35f77d64347c085 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 19 Jun 2024 15:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/device/QuitRunningDeviceParam.java | 4 +- .../device/SupervisionTempLineDebugParam.java | 4 +- .../SupervisionTempLineReportParam.java | 7 + .../pojo/param/survey/SurveyPlanParam.java | 5 + .../pojo/param/survey/SurveyTestParam.java | 10 +- .../device/SupervisionTempDeviceReport.java | 3 + .../SupervisionTempLineDebugPOMapper.xml | 4 +- .../impl/QuitRunningDeviceServiceImpl.java | 37 +- ...SupervisionDevMainReportPOServiceImpl.java | 108 +++-- ...SupervisionTempLineDebugPOServiceImpl.java | 54 ++- .../SupervisionTempLineReportServiceImpl.java | 102 ++-- .../survey/impl/SurveyPlanServiceImpl.java | 43 +- .../survey/impl/SurveyTestServiceImpl.java | 46 +- .../user/impl/UserReportPOServiceImpl.java | 442 +++--------------- 14 files changed, 342 insertions(+), 527 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java index e9d0f0855..f572f1ce7 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java @@ -1,6 +1,5 @@ package com.njcn.supervision.pojo.param.device; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -29,6 +28,9 @@ public class QuitRunningDeviceParam implements Serializable { private static final long serialVersionUID = 1L; + private String id; + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; /** * 设备编号 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java index 9ae108edc..801339c7d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java @@ -1,6 +1,5 @@ package com.njcn.supervision.pojo.param.device; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -24,7 +23,8 @@ import java.util.Map; @NoArgsConstructor public class SupervisionTempLineDebugParam { private String id; - + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; /** * 调试原因 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java index e4f0407cf..afda2cf61 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java @@ -26,6 +26,13 @@ import java.util.Map; @NoArgsConstructor public class SupervisionTempLineReportParam { + + private String id; + + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; + + @ApiModelProperty(value = "填报部门") private String orgId; /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java index 76cda7809..04225fe8d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java @@ -12,6 +12,9 @@ import java.time.LocalDate; @Data public class SurveyPlanParam implements Serializable { + private String id; + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; private static final long serialVersionUID = 1L; @@ -112,6 +115,8 @@ public class SurveyPlanParam implements Serializable { */ @ApiModelProperty(value = "计划状态") private Integer status; + @ApiModelProperty(value = " 监督类型") + private String supvType; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java index 9aa29e213..a4859fc38 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java @@ -1,6 +1,5 @@ package com.njcn.supervision.pojo.param.survey; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +25,8 @@ public class SurveyTestParam implements Serializable { @ApiModelProperty("id") @NotBlank(message = "索引不能为空") private String Id; + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; /** * 普测计划表id @@ -102,11 +103,18 @@ public class SurveyTestParam implements Serializable { @EqualsAndHashCode(callSuper = true) public static class SurveyTestQueryParam extends BaseParam { + /** + * 普测负责单位 + */ + String deptIndex; + /** * 测试审批状态(1:审批中；2：审批通过；3：审批不通过；4：已取消) */ @ApiModelProperty(value = "测试审批状态") private Integer status; + @ApiModelProperty(value = " 监督类型") + private String supvType; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java index 8ceb39ce8..3aadf4098 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java @@ -32,6 +32,9 @@ public class SupervisionTempDeviceReport { */ @TableField(value = "power_company") private String powerCompany; + + + /** * 0 关联系统内变电站;1用户手动输入变电站 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml index c85ef9a80..6e00811c3 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml @@ -40,8 +40,8 @@ supervision_temp_line_debug.`status` `Status`, supervision_temp_line_debug.create_by FROM - supervision_temp_line_report - left JOIN supervision_temp_line_debug ON supervision_temp_line_report.id = supervision_temp_line_debug.id + supervision_temp_line_debug + left JOIN supervision_temp_line_report ON supervision_temp_line_report.id = supervision_temp_line_debug.id where supervision_temp_line_report.`status`=2 and ${ew.sqlSegment} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 789f9f4ba..24760e0d1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -25,7 +25,6 @@ import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.supervision.pojo.po.device.QuitRunningDevice; -import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.service.device.IQuitRunningDeviceService; import com.njcn.supervision.service.user.UserReportPOService; @@ -76,19 +75,31 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.QUIT_RUNNING_DEVICE.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(quitRunningDevice.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(quitRunningDeviceParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(quitRunningDevice.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - quitRunningDevice.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(quitRunningDevice); + if(Objects.equals(quitRunningDeviceParam.getSaveOrCheckflag(),"2")) { + + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.QUIT_RUNNING_DEVICE.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(quitRunningDevice.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(quitRunningDeviceParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(quitRunningDevice.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + quitRunningDevice.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(quitRunningDevice); + } return quitRunningDevice.getId(); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 75994ed74..419021332 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -24,7 +24,6 @@ import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam; import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam; import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport; -import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO; import com.njcn.supervision.service.device.SupervisionDevMainReportPOService; import com.njcn.supervision.service.device.SupervisionTempDeviceReportService; @@ -35,6 +34,7 @@ import com.njcn.user.pojo.vo.UserVO; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -66,20 +66,36 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(id); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionDevMainReportPO.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - supervisionDevMainReportPO.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(supervisionDevMainReportPO); - + // 如何未提交审则不需要发起 BPM 流程 + if(Objects.equals(supervisionDevMainReportParam.getSaveOrCheckflag(),"2")) { + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(id); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionDevMainReportPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + supervisionDevMainReportPO.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(supervisionDevMainReportPO); + } return id; } @@ -243,7 +261,9 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper + .eq(SupervisionTempDeviceReport::getSubstation, supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getSubstation()) + .eq(SupervisionTempDeviceReport::getTerminalIp, supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getTerminalIp()); + //更新的时候，需排除当前记录 + if (isExcludeSelf) { + if (supervisionDevMainReportParam instanceof SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate) { + lambdaQueryWrapper.ne(SupervisionTempDeviceReport::getId, ((SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate) supervisionDevMainReportParam).getId()); + }else { + lambdaQueryWrapper.ne(SupervisionTempDeviceReport::getId, (supervisionDevMainReportParam).getId()); + + } + - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper - .eq(SupervisionTempDeviceReport::getSubstation,supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getSubstation()) - .eq(SupervisionTempDeviceReport::getTerminalIp, supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getTerminalIp()); - //更新的时候，需排除当前记录 - if (isExcludeSelf) { - if(supervisionDevMainReportParam instanceof SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate){ - lambdaQueryWrapper.ne(SupervisionTempDeviceReport::getId, ((SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate) supervisionDevMainReportParam).getId()); } - - - } - List list = supervisionTempDeviceReportService.getBaseMapper().selectList(lambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - //过滤已取消的申请和删除的 - List collect = list.stream().map(SupervisionTempDeviceReport::getId).collect(Collectors.toList()); - List list1 = this.lambdaQuery().in(SupervisionDevMainReportPO::getId, collect).list(); - list1 = list1.stream() - .filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) - .filter(userReportPO -> userReportPO.getState().equals(DataStateEnum.ENABLE.getCode())) - .collect(Collectors.toList()); - //如果还存在，则说明有人申请过了 - if (CollectionUtil.isNotEmpty(list1)) { - throw new BusinessException(supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getTerminalIp().concat("Ip已占用")); + List list = supervisionTempDeviceReportService.getBaseMapper().selectList(lambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(list)) { + //过滤已取消的申请和删除的 + List collect = list.stream().map(SupervisionTempDeviceReport::getId).collect(Collectors.toList()); + List list1 = this.lambdaQuery().in(SupervisionDevMainReportPO::getId, collect).list(); + list1 = list1.stream() + .filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) + .filter(userReportPO -> userReportPO.getState().equals(DataStateEnum.ENABLE.getCode())) + .collect(Collectors.toList()); + //如果还存在，则说明有人申请过了 + if (CollectionUtil.isNotEmpty(list1)) { + throw new BusinessException(supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getTerminalIp().concat("Ip已占用")); + } } } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 655e5f06a..077b403bc 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -84,29 +84,39 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(id); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineDebugPO.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - supervisionTempLineDebugPO.setProcessInstanceId(processInstanceId); - this.updateById(supervisionTempLineDebugPO); + if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) { + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(id); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineDebugPO.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + supervisionTempLineDebugPO.setProcessInstanceId(processInstanceId); + this.updateById(supervisionTempLineDebugPO); + } + return id; @@ -144,8 +154,8 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds) - .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()); + queryWrapper.in("supervision_temp_line_debug.create_by", colleaguesIds) + .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) { /*获取直接下属子单位*/ List data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData(); @@ -166,10 +176,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl page =this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper); return page; } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index 45acf3361..de277faa7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -24,7 +24,6 @@ import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam; import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; -import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO; import com.njcn.supervision.service.device.SupervisionTempLineReportService; import com.njcn.supervision.service.user.UserReportPOService; @@ -36,6 +35,7 @@ import com.njcn.user.pojo.vo.UserVO; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,29 +70,45 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(id); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineReport.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - supervisionTempLineReport.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(supervisionTempLineReport); - + if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) { + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(id); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineReport.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + supervisionTempLineReport.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(supervisionTempLineReport); + } return id; } @@ -220,30 +236,36 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper - .eq(SupervisionTempLineReport::getMonitoringTerminalCode,supervisionTempLineReportParam.getMonitoringTerminalCode()) - .and(wrapper->wrapper.eq(SupervisionTempLineReport::getNum ,supervisionTempLineReportParam.getNum()).or() - .eq(SupervisionTempLineReport::getLineName ,supervisionTempLineReportParam.getLineName()) + //保存时不为空则不校验 + if(Objects.nonNull(supervisionTempLineReportParam.getNum())||Objects.nonNull(supervisionTempLineReportParam.getLineName())) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper + .eq(SupervisionTempLineReport::getMonitoringTerminalCode, supervisionTempLineReportParam.getMonitoringTerminalCode()) + .and(wrapper -> wrapper.eq(SupervisionTempLineReport::getNum, supervisionTempLineReportParam.getNum()).or() + .eq(SupervisionTempLineReport::getLineName, supervisionTempLineReportParam.getLineName()) ) - .eq(SupervisionTempLineReport::getState, DataStateEnum.ENABLE.getCode()); - //更新的时候，需排除当前记录 - if (isExcludeSelf) { - if(supervisionTempLineReportParam instanceof SupervisionTempLineReportParam.SupervisionTempLineReportUpdate){ - lambdaQueryWrapper.ne(SupervisionTempLineReport::getId, ((SupervisionTempLineReportParam.SupervisionTempLineReportUpdate) supervisionTempLineReportParam).getId()); + .eq(SupervisionTempLineReport::getState, DataStateEnum.ENABLE.getCode()); + //更新的时候，需排除当前记录 + if (isExcludeSelf) { + if (supervisionTempLineReportParam instanceof SupervisionTempLineReportParam.SupervisionTempLineReportUpdate) { + lambdaQueryWrapper.ne(SupervisionTempLineReport::getId, ((SupervisionTempLineReportParam.SupervisionTempLineReportUpdate) supervisionTempLineReportParam).getId()); + }else { + lambdaQueryWrapper.ne(SupervisionTempLineReport::getId, (supervisionTempLineReportParam).getId()); + + } + + } - - - } - List list = this.baseMapper.selectList(lambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - //过滤已取消的申请 - list = list.stream() - .filter(temp -> !temp.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) - .collect(Collectors.toList()); - //如果还存在，则说明有人申请过了 + List list = this.baseMapper.selectList(lambdaQueryWrapper); if (CollectionUtil.isNotEmpty(list)) { - throw new BusinessException(supervisionTempLineReportParam.getLineName().concat(",监测点线路号或监测点名称").concat("以使用")); + //过滤已取消的申请 + list = list.stream() + .filter(temp -> !temp.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) + .collect(Collectors.toList()); + //如果还存在，则说明有人申请过了 + if (CollectionUtil.isNotEmpty(list)) { + throw new BusinessException(supervisionTempLineReportParam.getLineName().concat(",监测点线路号或监测点名称").concat("以使用")); + } } } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index e9fbf4146..326355b02 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -24,7 +24,6 @@ import com.njcn.supervision.mapper.survey.SurveyPlanMapper; import com.njcn.supervision.pojo.param.survey.SurveyPlanParam; import com.njcn.supervision.pojo.po.survey.SurveyPlan; import com.njcn.supervision.pojo.po.survey.SurveyTest; -import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO; import com.njcn.supervision.pojo.vo.survey.SurveySubstation; import com.njcn.supervision.service.survey.ISurveyPlanService; @@ -36,7 +35,7 @@ import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; -import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -95,7 +94,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); @@ -134,20 +133,30 @@ public class SurveyPlanServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyPlan.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - surveyPlan.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(surveyPlan); + if(Objects.equals(surveyPlanParam.getSaveOrCheckflag(),"2")){ + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyPlan.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + surveyPlan.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(surveyPlan); + } + return surveyPlan.getId(); } @@ -213,7 +222,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); surveyPlanLambdaQueryWrapper.eq(SurveyPlan::getState, DataStateEnum.ENABLE.getCode()) + .eq(StringUtils.isNotBlank(surveyTestQueryParam.getSupvType()),SurveyPlan::getSupvType,surveyTestQueryParam.getSupvType()) .like(SurveyPlan::getPlanName, surveyTestQueryParam.getSearchValue()); List surveyPlans = surveyPlanService.getBaseMapper().selectList(surveyPlanLambdaQueryWrapper); if (CollectionUtil.isNotEmpty(surveyPlans)) { @@ -109,11 +107,14 @@ public class SurveyTestServiceImpl extends ServiceImpl deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData(); + surveyTestVOQueryWrapper.in("supervision_survey_test.dept_id", deptIds); + } if (Objects.nonNull(surveyTestQueryParam.getStatus())) { surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus()); } - } //获取当前用户部门所有同事的id，查看该部门下所有的数据 List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); @@ -193,25 +194,36 @@ public class SurveyTestServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_TEST.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyTest.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyTest.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - surveyTest.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(surveyTest); + if(Objects.equals(surveyTestParam.getSaveOrCheckflag(),"2")) { + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_TEST.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyTest.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyTest.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + surveyTest.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(surveyTest); + } return surveyTest.getId(); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 97f78002c..d77f96334 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -373,7 +373,7 @@ public class UserReportPOServiceImpl extends ServiceImpl list = this.lambdaQuery() .eq(UserReportPO::getStatus, 2) - .eq(UserReportPO::getDataType, 0) + .eq(UserReportPO::getDataType,0) .in(CollectionUtil.isNotEmpty(data), UserReportPO::getOrgId, data) .list(); List collect = list.stream().map(temp -> { @@ -406,12 +406,7 @@ public class UserReportPOServiceImpl extends ServiceImpl(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper); @@ -435,7 +430,7 @@ public class UserReportPOServiceImpl extends ServiceImpluserStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改 @@ -495,108 +490,55 @@ public class UserReportPOServiceImpl extends ServiceImpl jiBeiArea = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.JIBEI_AREA.getCode()).getData(); - //电压等级 + ExportParams exportParams = new ExportParams(); + exportParams.setSheetName("敏感及重要用户"); List devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); - //评估单位 - List evaluationDept; - evaluationDept = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_DEPT.getCode()).getData(); - //评估类型 - List evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); - //指标类型 - List indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData(); - //行业类型 List industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE_JB.getCode()).getData(); - //负荷级别 List loadLevel = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LOAD_LEVEL.getCode()).getData(); - //供电电源情况 List supplyCondition = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPPLY_CONDITION.getCode()).getData(); List pullDowns = new ArrayList<>(); - PullDown pullDown; pullDown = new PullDown(); - pullDown.setFirstCol(1); - pullDown.setLastCol(1); - pullDown.setStrings(jiBeiArea.stream().filter(x -> !x.getName().equals("风光储")&&!x.getName().equals("超高压")).map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(3); - pullDown.setLastCol(3); + pullDown.setFirstCol(2); + pullDown.setLastCol(2); pullDown.setStrings(Stream.of("可研", "建设", "运行", "退运").collect(Collectors.toList())); pullDowns.add(pullDown); + pullDown = new PullDown(); - pullDown.setFirstCol(6); - pullDown.setLastCol(6); + pullDown.setFirstCol(4); + pullDown.setLastCol(4); pullDown.setStrings(devVoltage.stream().map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); pullDown = new PullDown(); - pullDown.setFirstCol(7); - pullDown.setLastCol(7); - pullDown.setStrings(evaluationDept.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(12); - pullDown.setLastCol(12); - pullDown.setStrings(evaluationType.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(13); - pullDown.setLastCol(13); + pullDown.setFirstCol(5); + pullDown.setLastCol(5); pullDown.setStrings(industryType.stream().map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); pullDown = new PullDown(); - pullDown.setFirstCol(16); - pullDown.setLastCol(16); - pullDown.setStrings(indicatorType.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(22); - pullDown.setLastCol(22); - pullDown.setStrings(supplyCondition.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(20); - pullDown.setLastCol(20); + pullDown.setFirstCol(8); + pullDown.setLastCol(8); pullDown.setStrings(devVoltage.stream().map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); pullDown = new PullDown(); - pullDown.setFirstCol(21); - pullDown.setLastCol(21); + pullDown.setFirstCol(9); + pullDown.setLastCol(9); pullDown.setStrings(loadLevel.stream().map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); + pullDown = new PullDown(); pullDown.setFirstCol(10); pullDown.setLastCol(10); - pullDown.setStrings(Stream.of("否", "是").collect(Collectors.toList())); + pullDown.setStrings(supplyCondition.stream().map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(11); - pullDown.setLastCol(11); - pullDown.setStrings(Stream.of("否", "是").collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(17); - pullDown.setLastCol(17); - pullDown.setStrings(Stream.of("否", "是").collect(Collectors.toList())); - pullDowns.add(pullDown); - ExcelUtil.exportExcelPullDown(exportParams, "敏感及重要用户模板.xlsx", pullDowns, SensitiveUserSExcel.class, new ArrayList<>()); + ExcelUtil.exportExcelPullDownOne(exportParams, "敏感及重要用户模板.xlsx", pullDowns, SensitiveUserExcel.class, new ArrayList<>()); } @@ -605,13 +547,13 @@ public class UserReportPOServiceImpl extends ServiceImpl sensitiveUserExcels; + List sensitiveUserExcels; try { - ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserSExcel.class, params); + ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserExcel.class, params); //如果存在非法数据，将不合格的数据导出 if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response); @@ -622,300 +564,72 @@ public class UserReportPOServiceImpl extends ServiceImpl devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); - //指标类型 - List indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData(); - //评估类型 - List evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); - //行业类型 List industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE_JB.getCode()).getData(); - //负荷级别 List loadLevel = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LOAD_LEVEL.getCode()).getData(); - //供电电源情况 List supplyCondition = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPPLY_CONDITION.getCode()).getData(); - //执行批量导入敏感及重要用户，入库过程中会进行数据校验 - List sensitiveUserExcelMsgs = new ArrayList<>(); + List sensitiveUserExcelMsgs = new ArrayList<>(); if (CollectionUtil.isNotEmpty(sensitiveUserExcels)) { - for (SensitiveUserSExcel userExcel : sensitiveUserExcels) { + for (SensitiveUserExcel sensitiveUserExcel : sensitiveUserExcels) { //先判断当前用户是否已经存在 LambdaQueryWrapper userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userReportPOLambdaQueryWrapper.eq(UserReportPO::getProjectName, userExcel.getProjectName()) + userReportPOLambdaQueryWrapper.eq(UserReportPO::getProjectName, sensitiveUserExcel.getProjectName()) .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); int count = this.count(userReportPOLambdaQueryWrapper); if (count > 0) { +// if(sensitiveUserExcel.getOverlay() == 1){ +// +// }else{ //该用户已经录入 - SensitiveUserSExcel.SensitiveUserExcelMsg sensitiveUserExcelMsg = new SensitiveUserSExcel.SensitiveUserExcelMsg(); - BeanUtils.copyProperties(userExcel, sensitiveUserExcelMsg); + SensitiveUserExcel.SensitiveUserExcelMsg sensitiveUserExcelMsg = new SensitiveUserExcel.SensitiveUserExcelMsg(); + BeanUtils.copyProperties(sensitiveUserExcel, sensitiveUserExcelMsg); sensitiveUserExcelMsg.setMsg("该用户已录入!"); sensitiveUserExcelMsgs.add(sensitiveUserExcelMsg); +// } + continue; + } + //处理通用信息 + UserReportPO userReportPO = new UserReportPO(); + userReportPO.setReporter(RequestUtil.getUserIndex()); + userReportPO.setReportDate(LocalDate.now()); + userReportPO.setOrgId(RequestUtil.getDeptIndex()); + userReportPO.setCity(sensitiveUserExcel.getCity()); + userReportPO.setUserType(UserNatureEnum.SENSITIVE_USER.getCode()); + if(Objects.nonNull(sensitiveUserExcel.getUserStatus())){ + userReportPO.setUserStatus(sensitiveUserExcel.getUserStatus()); }else{ - //处理通用信息 - UserReportPO userReportPO = new UserReportPO(); - userReportPO.setReporter(RequestUtil.getUserIndex()); - userReportPO.setReportDate(LocalDate.now()); - userReportPO.setOrgId(RequestUtil.getDeptIndex()); - userReportPO.setExpectedProductionDate(userExcel.getExpectedProductionDate()); - userReportPO.setUserType(UserNatureEnum.SENSITIVE_USER.getCode()); - //所属地市 - userReportPO.setCity(userExcel.getCity()); - userReportPO.setResponsibleDepartment(userExcel.getResponsibleDepartment()); - userReportPO.setUserStatus(userExcel.getUserStatus()); - userReportPO.setSubstation(userExcel.getSubstation()); - userReportPO.setVoltageLevel(PubUtil.getDicById(userExcel.getVoltageLevel(), devVoltage)); - userReportPO.setProjectName(userExcel.getProjectName()); - userReportPO.setEvaluationDept(userExcel.getEvaluationDept()); - userReportPO.setEvaluationConclusion(userExcel.getEvaluationConclusion()); - userReportPO.setDataType(1); - userReportPO.setStatus(2); - userReportPO.setState(DataStateEnum.ENABLE.getCode()); - this.baseMapper.insert(userReportPO); - //处理敏感用户的信息 - UserReportSensitivePO userReportSensitivePO = new UserReportSensitivePO(); - userReportSensitivePO.setId(userReportPO.getId()); - userReportSensitivePO.setPccPoint(userExcel.getPccPoint()); - userReportSensitivePO.setDeviceName(userExcel.getDeviceName()); - userReportSensitivePO.setPowerSupplyCount(userExcel.getPowerSupplyCount()); - userReportSensitivePO.setEnergyQualityIndex(PubUtil.getDicById(userExcel.getEnergyQualityIndex(), indicatorType)); - userReportSensitivePO.setEvaluationType(PubUtil.getDicById(userExcel.getEvaluationType(), evaluationType)); - userReportSensitivePO.setAntiInterferenceTest(userExcel.getAntiInterferenceTest()+""); - userReportSensitivePO.setEvaluationChekDept(userExcel.getEvaluationChekDept()); - userReportSensitivePO.setNeedGovernance(userExcel.getNeedGovernance()); - userReportSensitivePO.setBackgroundTestPerformed(userExcel.getBackgroundTestPerformed()); -// userReportSensitivePO.setSubstationMainWiringDiagram(); -// userReportSensitivePO.setSensitiveDevices(); -// userReportSensitivePO.setAntiInterferenceReport(); -// userReportSensitivePO.setPowerQualityReport(); -// userReportSensitivePO.setFeasibilityReport(); -// userReportSensitivePO.setPreliminaryDesignDescription(); -// userReportSensitivePO.setPredictionEvaluationReport(); -// userReportSensitivePO.setPredictionEvaluationReviewOpinions(); -// userReportSensitivePO.setAdditionalAttachments(); - if (StrUtil.isNotBlank(userExcel.getIndustry())) { - userReportSensitivePO.setIndustry(PubUtil.getDicById(userExcel.getIndustry(), industryType)); - } - userReportSensitivePO.setMaintenanceUnit(userExcel.getMaintenanceUnit()); - userReportSensitivePO.setPowerSupply(userExcel.getPowerSupply()); - if (StrUtil.isNotBlank(userExcel.getSupplyVoltageLevel())) { - userReportSensitivePO.setSupplyVoltageLevel(PubUtil.getDicById(userExcel.getSupplyVoltageLevel(), devVoltage)); - } - if (StrUtil.isNotBlank(userExcel.getLoadLevel())) { - userReportSensitivePO.setLoadLevel(PubUtil.getDicById(userExcel.getLoadLevel(), loadLevel)); - } - if (StrUtil.isNotBlank(userExcel.getPowerSupplyInfo())) { - userReportSensitivePO.setPowerSupplyInfo(PubUtil.getDicById(userExcel.getPowerSupplyInfo(), supplyCondition)); - } - userReportSensitivePO.setState(DataStateEnum.ENABLE.getCode()); - userReportSensitivePOService.save(userReportSensitivePO); + userReportPO.setUserStatus(SupervisionUserStatusEnum.PRODUCT.getCode()); } - } - } - //判断有没有错误信息 - if (CollectionUtil.isNotEmpty(sensitiveUserExcelMsgs)) { - ExcelUtil.exportExcel("失败列表.xlsx", SensitiveUserSExcel.SensitiveUserExcelMsg.class, sensitiveUserExcelMsgs); - return null; - } - return CommonResponseEnum.SUCCESS.getCode(); - } - - @Override - public void downloadSensitiveReportTemplate() { - ExportParams exportParams = new ExportParams("干扰源用户数据模板（带*字段均是必填,请严格按照模板标准填入数据）", "干扰源用户数据信息"); - //所属地市 - List jiBeiArea = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.JIBEI_AREA.getCode()).getData(); - //主要非线性设备类型-冀北 - List treeVOS = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.Major_Nonlinear_Device.getCode()).getData(); - //电压等级 - List devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); - //评估单位 - List evaluationDept = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_DEPT.getCode()).getData(); - //评估类型 - List evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); - - Map treeString = getTreeString("", treeVOS.get(0).getChildren()); - - List pullDowns = new ArrayList<>(); - PullDown pullDown; - pullDown = new PullDown(); - pullDown.setFirstCol(1); - pullDown.setLastCol(1); - pullDown.setStrings(Stream.of("新建电网工程", "扩建电网工程", "新建非线性负荷用户", "扩建非线性负荷用户", "新建新能源发电站", "扩建新能源发电站").collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(2); - pullDown.setLastCol(2); - pullDown.setStrings(jiBeiArea.stream().filter(x -> !"风光储".equals(x.getName())&&!"超高压".equals(x.getName())).map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(4); - pullDown.setLastCol(4); - pullDown.setStrings(Stream.of("可研", "建设", "运行", "退运").collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(7); - pullDown.setLastCol(7); - pullDown.setStrings(devVoltage.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(8); - pullDown.setLastCol(8); - pullDown.setStrings(evaluationDept.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - - pullDown = new PullDown(); - pullDown.setFirstCol(15); - pullDown.setLastCol(15); - pullDown.setStrings(evaluationType.stream().map(DictData::getName).collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(16); - pullDown.setLastCol(16); - pullDown.setStrings(treeString.keySet().stream().collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(18); - pullDown.setLastCol(18); - pullDown.setStrings(Stream.of("否", "是").collect(Collectors.toList())); - pullDowns.add(pullDown); - - pullDown = new PullDown(); - pullDown.setFirstCol(19); - pullDown.setLastCol(19); - pullDown.setStrings(Stream.of("否", "是").collect(Collectors.toList())); - pullDowns.add(pullDown); - - ExcelUtil.exportExcelPullDown(exportParams, "干扰源用户用户模板.xlsx", pullDowns, SensitiveReportExcel.class, new ArrayList<>()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String importSensitiveReportData(MultipartFile file, HttpServletResponse response) { - ImportParams params = new ImportParams(); - params.setHeadRows(1);//表头 - params.setTitleRows(1);//标题 - params.setNeedVerify(true); - params.setStartSheetIndex(0); - params.setSheetNum(1); - List sensitiveUserExcels; - try { - ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveReportExcel.class, params); - //如果存在非法数据，将不合格的数据导出 - if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { - PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response); - return null; - } else { - sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList(); - } - } catch (Exception e) { - throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_USER_ERROR); - } - //主要非线性设备类型-冀北 - List treeVOS = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.Major_Nonlinear_Device.getCode()).getData(); - //电压等级 - List devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); - Map treeString = getTreeString("", treeVOS.get(0).getChildren()); - //评估类型 - List evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); - - //执行批量导入敏感及重要用户，入库过程中会进行数据校验 - List sensitiveUserExcelMsgs = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(sensitiveUserExcels)) { - for (SensitiveReportExcel reportExcel : sensitiveUserExcels) { - //先判断当前用户是否已经存在 - LambdaQueryWrapper userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userReportPOLambdaQueryWrapper.eq(UserReportPO::getProjectName, reportExcel.getProjectName()) - .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); - int count = this.count(userReportPOLambdaQueryWrapper); - if (count > 0) { - //该用户已经录入 - SensitiveReportExcel.SensitiveReportExcelMsg sensitiveUserExcelMsg = new SensitiveReportExcel.SensitiveReportExcelMsg(); - BeanUtils.copyProperties(reportExcel, sensitiveUserExcelMsg); - sensitiveUserExcelMsg.setMsg("该用户已录入!"); - sensitiveUserExcelMsgs.add(sensitiveUserExcelMsg); - } else { - //处理通用信息 - UserReportPO userReportPO = new UserReportPO(); - userReportPO.setReporter(RequestUtil.getUserIndex()); - userReportPO.setReportDate(LocalDate.now()); - userReportPO.setOrgId(RequestUtil.getDeptIndex()); - userReportPO.setExpectedProductionDate(reportExcel.getExpectedProductionDate()); - userReportPO.setUserType(reportExcel.getUserType()); - //所属地市 - userReportPO.setCity(reportExcel.getCity()); - userReportPO.setResponsibleDepartment(reportExcel.getResponsibleDepartment()); - userReportPO.setUserStatus(reportExcel.getUserStatus()); - userReportPO.setSubstation(reportExcel.getSubstation()); - userReportPO.setVoltageLevel(PubUtil.getDicById(reportExcel.getVoltageLevel(), devVoltage)); - userReportPO.setProjectName(reportExcel.getProjectName()); - userReportPO.setEvaluationDept(reportExcel.getEvaluationDept()); - userReportPO.setEvaluationConclusion(reportExcel.getEvaluationConclusion()); - userReportPO.setDataType(1); - userReportPO.setStatus(2); - userReportPO.setState(DataStateEnum.ENABLE.getCode()); - this.baseMapper.insert(userReportPO); - if (CollectionUtil.newArrayList( - UserNatureEnum.BUILD_POWER_GRID.getCode(), - UserNatureEnum.EXTEND_POWER_GRID.getCode() - ).contains(userReportPO.getUserType())) { - //电网工程类用户额外数据 - UserReportProjectPO userReportProjectPO = new UserReportProjectPO(); - userReportProjectPO.setId(userReportPO.getId()); - if(ObjectUtil.isNotEmpty(reportExcel.getNonlinearLoadType())){ - userReportProjectPO.setAgreementCapacity(reportExcel.getUserAgreementCapacity().doubleValue()); - } - if(StrUtil.isNotBlank(reportExcel.getNonlinearLoadType())){ - userReportProjectPO.setNonlinearDeviceType(treeString.containsKey(reportExcel.getNonlinearLoadType()) ? treeString.get(reportExcel.getNonlinearLoadType()) : null); - } - - userReportProjectPO.setNeedGovernance(reportExcel.getNeedGovernance()); - userReportProjectPO.setBackgroundTestPerformed(reportExcel.getBackgroundTestPerformed()); -// userReportProjectPO.setFeasibilityReport(); -// userReportProjectPO.setPreliminaryDesignDescription(); -// userReportProjectPO.setPredictionEvaluationReport(); -// userReportProjectPO.setPredictionEvaluationReviewOpinions(); -// userReportProjectPO.setAdditionalAttachments(); - userReportProjectPO.setState(DataStateEnum.ENABLE.getCode()); - userReportProjectPOService.saveOrUpdate(userReportProjectPO); - } - if (CollectionUtil.newArrayList( - UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(), - UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(), - UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(), - UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode() - ).contains(userReportPO.getUserType())) { - //非线性负荷用户 & 新能源发电站用户 - UserReportSubstationPO userReportSubstationPO = new UserReportSubstationPO(); - userReportSubstationPO.setId(userReportPO.getId()); - userReportSubstationPO.setPccPoint(reportExcel.getPccPoint()); - userReportSubstationPO.setBaseShortCircuitCapacity(reportExcel.getBaseShortCircuitCapacity()); - userReportSubstationPO.setMinShortCircuitCapacity(reportExcel.getMinShortCircuitCapacity()); - userReportSubstationPO.setPccEquipmentCapacity(reportExcel.getPccEquipmentCapacity()); - userReportSubstationPO.setUserAgreementCapacity(reportExcel.getUserAgreementCapacity()); - userReportSubstationPO.setEvaluationType(PubUtil.getDicById(reportExcel.getEvaluationType(), evaluationType)); - if(StrUtil.isNotBlank(reportExcel.getNonlinearLoadType())){ - userReportSubstationPO.setNonlinearLoadType(treeString.containsKey(reportExcel.getNonlinearLoadType()) ? treeString.get(reportExcel.getNonlinearLoadType()) : null); - } - userReportSubstationPO.setEvaluationChekDept(reportExcel.getEvaluationChekDept()); - userReportSubstationPO.setNeedGovernance(reportExcel.getNeedGovernance()); - userReportSubstationPO.setBackgroundTestPerformed(reportExcel.getBackgroundTestPerformed()); -// userReportSubstationPO.setSubstationMainWiringDiagram(); -// userReportSubstationPO.setFeasibilityReport(); -// userReportSubstationPO.setPreliminaryDesignDescription(); -// userReportSubstationPO.setPredictionEvaluationReport(); -// userReportSubstationPO.setPredictionEvaluationReviewOpinions(); -// userReportSubstationPO.setAdditionalAttachments(); - userReportSubstationPO.setState(DataStateEnum.ENABLE.getCode()); - userReportSubstationPOService.saveOrUpdate(userReportSubstationPO); - } + userReportPO.setSubstation(sensitiveUserExcel.getSubstation()); + //电压等级需要特殊处理下 + if (StrUtil.isNotBlank(sensitiveUserExcel.getVoltageLevel())) { + userReportPO.setVoltageLevel(PubUtil.getDicById(sensitiveUserExcel.getVoltageLevel(), devVoltage)); } + userReportPO.setProjectName(sensitiveUserExcel.getProjectName()); + userReportPO.setDataType(1); + userReportPO.setStatus(2); + userReportPO.setState(DataStateEnum.ENABLE.getCode()); + this.baseMapper.insert(userReportPO); + //处理敏感用户的信息 + UserReportSensitivePO userReportSensitivePO = new UserReportSensitivePO(); + userReportSensitivePO.setId(userReportPO.getId()); + if (StrUtil.isNotBlank(sensitiveUserExcel.getIndustry())) { + userReportSensitivePO.setIndustry(PubUtil.getDicById(sensitiveUserExcel.getIndustry(), industryType)); + } + userReportSensitivePO.setMaintenanceUnit(sensitiveUserExcel.getMaintenanceUnit()); + userReportSensitivePO.setPowerSupply(sensitiveUserExcel.getPowerSupply()); + if (StrUtil.isNotBlank(sensitiveUserExcel.getSupplyVoltageLevel())) { + userReportSensitivePO.setSupplyVoltageLevel(PubUtil.getDicById(sensitiveUserExcel.getSupplyVoltageLevel(), devVoltage)); + } + if (StrUtil.isNotBlank(sensitiveUserExcel.getLoadLevel())) { + userReportSensitivePO.setLoadLevel(PubUtil.getDicById(sensitiveUserExcel.getLoadLevel(), loadLevel)); + } + if (StrUtil.isNotBlank(sensitiveUserExcel.getPowerSupplyInfo())) { + userReportSensitivePO.setPowerSupplyInfo(PubUtil.getDicById(sensitiveUserExcel.getPowerSupplyInfo(), supplyCondition)); + } + userReportSensitivePO.setState(DataStateEnum.ENABLE.getCode()); + userReportSensitivePOService.save(userReportSensitivePO); } } //判断有没有错误信息 @@ -926,20 +640,6 @@ public class UserReportPOServiceImpl extends ServiceImpl getTreeString(String name, List treeVOS) { - Map info = new LinkedHashMap<>(); - for (SysDicTreePO sysMenuDtoChild : treeVOS) { - if (sysMenuDtoChild.getLevel() == 3) { - name = sysMenuDtoChild.getId()+"-"+sysMenuDtoChild.getName(); - } - if (CollUtil.isNotEmpty(sysMenuDtoChild.getChildren())) { - info.putAll(getTreeString(name, sysMenuDtoChild.getChildren())); - } else { - info.put(name.split("-")[1],name.split("-")[0]); - } - } - return info; - } /** * 获取所有字段为null的属性名