抽取流程实例状态变更，更换接口继承

pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/service/IBpmService.java

@@ -0,0 +1,21 @@
+package com.njcn.bpm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * 统筹流程实例的公共方案
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2024年06月12日 18:14
+ */
+public interface IBpmService<T> extends IService<T> {
+
+    /**
+     * 根据业务id实时更新当前业务流程状态
+     * @param businessId 实际业务id
+     * @param status 流程实例当前状态，具体参考BpmTaskStatusEnum枚举
+     */
+    void updateProcessStatus(String businessId, Integer status);
+
+}

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

@@ -1,7 +1,6 @@
 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/config/BpmTaskEventListener.java

@@ -3,8 +3,6 @@ package com.njcn.bpm.config;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.ImmutableSet;
-import com.njcn.bpm.service.task.IBpmActivityService;
-import com.njcn.bpm.service.task.IBpmTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;

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

@@ -1,7 +1,6 @@
 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,7 +5,6 @@ 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;
@@ -17,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 io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -5,7 +5,6 @@ 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;
@@ -17,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 io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -3,15 +3,10 @@ package com.njcn.bpm.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.dto.BpmModelMetaInfoRespDTO;
-import com.njcn.bpm.pojo.param.BpmCategoryParam;
 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.IBpmModelService;
-import com.njcn.bpm.service.IBpmFormService;
-import com.njcn.bpm.service.IBpmProcessDefinitionService;
 import com.njcn.bpm.utils.BpmModelConvert;
 import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.bpm.utils.JsonUtils;
@@ -26,7 +21,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 io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,14 +30,11 @@ import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static com.njcn.bpm.pojo.dto.CommonResult.success;
 import static com.njcn.bpm.utils.CollectionUtils.convertMap;
 import static com.njcn.bpm.utils.CollectionUtils.convertSet;
 

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

@@ -2,20 +2,14 @@ package com.njcn.bpm.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.bpm.pojo.param.BpmProcessDefinitionInfoParam;
 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.service.task.IBpmProcessInstanceService;
 import com.njcn.bpm.strategy.BpmTaskCandidateStartUserSelectStrategy;
 import com.njcn.bpm.utils.BpmProcessDefinitionConvert;
 import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
@@ -24,7 +18,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 io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +29,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 

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

@@ -5,16 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.BpmProcessInstanceCreateParam;
 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.pojo.vo.task.BpmTaskVO;
-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;
@@ -34,13 +28,10 @@ import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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

@@ -4,12 +4,8 @@ package com.njcn.bpm.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.BpmSignParam;
-import com.njcn.bpm.pojo.param.BpmSignParam;
-import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.po.BpmSign;
 import com.njcn.bpm.pojo.vo.BpmSignVO;
-import com.njcn.bpm.service.IBpmSignService;
-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;
@@ -20,8 +16,6 @@ import com.njcn.common.utils.LogUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

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

@@ -6,8 +6,6 @@ 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.IBpmTaskService;
 import com.njcn.bpm.utils.BpmTaskConvert;
 import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -18,7 +16,6 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.Dept;
-import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.factory.PageFactory;
@@ -35,15 +32,12 @@ import org.flowable.task.api.TaskInfo;
 import org.flowable.bpmn.model.UserTask;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.njcn.bpm.service.task.IBpmProcessInstanceService;
 import org.flowable.task.api.history.HistoricTaskInstance;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

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

@@ -1,7 +1,6 @@
 package com.njcn.bpm.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,10 +10,7 @@ import com.njcn.bpm.enums.BpmResponseEnum;
 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.po.BpmForm;
 import com.njcn.bpm.pojo.vo.BpmCategoryVO;
-import com.njcn.bpm.pojo.vo.BpmFormVO;
-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,7 +11,6 @@ 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,9 +7,6 @@ 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;
@@ -30,7 +27,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
 

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

@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.enums.BpmnModelConstants;
-import com.njcn.bpm.mapper.BpmCategoryMapper;
 import com.njcn.bpm.mapper.BpmProcessDefinitionInfoMapper;
 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

@@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.enums.BpmResponseEnum;
 import com.njcn.bpm.mapper.BpmSignMapper;
-import com.njcn.bpm.pojo.param.BpmCategoryParam;
 import com.njcn.bpm.pojo.param.BpmSignParam;
-import com.njcn.bpm.pojo.po.BpmCategory;
 import com.njcn.bpm.pojo.po.BpmSign;
-import com.njcn.bpm.pojo.vo.BpmCategoryVO;
 import com.njcn.bpm.pojo.vo.BpmSignVO;
-import com.njcn.bpm.service.IBpmSignService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.utils.BeanUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;

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

@@ -1,7 +1,6 @@
 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,8 +13,6 @@ 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;
@@ -22,7 +20,6 @@ import com.njcn.bpm.utils.DateUtils;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.user.api.UserFeignClient;
-import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.factory.PageFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +32,6 @@ import org.flowable.engine.delegate.event.FlowableCancelledEvent;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.engine.runtime.ProcessInstanceBuilder;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -12,10 +12,6 @@ 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;
@@ -23,7 +19,6 @@ import com.njcn.bpm.utils.FlowableUtils;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.user.api.UserFeignClient;
-import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;

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

@@ -5,10 +5,6 @@ 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,7 +3,6 @@ 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-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java

@@ -105,7 +105,7 @@ public class DeVReportManageController extends BaseController {
     @ApiOperation("更改表单状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        supervisionDevMainReportPOService.updateStatus(businessKey,status);
+        supervisionDevMainReportPOService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java

@@ -84,7 +84,7 @@ public class QuitRunningDeviceController extends BaseController {
     @ApiOperation("更新退运装置流程状态")
     public HttpResult<Object> updateDeviceStatus(String businessKey, Integer status) {
         String methodDescribe = getMethodDescribe("updateDeviceStatus");
-        quitRunningDeviceService.updateDeviceStatus(businessKey, status);
+        quitRunningDeviceService.updateProcessStatus(businessKey, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java

@@ -77,7 +77,7 @@ public class SupervisionTempLineRunTestController extends BaseController {
     @ApiOperation("修改业务审核状态")
     public HttpResult<Object> updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status){
         String methodDescribe = getMethodDescribe("updateLineRunTestStatus");
-        iSupervisionTempLineRunTestService.updateStatus(businessKey,status);
+        iSupervisionTempLineRunTestService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java

@@ -86,7 +86,7 @@ public class TempLineController extends BaseController {
     @ApiOperation("更改表单状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        supervisionTempLineReportService.updateStatus(businessKey,status);
+        supervisionTempLineReportService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java

@@ -94,7 +94,7 @@ public class TempLineDebugController extends BaseController {
     @ApiOperation("更改表单状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        supervisionTempLineDebugPOService.updateStatus(businessKey,status);
+        supervisionTempLineDebugPOService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java

@@ -119,7 +119,7 @@ public class WarningLeafletController extends BaseController {
     @ApiOperation("更改表单状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        warningLeafletService.updateStatus(businessKey,status);
+        warningLeafletService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java

@@ -92,7 +92,7 @@ public class SupervisionPlanController extends BaseController {
     @ApiOperation("更改表单状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        supervisionPlanPOService.updateStatus(businessKey,status);
+        supervisionPlanPOService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java

@@ -109,7 +109,7 @@ public class GeneralSurveyController extends BaseController {
     @ApiOperation("更改普测计划状态")
     public HttpResult<Object> updateStatus(String businessKey,Integer status) {
         String methodDescribe = getMethodDescribe("updateStatus");
-        supervisionGeneralSurveyPlanPOService.updateStatus(businessKey,status);
+        supervisionGeneralSurveyPlanPOService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java

@@ -86,7 +86,7 @@ public class SurveyPlanController extends BaseController {
     @ApiOperation("更新普测计划流程状态")
     public HttpResult<Object> updateSurveyPlanStatus(String businessKey, Integer status) {
         String methodDescribe = getMethodDescribe("updateSurveyPlanStatus");
-        surveyPlanService.updateSurveyPlanStatus(businessKey, status);
+        surveyPlanService.updateProcessStatus(businessKey, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java

@@ -98,7 +98,7 @@ public class SurveyTestController extends BaseController {
     @ApiOperation("更新普测测试流程状态")
     public HttpResult<Object> updateSurveyTestStatus(String businessKey, Integer status) {
         String methodDescribe = getMethodDescribe("updateSurveyTestStatus");
-        surveyTestService.updateSurveyTestStatus(businessKey, status);
+        surveyTestService.updateProcessStatus(businessKey, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -113,7 +113,7 @@ public class UserReportManageController extends BaseController {
     @ApiOperation("更新用户数据流程状态")
     public HttpResult<Object> updateUserReportStatus(String businessKey, Integer status) {
         String methodDescribe = getMethodDescribe("updateUserReportStatus");
-        userReportPOService.updateUserReportStatus(businessKey, status);
+        userReportPOService.updateProcessStatus(businessKey, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java

@@ -83,7 +83,7 @@ public class UserReportNormalController extends BaseController {
     @ApiOperation("修改业务审核状态")
     public HttpResult<Object> updateUserReportNormalStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status){
         String methodDescribe = getMethodDescribe("updateUserReportNormalStatus");
-        iUserReportNormalService.updateUserReportNormalStatus(businessKey,status);
+        iUserReportNormalService.updateProcessStatus(businessKey,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
     }
 

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

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.device;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
 import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
@@ -15,15 +15,13 @@ import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
  * @author hongawen
  * @since 2024-05-13
  */
-public interface IQuitRunningDeviceService extends IService<QuitRunningDevice> {
+public interface IQuitRunningDeviceService extends IBpmService<QuitRunningDevice> {
 
     String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam);
     String updateQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam);
 
     Page<QuitRunningDeviceVO> getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam);
 
-    void updateDeviceStatus(String businessKey, Integer status);
-
     QuitRunningDeviceVO getVOById(String id);
 
     String cancelQuitRunningDevice(BpmProcessInstanceCancelParam cancelReqVO);

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

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.device;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO;
@@ -15,7 +15,7 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO;
  * @author hongawen
  * @since 2024-05-21
  */
-public interface ISupervisionTempLineRunTestService extends IService<SupervisionTempLineRunTestPO> {
+public interface ISupervisionTempLineRunTestService extends IBpmService<SupervisionTempLineRunTestPO> {
 
     Boolean addRunTest(SupervisionTempLineRunTestParam supervisionTempLineRunTestParam);
 
@@ -23,13 +23,8 @@ public interface ISupervisionTempLineRunTestService extends IService<Supervision
 
     void isTestRunStartOrEnd();
 
-
-    void updateStatus(String businessKey,Integer status);
-
-
     SupervisionTempLineRunTestVO getRunTestById(String id);
 
-
     String cancel(BpmProcessInstanceCancelParam cancelReqVO);
 
 

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

@@ -3,6 +3,7 @@ package com.njcn.supervision.service.device;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
@@ -18,7 +19,7 @@ import java.util.List;
 * @author clam
 * @version V1.0.0
 */
-public interface SupervisionDevMainReportPOService extends IService<SupervisionDevMainReportPO>{
+public interface SupervisionDevMainReportPOService extends IBpmService<SupervisionDevMainReportPO> {
 
 
     String addDevReport(SupervisionDevMainReportParam supervisionDevMainReportParam);
@@ -31,7 +32,6 @@ public interface SupervisionDevMainReportPOService extends IService<SupervisionD
 
     Page<SupervisionDevMainReportVO> getDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportQuery supervisionDevMainReportQuery);
 
-    void updateStatus(String businessKey, Integer status);
 
     String cancelDevMainReport(BpmProcessInstanceCancelParam cancelReqVO);
 

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

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.device;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO;
@@ -14,7 +14,7 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO;
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionTempLineDebugPOService extends IService<SupervisionTempLineDebugPO> {
+public interface SupervisionTempLineDebugPOService extends IBpmService<SupervisionTempLineDebugPO> {
 
 
     String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam);
@@ -27,8 +27,6 @@ public interface SupervisionTempLineDebugPOService extends IService<SupervisionT
 
     SupervisionTempLineDebugVO getDetailTempLineDebug(String id);
 
-    void updateStatus(String businessKey, Integer status);
-
     String ledgerSync(String id);
 
     String cancel(BpmProcessInstanceCancelParam cancelReqVO);

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

@@ -2,9 +2,9 @@ package com.njcn.supervision.service.device;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 
 /**
@@ -14,7 +14,7 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionTempLineReportService extends IService<SupervisionTempLineReport> {
+public interface SupervisionTempLineReportService extends IBpmService<SupervisionTempLineReport> {
 
 
     String addTempLineReport(SupervisionTempLineReportParam supervisionTempLineReportParam);
@@ -23,8 +23,6 @@ public interface SupervisionTempLineReportService extends IService<SupervisionTe
 
     Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery);
 
-    void updateStatus(String businessKey, Integer status);
-
     String cancelTempLineReport(BpmProcessInstanceCancelParam cancelReqVO);
 
     SupervisionTempLineReportVO getDetailTempLine(String id);

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

@@ -184,7 +184,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateDeviceStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         QuitRunningDevice quitRunningDevice = this.baseMapper.selectById(businessKey);
         //如果状态为审批通过
         if (status.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {

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

@@ -179,7 +179,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
     }
 
     @Override
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(SupervisionDevMainReportPO::getStatus,status).eq(SupervisionDevMainReportPO::getId,businessKey).update();
     }
 

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

@@ -220,7 +220,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     }
 
     @Override
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(SupervisionTempLineDebugPO::getStatus,status).eq(SupervisionTempLineDebugPO::getId,businessKey).update();
 
     }
@@ -276,8 +276,6 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
         }
 
-
-
         //syncTerminalParam.setSubStationParam();
         DeviceParam deviceParam = new DeviceParam();
         SubVoltageParam subVoltageParam = new SubVoltageParam();
@@ -290,7 +288,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         syncTerminalParam.setLineParam(lineParam);
 
         String substation = terminalBaseClient.terminalSync(syncTerminalParam).getData();
-        this.updateStatus(id,5);
+        this.updateProcessStatus(id,5);
         tempDevice.setSubstation(substation);
         supervisionTempDeviceReportService.updateById(tempDevice);
         return null;

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

@@ -153,7 +153,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(SupervisionTempLineReport::getStatus,status).eq(SupervisionTempLineReport::getId,businessKey).update();
         if(status.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus())){
             userReportPOService.updateUserStatus(businessKey, SupervisionUserStatusEnum.BUILD.getCode());

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

@@ -208,7 +208,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         SupervisionTempLineRunTestPO supervisionTempLineRunTestPO = this.baseMapper.selectById(businessKey);
         //如果状态为审批通过
         if (status.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.leaflet;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO;
 import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam;
 import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
@@ -16,7 +16,7 @@ import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
  * @author hongawen
  * @since 2024-05-21
  */
-public interface IWarningLeafletService extends IService<WarningLeaflet> {
+public interface IWarningLeafletService extends IBpmService<WarningLeaflet> {
 
     /**
      * 创建预告警单，此时还没有走流程，等待用户上传反馈单后，才正式进入工作流阶段
@@ -40,8 +40,6 @@ public interface IWarningLeafletService extends IService<WarningLeaflet> {
 
     WarningLeafletVO getVOById(String id);
 
-    void updateStatus(String businessKey, Integer status);
-
     String addLineOverLimitData(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO);
 
     String cancelWarningLeaflet(BpmProcessInstanceCancelParam cancelReqVO);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java

@@ -181,7 +181,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     }
 
     @Override
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(WarningLeaflet::getStatus, status).eq(WarningLeaflet::getId, businessKey).update();
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/SupervisionPlanPOService.java

@@ -2,9 +2,9 @@ package com.njcn.supervision.service.plan;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.plan.SupervisionPlanParam;
 import com.njcn.supervision.pojo.po.plan.SupervisionPlanPO;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.supervision.pojo.vo.plan.SupervisionPlanVO;
 
 /**
@@ -14,7 +14,7 @@ import com.njcn.supervision.pojo.vo.plan.SupervisionPlanVO;
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionPlanPOService extends IService<SupervisionPlanPO> {
+public interface SupervisionPlanPOService extends IBpmService<SupervisionPlanPO> {
 
 
     String addPlan(SupervisionPlanParam supvPlanParam);
@@ -27,8 +27,6 @@ public interface SupervisionPlanPOService extends IService<SupervisionPlanPO> {
 
     SupervisionPlanVO getDetailPlan(String id);
 
-    void updateStatus(String businessKey, Integer status);
-
     void initiateWarningLeaflet(String id);
 
     String cancelSuperPlan(BpmProcessInstanceCancelParam cancelReqVO);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java

@@ -372,7 +372,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
     }
 
     @Override
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(SupervisionPlanPO::getStatus,status).eq(SupervisionPlanPO::getPlanId,businessKey).update();
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.survey;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.survey.SurveyPlanParam;
 import com.njcn.supervision.pojo.po.survey.SurveyPlan;
 import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
@@ -15,7 +15,7 @@ import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
  * @author hongawen
  * @since 2024-05-30
  */
-public interface ISurveyPlanService extends IService<SurveyPlan> {
+public interface ISurveyPlanService extends IBpmService<SurveyPlan> {
 
     Page<SurveyPlanVO> surveyPlanPage(SurveyPlanParam.SurveyPlanQueryParam surveyPlanQueryParam);
 
@@ -25,7 +25,5 @@ public interface ISurveyPlanService extends IService<SurveyPlan> {
 
     String cancelSurveyPlan(BpmProcessInstanceCancelParam cancelReqVO);
 
-    void updateSurveyPlanStatus(String businessKey, Integer status);
-
     SurveyPlanVO getVOById(String id);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.survey;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.survey.SurveyTestParam;
 import com.njcn.supervision.pojo.po.survey.SurveyTest;
 import com.njcn.supervision.pojo.vo.survey.SurveyTestVO;
@@ -15,7 +15,7 @@ import com.njcn.supervision.pojo.vo.survey.SurveyTestVO;
  * @author hongawen
  * @since 2024-05-30
  */
-public interface ISurveyTestService extends IService<SurveyTest> {
+public interface ISurveyTestService extends IBpmService<SurveyTest> {
 
     Page<SurveyTestVO> surveyTestPage(SurveyTestParam.SurveyTestQueryParam surveyTestQueryParam);
     Page<SurveyTestVO> pageProblemSurvey(SurveyTestParam.SurveyTestQueryParam surveyTestQueryParam);
@@ -26,8 +26,6 @@ public interface ISurveyTestService extends IService<SurveyTest> {
 
     String cancelSurveyTest(BpmProcessInstanceCancelParam cancelReqVO);
 
-    void updateSurveyTestStatus(String businessKey, Integer status);
-
     SurveyTestVO getVOById(String id);
 
     void initiateWarningLeaflet(String id);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanPOService.java

@@ -1,8 +1,8 @@
 package com.njcn.supervision.service.survey;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.survey.SupervisionGeneralSurveyPlanParm;
 import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanPO;
 import com.njcn.supervision.pojo.vo.survey.DeptSubstationVO;
@@ -18,7 +18,7 @@ import java.util.List;
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionGeneralSurveyPlanPOService extends IService<SupervisionGeneralSurveyPlanPO> {
+public interface SupervisionGeneralSurveyPlanPOService extends IBpmService<SupervisionGeneralSurveyPlanPO> {
 
 
     String addDevReport(SupervisionGeneralSurveyPlanParm supervisionGeneralSurveyPlanParm);
@@ -38,11 +38,8 @@ public interface SupervisionGeneralSurveyPlanPOService extends IService<Supervis
 
     List<DeptSubstationVO> initDetpStataionTree(String orgId);
 
-    void updateStatus(String businessKey, Integer status);
-
     String cancelGeneralSurvey(BpmProcessInstanceCancelParam cancelReqVO);
 
-
     /**
      * 针对有问题的现场测试发起告警单
      * @param id 有问题的测试记录id

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java

@@ -316,7 +316,7 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl<Super
     }
 
     @Override
-    public void updateStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.lambdaUpdate().set(SupervisionGeneralSurveyPlanPO::getStatus, status).eq(SupervisionGeneralSurveyPlanPO::getPlanNo, businessKey).update();
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java

@@ -193,7 +193,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateSurveyPlanStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         SurveyPlan surveyPlan = this.baseMapper.selectById(businessKey);
         surveyPlan.setStatus(status);
         this.updateById(surveyPlan);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java

@@ -257,11 +257,10 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
     }
 
     @Override
-    public void updateSurveyTestStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         SurveyTest surveyTest = this.baseMapper.selectById(businessKey);
         surveyTest.setStatus(status);
         this.updateById(surveyTest);
-
     }
 
     @Override

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java

@@ -2,13 +2,12 @@ package com.njcn.supervision.service.user;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author hongawen
  * @since 2024-05-17
  */
-public interface IUserReportNormalService extends IService<UserReportNormalPO> {
+public interface IUserReportNormalService extends IBpmService<UserReportNormalPO> {
 
     String addUserNormal(UserReportNormalParam userReportNormalParam);
 
@@ -31,9 +30,6 @@ public interface IUserReportNormalService extends IService<UserReportNormalPO> {
     UserReportVO.UserReportGoNetVO userReportGoNetById(String id);
 
 
-    void updateUserReportNormalStatus(String businessKey,Integer status);
-
-
     String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO);
 
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java

@@ -1,9 +1,8 @@
 package com.njcn.supervision.service.user;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
-import com.njcn.supervision.pojo.dto.SensitiveUserExcel;
+import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
@@ -19,7 +18,7 @@ import java.util.List;
  * @author clam
  * @version V1.0.0
  */
-public interface UserReportPOService extends IService<UserReportPO> {
+public interface UserReportPOService extends IBpmService<UserReportPO> {
 
 
     String addUserReport(UserReportParam userReportParam);
@@ -34,8 +33,6 @@ public interface UserReportPOService extends IService<UserReportPO> {
 
     UserReportVO getVOById(String id);
 
-    void updateUserReportStatus(String businessKey, Integer status);
-
     List<UserReportVO> getUserReportList();
 
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java

@@ -175,7 +175,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
     }
 
     @Override
-    public void updateUserReportNormalStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         this.update(new UpdateWrapper<UserReportNormalPO>().lambda().set(UserReportNormalPO::getStatus,status).eq(UserReportNormalPO::getId,businessKey));
     }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -336,7 +336,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     }
 
     @Override
-    public void updateUserReportStatus(String businessKey, Integer status) {
+    public void updateProcessStatus(String businessKey, Integer status) {
         UserReportPO userReportPO = this.baseMapper.selectById(businessKey);
         userReportPO.setStatus(status);
         this.updateById(userReportPO);