diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/task/BpmTaskRejectParam.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/task/BpmTaskRejectParam.java index ef5e1420a..59da24337 100644 --- a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/task/BpmTaskRejectParam.java +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/task/BpmTaskRejectParam.java @@ -5,7 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; +import java.util.Collection; +import java.util.Map; @Schema(description = "管理后台 - 不通过流程任务的 Request VO") @Data @@ -21,4 +22,9 @@ public class BpmTaskRejectParam { @NotBlank(message = "审批意见不能为空") private String reason; + @ApiModelProperty("抄送的用户编号数组") + private Collection copyUserIds; + + @ApiModelProperty("变量实例（动态表单）") + private Map variables; } diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/IBpmProcessInstanceService.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/IBpmProcessInstanceService.java index 4736dbb7f..e0d432454 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/IBpmProcessInstanceService.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/IBpmProcessInstanceService.java @@ -4,6 +4,8 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.dto.PageResult; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.bpm.pojo.param.instance.BpmProcessInstancePageParam; +import com.njcn.bpm.pojo.param.task.BpmTaskRejectParam; +import org.flowable.engine.TaskService; import org.flowable.engine.delegate.event.FlowableCancelledEvent; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ProcessInstance; @@ -146,6 +148,13 @@ public interface IBpmProcessInstanceService { */ void updateProcessInstanceReject(String id, String reason); + /** + * 更新 ProcessInstance 拓展记录为不通过 + * + * @param id 流程编号 + * @param reason 理由。例如说，审批不通过时，需要传递该值 + */ + void updateProcessInstanceFromReject(String id, String reason, TaskService taskService, BpmTaskRejectParam bpmTaskRejectParam); /** * 用于测试过程删除流程,正式环境慎用 * @author cdf diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java index be6eefb46..927d1cc60 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.bpm.service.task.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; @@ -13,6 +14,7 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.dto.PageResult; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.bpm.pojo.param.instance.BpmProcessInstancePageParam; +import com.njcn.bpm.pojo.param.task.BpmTaskRejectParam; import com.njcn.bpm.service.IBpmProcessDefinitionService; import com.njcn.bpm.service.task.IBpmProcessInstanceService; import com.njcn.bpm.strategy.BpmTaskCandidateStartUserSelectStrategy; @@ -30,6 +32,7 @@ import org.flowable.bpmn.model.UserTask; import org.flowable.common.engine.impl.identity.Authentication; import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; import org.flowable.engine.delegate.event.FlowableCancelledEvent; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.repository.ProcessDefinition; @@ -72,7 +75,7 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService @Resource private IBpmProcessDefinitionService processDefinitionService; -// @Resource + // @Resource // private BpmMessageService messageService; // @Resource @@ -90,7 +93,6 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService } - @Override public List getProcessInstances(Set ids) { return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); @@ -115,7 +117,7 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService .orderByProcessInstanceStartTime().desc(); if (userId != null) { // 【我的流程】菜单时，需要传递该字段 processInstanceQuery.startedBy(userId); - } else if (bpmProcessInstancePageParam.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段 + } else if (bpmProcessInstancePageParam.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段 processInstanceQuery.startedBy(bpmProcessInstancePageParam.getStartUserId()); } if (StrUtil.isNotEmpty(bpmProcessInstancePageParam.getName())) { @@ -144,7 +146,7 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService } // 查询列表 int offset = PageFactory.getPageSize(bpmProcessInstancePageParam) * (PageFactory.getPageNum(bpmProcessInstancePageParam) - 1); - List processInstanceList = processInstanceQuery.listPage(offset, PageFactory.getPageSize(bpmProcessInstancePageParam)); + List processInstanceList = processInstanceQuery.listPage(offset, PageFactory.getPageSize(bpmProcessInstancePageParam)); return new PageResult<>(processInstanceList, processInstanceCount); } @@ -226,7 +228,7 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService } @Override - public void cancelProcessInstanceByStartUser(String userId, BpmProcessInstanceCancelParam cancelReqVO) { + public void cancelProcessInstanceByStartUser(String userId, BpmProcessInstanceCancelParam cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getProcessInstanceId()); if (instance == null) { @@ -285,9 +287,18 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService @Override public void updateProcessInstanceWhenApprove(ProcessInstance instance) { + //判断传入参数是否是，不通过信息不通过则需要更新流程信息为不通过 + Integer processInstanceStatus = BpmProcessInstanceStatusEnum.APPROVE.getStatus(); + Map processVariables = instance.getProcessVariables(); + if (processVariables.containsKey(BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS)) { + Integer stata =Integer.valueOf(processVariables.get(BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS).toString()); + if (BpmProcessInstanceStatusEnum.REJECT.getStatus()==stata) { + processInstanceStatus = BpmProcessInstanceStatusEnum.REJECT.getStatus(); + } + } // 1. 更新流程实例 status runtimeService.setVariable(instance.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, - BpmProcessInstanceStatusEnum.APPROVE.getStatus()); + processInstanceStatus); // 2. 发送流程被【通过】的消息 // messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); @@ -296,7 +307,7 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService // 注意：此时如果去查询 ProcessInstance 的话，字段是不全的，所以去查询了 HistoricProcessInstance HistoricProcessInstance processInstance = getHistoricProcessInstance(instance.getId()); processInstanceEventPublisher.sendProcessInstanceResultEvent( - BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, processInstance, BpmProcessInstanceStatusEnum.APPROVE.getStatus())); + BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, processInstance, processInstanceStatus)); } @Override @@ -314,7 +325,31 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService // 4. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( - BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, processInstance,reason ,BpmProcessInstanceStatusEnum.REJECT.getStatus())); + BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, processInstance, reason, BpmProcessInstanceStatusEnum.REJECT.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateProcessInstanceFromReject(String id, String reason, TaskService taskService, BpmTaskRejectParam bpmTaskRejectParam) { + // 1. 更新流程实例 status + runtimeService.setVariable(id, BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.REJECT.getStatus()); + + // 2. 删除流程实例，以实现驳回任务时，取消整个审批流程 + ProcessInstance processInstance = getProcessInstance(id); + // 3.3 调用 BPM complete 去完成任务 + // 其中，variables 是存储动态表单到 local 任务级别。过滤一下，避免 ProcessInstance 系统级的变量被占用 + if (CollectionUtil.isNotEmpty(bpmTaskRejectParam.getVariables())) { + Map variables = FlowableUtils.filterTaskFormVariable(bpmTaskRejectParam.getVariables()); + taskService.complete(bpmTaskRejectParam.getId(), variables, false); + } else { + taskService.complete(bpmTaskRejectParam.getId()); + } + //这是删除所有信息， +// deleteProcessInstance(id, StrUtil.format(BpmDeleteReasonEnum.REJECT_TASK.format(reason))); + // 4. 发送流程实例的状态事件 + processInstanceEventPublisher.sendProcessInstanceResultEvent( + BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, processInstance, reason, BpmProcessInstanceStatusEnum.REJECT.getStatus())); + } public void deleteProcessInstance(String id, String reason) { diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java index f7bb2b655..80dc9a2ad 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java @@ -346,7 +346,7 @@ public class BpmTaskServiceImpl implements IBpmTaskService { BpmCommentTypeEnum.REJECT.formatComment(bpmTaskRejectParam.getReason())); // 3. 更新流程实例，审批不通过！ - processInstanceService.updateProcessInstanceReject(instance.getProcessInstanceId(), bpmTaskRejectParam.getReason()); + processInstanceService.updateProcessInstanceFromReject(instance.getProcessInstanceId(), bpmTaskRejectParam.getReason(), taskService, bpmTaskRejectParam); } /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java index b8e337d3f..22a2412f7 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java @@ -89,6 +89,9 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{ private String powerSubstationName; private String reason; + @ApiModelProperty(value = "监测点填报单位") + private String orgId; + /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java index 56030d80b..bcd045f2b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java @@ -16,6 +16,7 @@ import lombok.EqualsAndHashCode; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; /** * @@ -174,4 +175,15 @@ public class UserReportVO { private String userReportId; } + + @Data + @EqualsAndHashCode(callSuper = true) + public static class UserReportListVO extends UserReportVO{ + + @ApiModelProperty(value = "入网评估报告") + private List netInReport; + + @ApiModelProperty(value = "治理评估告") + private List governReport; + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java index 25ae1a9d0..29f845a26 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -16,7 +16,6 @@ import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java index 5b184772e..31e42eed3 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java @@ -8,7 +8,6 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam; import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO; import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java index 51ed9535a..791f1b002 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java @@ -9,25 +9,19 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; -import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet; -import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO; import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO; import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam; -import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO; import com.njcn.supervision.service.leaflet.IWarningLeafletService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; import springfox.documentation.annotations.ApiIgnore; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java index 65a8ae001..74da3dfbd 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java @@ -15,7 +15,6 @@ import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -41,8 +40,8 @@ public class SupervisionPlanController extends BaseController { @PostMapping("addPlan") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @ApiOperation("新增技术监督计划") - @ApiImplicitParam(name = "supvPlanParam",value = "请求体",required = true) - public HttpResult addPlan(@RequestBody @Validated SupervisionPlanParam supvPlanParam){ + @ApiImplicitParam(name = "supvPlanParam", value = "请求体", required = true) + public HttpResult addPlan(@RequestBody @Validated SupervisionPlanParam supvPlanParam) { String methodDescribe = getMethodDescribe("addPlan"); String id = supervisionPlanPOService.addPlan(supvPlanParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe); @@ -52,8 +51,8 @@ public class SupervisionPlanController extends BaseController { @PostMapping("update") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) @ApiOperation("新增技术监督计划") - @ApiImplicitParam(name = "supvPlanParam",value = "请求体",required = true) - public HttpResult updatePlan(@RequestBody @Validated SupervisionPlanParam.UpdateSupvPlanParam supvPlanParam){ + @ApiImplicitParam(name = "supvPlanParam", value = "请求体", required = true) + public HttpResult updatePlan(@RequestBody @Validated SupervisionPlanParam.UpdateSupvPlanParam supvPlanParam) { String methodDescribe = getMethodDescribe("updatePlan"); String id = supervisionPlanPOService.updatePlan(supvPlanParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe); @@ -63,8 +62,8 @@ public class SupervisionPlanController extends BaseController { @PostMapping("pagePlan") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("分页查询监督计划") - @ApiImplicitParam(name = "supvPlanParam",value = "请求体",required = true) - public HttpResult> pagePlan(@RequestBody SupervisionPlanParam supvPlanParam){ + @ApiImplicitParam(name = "supvPlanParam", value = "请求体", required = true) + public HttpResult> pagePlan(@RequestBody SupervisionPlanParam supvPlanParam) { String methodDescribe = getMethodDescribe("pagePlan"); Page page = supervisionPlanPOService.pagePlan(supvPlanParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); @@ -87,12 +86,13 @@ public class SupervisionPlanController extends BaseController { SupervisionPlanVO out = supervisionPlanPOService.getDetailPlan(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("更改表单状态") - public HttpResult updateStatus(String businessKey,Integer status) { + public HttpResult updateStatus(String businessKey, Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); - supervisionPlanPOService.updateProcessStatus(businessKey,status); + supervisionPlanPOService.updateProcessStatus(businessKey, status); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -100,7 +100,7 @@ public class SupervisionPlanController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/initiateWarningLeaflet") @ApiOperation("针对技术监督问题发起告警单") - public HttpResult initiateWarningLeaflet(@RequestParam("id") String id){ + public HttpResult initiateWarningLeaflet(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("initiateWarningLeaflet"); supervisionPlanPOService.initiateWarningLeaflet(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Boolean.TRUE, methodDescribe); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionProblemController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionProblemController.java index 55f0719eb..96785ff15 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionProblemController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionProblemController.java @@ -44,8 +44,8 @@ public class SupervisionProblemController extends BaseController { @PostMapping("addProblem") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @ApiOperation("新增技术监督问题") - @ApiImplicitParam(name = "supvProblemParam",value = "请求体",required = true) - public HttpResult addProblem(@RequestBody @Validated SupervisopnProblemParam supvProblemParam){ + @ApiImplicitParam(name = "supvProblemParam", value = "请求体", required = true) + public HttpResult addProblem(@RequestBody @Validated SupervisopnProblemParam supvProblemParam) { String methodDescribe = getMethodDescribe("addProblem"); supervisionProblemPOService.addProblem(supvProblemParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); @@ -54,10 +54,10 @@ public class SupervisionProblemController extends BaseController { @PostMapping("pageProblem") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("分页查询监督问题") - @ApiImplicitParam(name = "supvProblemParam",value = "请求体",required = true) - public HttpResult> pageProblem(@RequestBody SupervisopnProblemParam supvProblemParam){ + @ApiImplicitParam(name = "supvProblemParam", value = "请求体", required = true) + public HttpResult> pageProblem(@RequestBody SupervisopnProblemParam supvProblemParam) { String methodDescribe = getMethodDescribe("pageProblem"); - if(StrUtil.isBlank(supvProblemParam.getPlanId())){ + if (StrUtil.isBlank(supvProblemParam.getPlanId())) { throw new BusinessException("监督计划索引不可为空"); } Page page = supervisionProblemPOService.pageProblem(supvProblemParam); @@ -65,7 +65,4 @@ public class SupervisionProblemController extends BaseController { } - - - } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java index 49d95d428..9a5b20651 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java @@ -10,13 +10,11 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.supervision.pojo.param.survey.SurveyPlanParam; -import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO; import com.njcn.supervision.service.survey.ISurveyPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 1cf463542..cfda6a7ed 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -96,9 +96,9 @@ public class UserReportManageController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("根据id获取用户档案录入的详细数据") - public HttpResult getById(String id) { + public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); - UserReportVO userReportVO = userReportPOService.getVOById(id); + UserReportVO.UserReportListVO userReportVO = userReportPOService.getVOById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportVO, methodDescribe); } @@ -183,7 +183,7 @@ public class UserReportManageController extends BaseController { @PostMapping(value = "/importSensitiveReportData") @ApiOperation("批量导入干扰源用户") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) - public HttpResult importSensitiveReportData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { + public HttpResult importSensitiveReportData(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { String methodDescribe = getMethodDescribe("importSensitiveReportData"); userReportPOService.importSensitiveReportData(file, response); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java index a74121155..25ba1fe70 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java @@ -10,7 +10,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.supervision.pojo.param.user.UserReportNormalParam; -import com.njcn.supervision.pojo.param.user.UserReportParam; import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.supervision.service.user.IUserReportNormalService; import com.njcn.web.controller.BaseController; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java index 004bdee61..650b8fbe6 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java @@ -1,7 +1,6 @@ package com.njcn.supervision.controller.user; -import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml index fbb52f201..b35192615 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml @@ -11,6 +11,7 @@ supervision_temp_line_report.Power_Substation_Name, supervision_temp_line_report.line_id lineId, supervision_temp_line_report.line_name lineName, + supervision_temp_line_report.org_id orgId, supervision_temp_line_debug.reason reason, supervision_temp_line_run_test.process_instance_id process_instanceId, supervision_temp_line_run_test.history_instance_id historyInstanceId, diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java index 3135f6c0d..73446249e 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.StrUtil; @@ -18,7 +17,6 @@ import com.njcn.bpm.enums.BpmTaskStatusEnum; import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; -import com.njcn.bpm.utils.DateUtils; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -39,7 +37,6 @@ import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO; import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning; -import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet; import com.njcn.supervision.pojo.po.user.UserReportNormalPO; import com.njcn.supervision.pojo.po.user.UserReportProjectPO; import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; @@ -48,7 +45,6 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO; import com.njcn.supervision.pojo.vo.device.TempLineRunTestWarningVO; import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService; import com.njcn.supervision.service.device.TempLineRunTestWarningService; -import com.njcn.supervision.service.leaflet.IWarningLeafletService; import com.njcn.supervision.service.user.*; import com.njcn.supervision.utils.InstanceUtil; import com.njcn.web.utils.RequestUtil; @@ -185,38 +181,38 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl tempLineRunTestWarningVOS = this.baseMapper.selectResults(supervisionTempLineRunTestParam.getId()); long count = tempLineRunTestWarningVOS.stream().filter(x -> StrUtil.isBlank(x.getWarningId())).count(); - if (count>0) { + if (count > 0) { throw new BusinessException(CommonResponseEnum.FAIL, "请先发送告警单信息!"); } //2.判断告警单，是否有未审核通过则不允许重新发送 - if(CollUtil.isNotEmpty(tempLineRunTestWarningVOS)){ + if (CollUtil.isNotEmpty(tempLineRunTestWarningVOS)) { Integer status = tempLineRunTestWarningVOS.get(0).getStatus(); - if(!status.equals(FlowStatusEnum.APPROVE.getCode())){ + if (!status.equals(FlowStatusEnum.APPROVE.getCode())) { throw new BusinessException(CommonResponseEnum.FAIL, "请处理告警单信息，处理审核通过才可重新发送!"); } String startTime = DateUtil.format(DateUtil.offsetDay(DateUtil.date(), 1), DatePattern.NORM_DATE_PATTERN); - String endTime = DateUtil.format(DateUtil.offsetDay(DateUtil.date(), 3), DatePattern.NORM_DATE_PATTERN); + String endTime = DateUtil.format(DateUtil.offsetDay(DateUtil.date(), 3), DatePattern.NORM_DATE_PATTERN); supervisionTempLineRunTestPO.setTestRunTime(startTime + "--" + endTime); } - supervisionTempLineRunTestPO.setStatus(1); + supervisionTempLineRunTestPO.setStatus(9); supervisionTempLineRunTestPO.setTestRunReport(""); supervisionTempLineRunTestPO.setState(DataStateEnum.ENABLE.getCode()); supervisionTempLineRunTestPO.setTestRunState(DataStateEnum.ENABLE.getCode()); - //处理历史流程id列表 - String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineRunTestPO.getProcessInstanceId(), supervisionTempLineRunTestPO.getHistoryInstanceId()); - // 发起 BPM 流程 - Map processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号，更新到流程单中 - supervisionTempLineRunTestPO.setProcessInstanceId(processInstanceId); - //保存历史流程id列表 - supervisionTempLineRunTestPO.setHistoryInstanceId(historyInstanceIds); +// //处理历史流程id列表 +// String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineRunTestPO.getProcessInstanceId(), supervisionTempLineRunTestPO.getHistoryInstanceId()); +// // 发起 BPM 流程 +// Map processInstanceVariables = new HashMap<>(); +// BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); +// bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); +// bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); +// bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); +// bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); +// String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); +// // 将工作流的编号，更新到流程单中 +// supervisionTempLineRunTestPO.setProcessInstanceId(processInstanceId); +// //保存历史流程id列表 +// supervisionTempLineRunTestPO.setHistoryInstanceId(historyInstanceIds); this.baseMapper.updateById(supervisionTempLineRunTestPO); return supervisionTempLineRunTestPO.getId(); } @@ -226,7 +222,8 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SupervisionTempLineRunTestPO::getTestRunState, 1).eq(SupervisionTempLineRunTestPO::getState, DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.eq(SupervisionTempLineRunTestPO::getTestRunState, 1) + .eq(SupervisionTempLineRunTestPO::getState, DataStateEnum.ENABLE.getCode()); List supervisionTempLineRunTestPOList = this.list(lambdaQueryWrapper); List usePoList = new ArrayList<>(); for (SupervisionTempLineRunTestPO item : supervisionTempLineRunTestPOList) { @@ -237,7 +234,6 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lineRunTestIds = usePoList.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList()); List supervisionTempLineReports = supervisionTempLineReportMapper.selectBatchIds(lineRunTestIds); @@ -246,24 +242,27 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl { String startTime = key.split("--")[0]; String endTime = key.split("--")[1]; - List ids = val.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList()); + List ids = val.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList()); LineDataQualityParam lineDataQualityParam = LineDataQualityParam.builder().lineIds(ids).beginTime(startTime).endTime(endTime).build(); List lineDataQualityDTOList = lineIntegrityClient.getLineDataQuality(lineDataQualityParam).getData(); Map qualityDTOMap = lineDataQualityDTOList.stream().collect(Collectors.toMap(LineDataQualityDTO::getLineId, Function.identity())); for (SupervisionTempLineRunTestPO supervisionTempLineRunTestPO : val) { // 将工作流的编号，更新到流程单中 SupervisionTempLineRunTestPO po = new SupervisionTempLineRunTestPO(); - if(supervisionTempLineRunTestPO.getStatus()!=1&&StrUtil.isBlank(supervisionTempLineRunTestPO.getProcessInstanceId())){ - // 发起 BPM 流程 - Map processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - po.setProcessInstanceId(processInstanceId); + if (StrUtil.isNotBlank(supervisionTempLineRunTestPO.getProcessInstanceId())) { + String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineRunTestPO.getProcessInstanceId(), + supervisionTempLineRunTestPO.getHistoryInstanceId()); + po.setHistoryInstanceId(historyInstanceIds); } + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + po.setProcessInstanceId(processInstanceId); po.setId(supervisionTempLineRunTestPO.getId()); po.setStatus(1); po.setTestRunState(2); @@ -273,11 +272,11 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl{ +public interface SupervisionProblemPOService extends IService { - void addProblem(SupervisopnProblemParam supvProblemParam); + void addProblem(SupervisopnProblemParam supvProblemParam); - Page pageProblem(SupervisopnProblemParam supvProblemParam); - } + Page pageProblem(SupervisopnProblemParam supvProblemParam); +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java index 5002f17c6..4b57f1370 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java @@ -8,7 +8,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.bpm.api.BpmProcessFeignClient; @@ -20,8 +19,6 @@ import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; -import com.njcn.supervision.enums.LeafletTypeEnum; -import com.njcn.supervision.enums.ProblemTypeEnum; import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.plan.SupervisionPlanPOMapper; import com.njcn.supervision.pojo.param.plan.SupervisionPlanParam; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java index 845c41df2..440ebd0a2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionProblemPOServiceImpl.java @@ -32,7 +32,6 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * * Description: * Date: 2024/5/20 19:50【需求编号】 * @@ -41,21 +40,22 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SupervisionProblemPOServiceImpl extends ServiceImpl implements SupervisionProblemPOService{ +public class SupervisionProblemPOServiceImpl extends ServiceImpl implements SupervisionProblemPOService { private final SupervisionPlanPOMapper supervisionPlanPOMapper; private final DicDataFeignClient dicDataFeignClient; private final DeptFeignClient deptFeignClient; + @Override @Transactional(rollbackFor = Exception.class) public void addProblem(SupervisopnProblemParam supvProblemParam) { - checkParam(supvProblemParam.getPlanId(),supvProblemParam.getDiscoveryTime()); + checkParam(supvProblemParam.getPlanId(), supvProblemParam.getDiscoveryTime()); SupervisionProblemPO supvProblem = new SupervisionProblemPO(); BeanUtil.copyProperties(supvProblemParam, supvProblem); supvProblem.setPlanRectificationTime(LocalDateTimeUtil.parse(supvProblemParam.getPlanRectificationTime(), DatePattern.NORM_DATETIME_PATTERN)); - if(StrUtil.isNotBlank(supvProblemParam.getRectificationTime())) { + if (StrUtil.isNotBlank(supvProblemParam.getRectificationTime())) { supvProblem.setRectificationTime(LocalDateTimeUtil.parse(supvProblemParam.getRectificationTime(), DatePattern.NORM_DATETIME_PATTERN)); } this.save(supvProblem); @@ -94,12 +94,12 @@ public class SupervisionProblemPOServiceImpl extends ServiceImpl { Boolean removeUserReport(List ids); - UserReportVO getVOById(String id); + UserReportVO.UserReportListVO getVOById(String id); List getUserReportList(); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java index 53204859c..d9fabedfe 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java @@ -14,6 +14,7 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.user.UserReportNormalMapper; import com.njcn.supervision.pojo.param.user.UserReportNormalParam; @@ -23,7 +24,6 @@ import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.supervision.service.user.IUserReportNormalService; import com.njcn.supervision.service.user.UserReportPOService; import com.njcn.supervision.utils.InstanceUtil; -import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; @@ -50,39 +50,54 @@ public class UserReportNormalServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper() + .eq(UserReportNormalPO::getUserReportId, userReportNormalParam.getUserReportId()) + .eq(UserReportNormalPO::getState, DataStateEnum.ENABLE.getCode()) + .ne(UserReportNormalPO::getStatus, BpmTaskStatusEnum.CANCEL.getStatus()) + .eq(UserReportNormalPO::getType, 0) + .orderByDesc(UserReportNormalPO::getCreateTime) + ); + if(CollUtil.isNotEmpty(list)){ + List collect = list.stream().filter(x -> Objects.equals(x.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus())) + .map(UserReportNormalPO::getId) + .collect(Collectors.toList()); + if(CollUtil.isNotEmpty(collect)){ + throw new BusinessException("入网方案申请未都通过!"); + } + }else{ + throw new BusinessException("请先进行入网方案申请!"); + } + } UserReportNormalPO userReportNormalPO = new UserReportNormalPO(); BeanUtil.copyProperties(userReportNormalParam, userReportNormalPO); userReportNormalPO.setState(DataStateEnum.ENABLE.getCode()); - if(Objects.equals(userReportNormalParam.getSaveOrCheckflag(),"1")){ + if (Objects.equals(userReportNormalParam.getSaveOrCheckflag(), "1")) { userReportNormalPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus()); - }else { + } else { userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); } this.saveOrUpdate(userReportNormalPO); - userReportNormalPO =this.getById(userReportNormalPO.getId()); - if(Objects.equals(userReportNormalParam.getSaveOrCheckflag(),"2")){ + userReportNormalPO = this.getById(userReportNormalPO.getId()); + if (Objects.equals(userReportNormalParam.getSaveOrCheckflag(), "2")) { // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - if(userReportNormalParam.getType() == 0){ + if (0 == userReportNormalParam.getType()) { bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey()); - }else { + } else { bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_TREAT_CHECK.getKey()); } - bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportNormalParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -99,7 +114,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - if(userReportNormalPO.getType() == 0){ + if (userReportNormalPO.getType() == 0) { bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey()); - }else { + } else { bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_TREAT_CHECK.getKey()); } bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId()); @@ -131,15 +146,15 @@ public class UserReportNormalServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - if(CollUtil.isEmpty(colleaguesIds)){ + if (CollUtil.isEmpty(colleaguesIds)) { return pageResult; } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.orderByDesc(UserReportNormalPO::getCreateTime) - .eq(UserReportNormalPO::getType,userReportNormalParam.getType()) + .eq(UserReportNormalPO::getType, userReportNormalParam.getType()) .in(UserReportNormalPO::getCreateBy, colleaguesIds) - .eq(UserReportNormalPO::getUserReportId,userReportNormalParam.getUserReportId()).eq(Objects.nonNull(userReportNormalParam.getStatus()),UserReportNormalPO::getStatus,userReportNormalParam.getStatus()); + .eq(UserReportNormalPO::getUserReportId, userReportNormalParam.getUserReportId()).eq(Objects.nonNull(userReportNormalParam.getStatus()), UserReportNormalPO::getStatus, userReportNormalParam.getStatus()); Page page = this.page(new Page<>(PageFactory.getPageNum(userReportNormalParam), PageFactory.getPageSize(userReportNormalParam)), lambdaQueryWrapper); if (CollUtil.isNotEmpty(page.getRecords())) { @@ -151,7 +166,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl { UserReportVO.UserReportGoNetVO vo = new UserReportVO.UserReportGoNetVO(); UserReportPO userReportPO = map.get(item.getUserReportId()); - BeanUtil.copyProperties(userReportPO,vo); + BeanUtil.copyProperties(userReportPO, vo); vo.setId(item.getId()); vo.setUserReportId(item.getUserReportId()); vo.setOtherReport(item.getReportUrl()); @@ -161,7 +176,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl().lambda().set(UserReportNormalPO::getStatus,status).eq(UserReportNormalPO::getId,businessKey)); + this.update(new UpdateWrapper().lambda().set(UserReportNormalPO::getStatus, status).eq(UserReportNormalPO::getId, businessKey)); } @Override public BpmInstanceInfo getInstanceInfo(String businessId) { BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo(); UserReportVO.UserReportGoNetVO userReportGoNet = this.userReportGoNetById(businessId); - if(Objects.nonNull(userReportGoNet)){ + if (Objects.nonNull(userReportGoNet)) { bpmInstanceInfo.setHistoryInstanceId(userReportGoNet.getHistoryInstanceId()); bpmInstanceInfo.setInstanceSign(userReportGoNet.getProjectName()); } @@ -202,7 +217,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl list = userReportNormalMapper.selectList(new LambdaQueryWrapper() + .eq(UserReportNormalPO::getUserReportId, id) + .eq(UserReportNormalPO::getStatus, BpmTaskStatusEnum.APPROVE.getStatus()) + .eq(UserReportNormalPO::getState, DataStateEnum.ENABLE.getCode()) + .orderByDesc(UserReportNormalPO::getCreateTime) + ); + userReportVO.setNetInReport(list.stream().filter(x -> 0==x.getType()).map(UserReportNormalPO::getReportUrl).collect(Collectors.toList())); + userReportVO.setGovernReport(list.stream().filter(x -> 1==x.getType()).map(UserReportNormalPO::getReportUrl).collect(Collectors.toList())); return userReportVO; }