bpm代码调整

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/config/BpmProcessInstanceEventListener.java

@@ -1,6 +1,7 @@
 package com.njcn.bpm.config;
 
 import com.google.common.collect.ImmutableSet;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
 import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmActivityController.java

@@ -1,6 +1,7 @@
 package com.njcn.bpm.controller;
 
 import com.njcn.bpm.pojo.vo.task.BpmActivityVO;
+import com.njcn.bpm.service.task.IBpmActivityService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmCategoryController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.BpmCategoryParam;
 import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.vo.BpmCategoryVO;
+import com.njcn.bpm.service.IBpmCategoryService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmFormController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.BpmFormParam;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.vo.BpmFormVO;
+import com.njcn.bpm.service.IBpmFormService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java

@@ -7,6 +7,10 @@ import com.njcn.bpm.pojo.param.BpmModelParam;
 import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.vo.BpmModelRespVO;
+import com.njcn.bpm.service.IBpmCategoryService;
+import com.njcn.bpm.service.IBpmFormService;
+import com.njcn.bpm.service.IBpmModelService;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
 import com.njcn.bpm.utils.BpmModelConvert;
 import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.bpm.utils.JsonUtils;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessDefinitionController.java

@@ -7,6 +7,9 @@ import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.po.BpmProcessDefinitionInfo;
 import com.njcn.bpm.pojo.vo.BpmProcessDefinitionInfoVO;
+import com.njcn.bpm.service.IBpmCategoryService;
+import com.njcn.bpm.service.IBpmFormService;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
 import com.njcn.bpm.strategy.BpmTaskCandidateStartUserSelectStrategy;
 import com.njcn.bpm.utils.BpmProcessDefinitionConvert;
 import com.njcn.common.pojo.annotation.OperateInfo;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java

@@ -9,6 +9,10 @@ import com.njcn.bpm.pojo.param.instance.BpmProcessInstancePageParam;
 import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.po.BpmProcessDefinitionInfo;
 import com.njcn.bpm.pojo.vo.instance.BpmProcessInstanceVO;
+import com.njcn.bpm.service.IBpmCategoryService;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
+import com.njcn.bpm.service.task.IBpmTaskService;
 import com.njcn.bpm.utils.BpmProcessInstanceConvert;
 import com.njcn.bpm.utils.BpmnModelUtils;
 import com.njcn.bpm.utils.CollectionUtils;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmSignController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.BpmSignParam;
 import com.njcn.bpm.pojo.po.BpmSign;
 import com.njcn.bpm.pojo.vo.BpmSignVO;
+import com.njcn.bpm.service.IBpmSignService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java

@@ -6,6 +6,9 @@ import com.njcn.bpm.pojo.dto.PageResult;
 import com.njcn.bpm.pojo.param.task.*;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.vo.task.BpmTaskVO;
+import com.njcn.bpm.service.IBpmFormService;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
+import com.njcn.bpm.service.task.IBpmTaskService;
 import com.njcn.bpm.utils.BpmTaskConvert;
 import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.common.pojo.annotation.OperateInfo;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmCategoryServiceImpl.java

@@ -11,6 +11,7 @@ import com.njcn.bpm.mapper.BpmCategoryMapper;
 import com.njcn.bpm.pojo.param.BpmCategoryParam;
 import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.vo.BpmCategoryVO;
+import com.njcn.bpm.service.IBpmCategoryService;
 import com.njcn.bpm.utils.BeanUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmFormServiceImpl.java

@@ -11,6 +11,7 @@ import com.njcn.bpm.mapper.BpmFormMapper;
 import com.njcn.bpm.pojo.param.BpmFormParam;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.vo.BpmFormVO;
+import com.njcn.bpm.service.IBpmFormService;
 import com.njcn.bpm.utils.BeanUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmModelServiceImpl.java

@@ -7,6 +7,9 @@ import com.njcn.bpm.enums.BpmResponseEnum;
 import com.njcn.bpm.pojo.dto.BpmModelMetaInfoRespDTO;
 import com.njcn.bpm.pojo.param.BpmModelParam;
 import com.njcn.bpm.pojo.po.BpmForm;
+import com.njcn.bpm.service.IBpmFormService;
+import com.njcn.bpm.service.IBpmModelService;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
 import com.njcn.bpm.strategy.BpmTaskCandidateInvoker;
 import com.njcn.bpm.utils.*;
 import com.njcn.common.pojo.exception.BusinessException;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmProcessDefinitionServiceImpl.java

@@ -11,6 +11,7 @@ import com.njcn.bpm.pojo.dto.BpmModelMetaInfoRespDTO;
 import com.njcn.bpm.pojo.param.BpmProcessDefinitionInfoParam;
 import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.bpm.pojo.po.BpmProcessDefinitionInfo;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
 import com.njcn.bpm.utils.BeanUtils;
 import com.njcn.bpm.utils.FlowableUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java

@@ -10,6 +10,7 @@ import com.njcn.bpm.pojo.param.BpmSignParam;
 import com.njcn.bpm.pojo.po.BpmSign;
 import com.njcn.bpm.pojo.vo.BpmSignVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.bpm.service.IBpmSignService;
 import com.njcn.bpm.utils.BeanUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmActivityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.bpm.service.task.impl;
 
 import com.njcn.bpm.pojo.vo.task.BpmActivityVO;
+import com.njcn.bpm.service.task.IBpmActivityService;
 import com.njcn.bpm.utils.BpmActivityConvert;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.HistoryService;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java

@@ -13,6 +13,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.service.IBpmProcessDefinitionService;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
 import com.njcn.bpm.strategy.BpmTaskCandidateStartUserSelectStrategy;
 import com.njcn.bpm.utils.BpmProcessInstanceConvert;
 import com.njcn.bpm.utils.CollectionUtils;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java

@@ -12,6 +12,10 @@ import com.njcn.bpm.constant.BpmConstants;
 import com.njcn.bpm.enums.*;
 import com.njcn.bpm.pojo.dto.PageResult;
 import com.njcn.bpm.pojo.param.task.*;
+import com.njcn.bpm.service.IBpmModelService;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
+import com.njcn.bpm.service.task.IBpmTaskService;
+import com.njcn.bpm.service.task.IProcessInstanceCopyService;
 import com.njcn.bpm.utils.BpmTaskConvert;
 import com.njcn.bpm.utils.BpmnModelUtils;
 import com.njcn.bpm.utils.DateUtils;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/ProcessInstanceCopyServiceImpl.java

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.enums.BpmResponseEnum;
 import com.njcn.bpm.mapper.task.ProcessInstanceCopyMapper;
 import com.njcn.bpm.pojo.po.task.ProcessInstanceCopy;
+import com.njcn.bpm.service.IBpmProcessDefinitionService;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
+import com.njcn.bpm.service.task.IBpmTaskService;
+import com.njcn.bpm.service.task.IProcessInstanceCopyService;
 import com.njcn.common.pojo.exception.BusinessException;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/strategy/BpmTaskCandidateStartUserSelectStrategy.java

@@ -3,6 +3,7 @@ package com.njcn.bpm.strategy;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import com.njcn.bpm.enums.BpmTaskCandidateStrategyEnum;
+import com.njcn.bpm.service.task.IBpmProcessInstanceService;
 import com.njcn.bpm.utils.BpmnModelUtils;
 import com.njcn.bpm.utils.FlowableUtils;
 import org.flowable.bpmn.model.BpmnModel;

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SuperviceKeyEnum.java

@@ -0,0 +1,57 @@
+package com.njcn.supervision.enums;
+
+import cn.hutool.core.text.StrPool;
+import lombok.Getter;
+
+@Getter
+public enum SuperviceKeyEnum {
+
+    QUIT_RUNNING_DEVICE("quit_running_device","device","终端状态变更流程","QuitRunningDeviceServiceImpl"),
+    DEVICE_INFO_ADD("device_info_add","device","电能质量监测装置设备管理流程","SupervisionDevMainReportPOServiceImpl"),
+    LINE_INFO_ADD("line_info_add","device","电能质量监测点管理流程","SupervisionTempLineReportServiceImpl"),
+    TEMP_LINE_DEBUG("temp_line_debug","device","监测点联调流程","SupervisionTempLineDebugPOServiceImpl"),
+    LINE_RUN_TEST("line_run_test","device","监测点试运行评估流程","SupervisionTempLineRunTestServiceImpl"),
+    WARN_LEAFLET("warn_leaflet","leaflet","预告警单流程","WarningLeafletServiceImpl"),
+    SUP_PLAN_ADD("sup_plan_add","plan","技术监督计划流程（计划和测试）","SupervisionPlanPOServiceImpl"),
+    SURVEY_PLAN("survey_plan","survey","监督计划流程","SurveyPlanServiceImpl"),
+    SURVEY_TEST("survey_test","survey","监督测试流程","SurveyTestServiceImpl"),
+    USER_GO_NET("user_go_net","user","入网设计方案流程","UserReportNormalServiceImpl"),
+    USER_TREAT_CHECK("user_treat_check","user","治理工程流程","UserReportNormalServiceImpl"),
+    BUILD_USER_INFO("build_user_info","user","干扰源建档流程","UserReportPOServiceImpl");
+
+
+    private final String key;
+
+    private final String servicePrefix;
+
+    private final String describe;
+
+    private final String clazzName;
+
+    /**
+     * @param key 流程标识key
+     * @param servicePrefix 服务类前缀
+     * @param describe 描述
+     * @param clazzName 类名，方便获取spring中对应的对象
+     */
+    SuperviceKeyEnum(String key, String servicePrefix, String describe,String clazzName) {
+        this.key = key;
+        this.servicePrefix = servicePrefix;
+        this.describe = describe;
+        this.clazzName = clazzName;
+    }
+
+    private static final String packagePrefix = "com.njcn.supervision.service.";
+
+    /**
+     * 根据流程key获取类的全路径，用于获取spring中的对象
+     */
+    public static String getFullServicePathByKey(String key){
+        for (SuperviceKeyEnum superviceKeyEnum : SuperviceKeyEnum.values()) {
+            if (superviceKeyEnum.key.equalsIgnoreCase(key)) {
+                return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(StrPool.DOT).concat(superviceKeyEnum.clazzName);
+            }
+        }
+        return null;
+    }
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -21,7 +21,6 @@ import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
-import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;