From a7cdc000593bc9e17856b8893f6bffeeff019bff Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 13 Jun 2024 09:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8Bkey=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ceKeyEnum.java => SupervisionKeyEnum.java} | 6 ++--- .../pojo/po/user/UserReportNormalPO.java | 2 +- .../user/UserReportNormalController.java | 2 +- .../impl/QuitRunningDeviceServiceImpl.java | 12 +++------ ...SupervisionDevMainReportPOServiceImpl.java | 11 +++----- ...SupervisionTempLineDebugPOServiceImpl.java | 7 +++--- .../SupervisionTempLineReportServiceImpl.java | 11 +++----- ...SupervisionTempLineRunTestServiceImpl.java | 7 +++--- .../impl/WarningLeafletServiceImpl.java | 7 +++--- .../impl/SupervisionPlanPOServiceImpl.java | 6 ++--- .../survey/impl/SurveyPlanServiceImpl.java | 9 +++---- .../survey/impl/SurveyTestServiceImpl.java | 10 +++----- .../user/IUserReportNormalService.java | 2 +- .../impl/UserReportNormalServiceImpl.java | 25 ++++++++----------- .../user/impl/UserReportPOServiceImpl.java | 14 +++-------- 15 files changed, 50 insertions(+), 81 deletions(-) rename pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/{SuperviceKeyEnum.java => SupervisionKeyEnum.java} (91%) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SuperviceKeyEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java similarity index 91% rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SuperviceKeyEnum.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java index c37eac1b9..99aefcae9 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SuperviceKeyEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java @@ -4,7 +4,7 @@ import cn.hutool.core.text.StrPool; import lombok.Getter; @Getter -public enum SuperviceKeyEnum { +public enum SupervisionKeyEnum { QUIT_RUNNING_DEVICE("quit_running_device","device","终端状态变更流程","QuitRunningDeviceServiceImpl"), DEVICE_INFO_ADD("device_info_add","device","电能质量监测装置设备管理流程","SupervisionDevMainReportPOServiceImpl"), @@ -34,7 +34,7 @@ public enum SuperviceKeyEnum { * @param describe 描述 * @param clazzName 类名，方便获取spring中对应的对象 */ - SuperviceKeyEnum(String key, String servicePrefix, String describe,String clazzName) { + SupervisionKeyEnum(String key, String servicePrefix, String describe, String clazzName) { this.key = key; this.servicePrefix = servicePrefix; this.describe = describe; @@ -47,7 +47,7 @@ public enum SuperviceKeyEnum { * 根据流程key获取类的全路径，用于获取spring中的对象 */ public static String getFullServicePathByKey(String key){ - for (SuperviceKeyEnum superviceKeyEnum : SuperviceKeyEnum.values()) { + for (SupervisionKeyEnum superviceKeyEnum : SupervisionKeyEnum.values()) { if (superviceKeyEnum.key.equalsIgnoreCase(key)) { return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(StrPool.DOT).concat(superviceKeyEnum.clazzName); } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java index 980d0ad2c..37bb1704b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java @@ -30,7 +30,7 @@ public class UserReportNormalPO extends BaseEntity { /** * 类型0：方案审查 1：治理工程 */ - private Boolean type; + private Integer type; /** * 报告存放路径 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 5d9ffb26f..7737fe0c2 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 @@ -52,7 +52,7 @@ public class UserReportNormalController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @Operation(summary = "重新发起") @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true) - public HttpResult updateUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportParam) { + public HttpResult updateUserReport(@RequestBody @Validated UserReportNormalParam userReportParam) { String methodDescribe = getMethodDescribe("updateUserReport"); String userReportId = iUserReportNormalService.updateUserNormal(userReportParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe); 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 40286b365..0c0efb764 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 @@ -14,10 +14,10 @@ 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.device.biz.enums.RunFlagEnum; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.line.LineInfoVO; import com.njcn.device.pq.pojo.vo.DeviceVO; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; @@ -57,12 +57,8 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.QUIT_RUNNING_DEVICE.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(quitRunningDevice.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(quitRunningDeviceParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -112,7 +108,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.QUIT_RUNNING_DEVICE.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(quitRunningDevice.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(quitRunningDeviceUpdateParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 09e3eb094..e44702174 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 @@ -16,10 +16,10 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.supervision.enums.FlowStatusEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper; import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam; import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam; -import com.njcn.supervision.pojo.po.device.QuitRunningDevice; import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO; @@ -52,11 +52,6 @@ import java.util.stream.Collectors; public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl implements SupervisionDevMainReportPOService { - /** - * 用户信息建档对应的流程定义 KEY - */ - //todo 修改成建设阶段流程图key - public static final String PROCESS_KEY = "device_info_add"; private final BpmProcessFeignClient bpmProcessFeignClient; private final SupervisionTempDeviceReportService supervisionTempDeviceReportService; @@ -91,7 +86,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(id); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -118,7 +113,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.DEVICE_INFO_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionDevMainReportPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 611b00859..dc7b4ff98 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 @@ -19,6 +19,7 @@ import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.api.TerminalBaseClient; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Line; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper; import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport; @@ -60,7 +61,7 @@ import java.util.stream.Stream; @Service @RequiredArgsConstructor public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl implements SupervisionTempLineDebugPOService{ - public static final String PROCESS_KEY = "temp_line_debug"; + private final BpmProcessFeignClient bpmProcessFeignClient; private final DeptFeignClient deptFeignClient; @@ -96,7 +97,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(id); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -124,7 +125,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.TEMP_LINE_DEBUG.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineDebugPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 8cb927997..a46ec71ad 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 @@ -15,10 +15,10 @@ 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.FlowStatusEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam; -import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO; import com.njcn.supervision.service.device.SupervisionTempLineReportService; @@ -54,11 +54,6 @@ import java.util.stream.Collectors; public class SupervisionTempLineReportServiceImpl extends ServiceImpl implements SupervisionTempLineReportService{ - /** - * 监测点建档对应的流程定义 KEY - */ - public static final String PROCESS_KEY = "line_info_add"; - private final BpmProcessFeignClient bpmProcessFeignClient; private final DeptFeignClient deptFeignClient; private final UserFeignClient userFeignClient; @@ -82,7 +77,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(id); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -109,7 +104,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_INFO_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineReport.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 b6fcbdb58..2a5b52e13 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 @@ -19,11 +19,11 @@ import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.pq.api.LineIntegrityClient; import com.njcn.device.pq.pojo.dto.LineDataQualityDTO; import com.njcn.device.pq.pojo.param.LineDataQualityParam; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper; import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam; -import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO; @@ -56,7 +56,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl implements ISupervisionTempLineRunTestService { - public static final String PROCESS_KEY = "line_run_test"; private final CommLineClient commLineClient; private final SupervisionTempLineReportMapper supervisionTempLineReportMapper; @@ -128,7 +127,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -175,7 +174,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.LINE_RUN_TEST.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index 4fa0acd40..cb003129b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.LeafletTypeEnum; import com.njcn.supervision.enums.ProblemTypeEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.leaflet.WarningLeafletMapper; import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; @@ -78,7 +79,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(warningLeafletUpdateParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -152,7 +153,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.WARN_LEAFLET.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(warningLeafletUpdateParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 5362c684c..47bdde5a2 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 @@ -21,6 +21,7 @@ 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; import com.njcn.supervision.pojo.po.plan.SupervisionPlanPO; @@ -64,7 +65,6 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SUP_PLAN_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionPlanPO.getPlanId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -299,7 +299,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SUP_PLAN_ADD.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(id); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap> ()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 c17f4b6f4..d84a920ef 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 @@ -17,6 +17,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.supervision.enums.FlowStatusEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionResponseEnum; import com.njcn.supervision.mapper.survey.SurveyPlanMapper; import com.njcn.supervision.pojo.param.survey.SurveyPlanParam; @@ -65,10 +66,6 @@ public class SurveyPlanServiceImpl extends ServiceImpl surveyPlanPage(SurveyPlanParam.SurveyPlanQueryParam surveyPlanQueryParam) { @@ -136,7 +133,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -163,7 +160,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_PLAN.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyPlan.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java index bde218d3d..eda97b8de 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java @@ -22,6 +22,7 @@ import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.LeafletTypeEnum; import com.njcn.supervision.enums.ProblemTypeEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.survey.SurveyTestMapper; import com.njcn.supervision.pojo.param.survey.SurveyTestParam; import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanDetailPO; @@ -78,11 +79,6 @@ public class SurveyTestServiceImpl extends ServiceImpl surveyTestPage(SurveyTestParam.SurveyTestQueryParam surveyTestQueryParam) { @@ -202,7 +198,7 @@ public class SurveyTestServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_TEST.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyTest.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -229,7 +225,7 @@ public class SurveyTestServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.SURVEY_TEST.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(surveyTest.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java index 6d0125361..a586817f1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java @@ -21,7 +21,7 @@ public interface IUserReportNormalService extends IBpmService userReportGoNetPage(UserReportNormalParam userReportNormalParam); 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 e3a42e8f7..1314310ed 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.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.supervision.enums.FlowStatusEnum; +import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.user.UserReportNormalMapper; import com.njcn.supervision.pojo.param.user.UserReportNormalParam; import com.njcn.supervision.pojo.param.user.UserReportParam; @@ -50,13 +51,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class UserReportNormalServiceImpl extends ServiceImpl implements IUserReportNormalService { - /** - * 用户信息建档对应的流程定义 KEY - */ - public static final String PROCESS_KEY = "user_go_net"; - public static final String PROCESS_OTHER_KEY ="user_treat_check"; - - private final BpmProcessFeignClient bpmProcessFeignClient; @@ -79,9 +73,9 @@ public class UserReportNormalServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); if(userReportNormalParam.getType() == 0){ - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey()); }else { - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_OTHER_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_TREAT_CHECK.getKey()); } bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId()); @@ -95,20 +89,23 @@ public class UserReportNormalServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + if(userReportNormalPO.getType() == 0){ + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_GO_NET.getKey()); + }else { + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_TREAT_CHECK.getKey()); + } bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); 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 dadada012..cfcfa2c20 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 @@ -26,10 +26,7 @@ import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.poi.excel.ExcelUtil; import com.njcn.poi.excel.PullDown; import com.njcn.poi.util.PoiUtil; -import com.njcn.supervision.enums.FlowStatusEnum; -import com.njcn.supervision.enums.SupervisionResponseEnum; -import com.njcn.supervision.enums.SupervisionUserStatusEnum; -import com.njcn.supervision.enums.UserNatureEnum; +import com.njcn.supervision.enums.*; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.mapper.user.UserReportPOMapper; import com.njcn.supervision.pojo.dto.SensitiveUserExcel; @@ -80,11 +77,6 @@ import java.util.stream.Stream; @RequiredArgsConstructor public class UserReportPOServiceImpl extends ServiceImpl implements UserReportPOService { - /** - * 用户信息建档对应的流程定义 KEY - */ - public static final String PROCESS_KEY = "build_user_info"; - private final UserReportProjectPOService userReportProjectPOService; private final UserReportSubstationPOService userReportSubstationPOService; private final UserReportSensitivePOService userReportSensitivePOService; @@ -139,7 +131,7 @@ public class UserReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -200,7 +192,7 @@ public class UserReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey()); bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);