diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java index f6bd20372..7427eeaab 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java @@ -1,5 +1,6 @@ package com.njcn.prepare.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,6 +25,7 @@ public class ThsSupervise { * 技术监督Guid */ @ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true) + @TableId private String supIndex; /** * 部门id diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java index 57f6520d6..2ee381cf0 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java @@ -118,4 +118,9 @@ public class SuperviseVo { @ApiModelProperty(name = "progressTime", value = "进行时间（天）") private Integer progressTime; + + private String deploymentId; + + private String execId; + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml index 25e80bf01..162daf7dd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml @@ -32,7 +32,7 @@ and tda.type=#{param.type} - and tws.Big_Type=1 + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java index bac431b43..326b2dc9b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java @@ -25,6 +25,7 @@ import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService; import com.njcn.process.annotaion.HarCurrent; import com.njcn.process.annotaion.HarVoltage; import com.njcn.process.annotaion.InterharVoltage; +import com.njcn.process.api.FlowableDefineFeignClient; import com.njcn.process.pojo.po.LimitRate; import com.njcn.process.pojo.po.ThsWarnStrategyAss; import com.njcn.system.api.DicDataFeignClient; @@ -32,6 +33,7 @@ import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; @@ -54,31 +56,33 @@ import java.util.stream.Collectors; */ @Service @Slf4j +@RequiredArgsConstructor public class ThsSuperviseServiceImpl extends ServiceImpl implements ThsSuperviseService { - @Autowired - private PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; - @Autowired - private ThsWarnStrategyMapper thsWarnStrategyMapper; - @Autowired - private ThsWarnStrategyAssMapper thsWarnStrategyAssMapper; - @Autowired - private PmsMonitorMapper pmsMonitorMapper; - @Autowired - private LimitRateMapper limitRateMapper; - @Autowired - private DicDataFeignClient dicDataFeignClient; - @Autowired - private ThsSuperviseMapper thsSuperviseMapper; - @Autowired - private ThsOverRunLogMapper thsOverRunLogMapper; - @Autowired - private DeptFeignClient deptFeignClient; - @Autowired - private FileStorageUtil fileStorageUtil; + + + private final ThsWarnStrategyMapper thsWarnStrategyMapper; + + private final ThsWarnStrategyAssMapper thsWarnStrategyAssMapper; + + private final PmsMonitorMapper pmsMonitorMapper; + + private final LimitRateMapper limitRateMapper; + + private final DicDataFeignClient dicDataFeignClient; + + private final ThsSuperviseMapper thsSuperviseMapper; + + private final ThsOverRunLogMapper thsOverRunLogMapper; + + private final DeptFeignClient deptFeignClient; + + private final FileStorageUtil fileStorageUtil; private static final String DESCRIPTION = "description"; + private final FlowableDefineFeignClient flowableDefineFeignClient; + @Override @Async("asyncExecutor") @@ -217,6 +221,10 @@ public class ThsSuperviseServiceImpl extends ServiceImpl mapParam = new HashMap<>(); + flowableDefineFeignClient.start("flow_yzep99kb:1:c0ff8a75-da73-11ed-829f-b07b253cdad9",thsSupervise.getSupIndex(),mapParam).getData(); + for (ThsOverRunLog thsOverRunLog : overRunLogList) { thsOverRunLogMapper.insert(thsOverRunLog); } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableDefineFeignClient.java b/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableDefineFeignClient.java new file mode 100644 index 000000000..2846a7c89 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableDefineFeignClient.java @@ -0,0 +1,32 @@ +package com.njcn.process.api; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO; +import com.njcn.process.api.fallback.FlowableDefineFallbackFactory; +import com.njcn.process.api.fallback.RStatWorkOrderFallbackFactory; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.Map; + +/** + * 工作流 + * @author cdf + * @date 2023/4/13 + */ +@FeignClient(value = ServerInfo.PROCESS,path = "/flowable/definition",fallbackFactory = FlowableDefineFallbackFactory.class) +public interface FlowableDefineFeignClient { + + + + @PostMapping("/start") + HttpResult start(@RequestParam(value = "procDefId") String procDefId, + @RequestParam("thsIndex") String thsIndex, + @RequestBody Map variables); +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableTaskFeignClient.java b/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableTaskFeignClient.java new file mode 100644 index 000000000..47272aaa9 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/api/FlowableTaskFeignClient.java @@ -0,0 +1,22 @@ +package com.njcn.process.api; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO; +import com.njcn.process.api.fallback.FlowableTaskFallbackFactory; +import com.njcn.process.api.fallback.RStatWorkOrderFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 工作流 + * @author cdf + * @date 2023/4/13 + */ +@FeignClient(value = ServerInfo.PROCESS,path = "/flowable/task",fallbackFactory = FlowableTaskFallbackFactory.class) +public interface FlowableTaskFeignClient { + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableDefineFallbackFactory.java b/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableDefineFallbackFactory.java new file mode 100644 index 000000000..f34b30ec9 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableDefineFallbackFactory.java @@ -0,0 +1,48 @@ +package com.njcn.process.api.fallback; + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO; +import com.njcn.process.api.FlowableDefineFeignClient; +import com.njcn.process.api.RStatWorkOrderFeignClient; +import com.njcn.process.utils.ProcessEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +/** + * + * @author cdf + * @date 2023/4/13 + */ +@Slf4j +@Component +public class FlowableDefineFallbackFactory implements FallbackFactory { + + @Override + public FlowableDefineFeignClient create(Throwable throwable) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException) throwable.getCause(); + exceptionEnum = ProcessEnumUtil.getExceptionEnum(businessException.getResult()); + } + Enum finalExceptionEnum = exceptionEnum; + return new FlowableDefineFeignClient() { + + @Override + public HttpResult start(String procDefId, + String thsIndex, + Map variables) { + log.error("{}异常，降级处理，异常为：{}", "流程开始", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableTaskFallbackFactory.java b/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableTaskFallbackFactory.java new file mode 100644 index 000000000..c36d96913 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/FlowableTaskFallbackFactory.java @@ -0,0 +1,39 @@ +package com.njcn.process.api.fallback; + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO; +import com.njcn.process.api.FlowableTaskFeignClient; +import com.njcn.process.api.RStatWorkOrderFeignClient; +import com.njcn.process.utils.ProcessEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * + * @author cdf + * @date 2023/4/13 + */ +@Slf4j +@Component +public class FlowableTaskFallbackFactory implements FallbackFactory { + + @Override + public FlowableTaskFeignClient create(Throwable throwable) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException) throwable.getCause(); + exceptionEnum = ProcessEnumUtil.getExceptionEnum(businessException.getResult()); + } + Enum finalExceptionEnum = exceptionEnum; + return new FlowableTaskFeignClient() { + + + }; + } +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/FlowViewerDto.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/FlowViewerDto.java new file mode 100644 index 000000000..503c0a5f9 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/FlowViewerDto.java @@ -0,0 +1,23 @@ +package com.njcn.process.pojo.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Tony + * @date 2021/4/21 20:55 + */ +@Data +public class FlowViewerDto implements Serializable { + + /** + * 流程key + */ + private String key; + + /** + * 是否完成(已经审批) + */ + private boolean completed; +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java new file mode 100644 index 000000000..c55969e5f --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java @@ -0,0 +1,42 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2023-04-13 + */ +@Getter +@Setter +@TableName("ths_flowable_ass") +public class FlowableAss{ + + private static final long serialVersionUID = 1L; + + /** + * 技术监督主键 + */ + @TableId + private String thsIndex; + + /** + * 流程实例主键对应部署id deploymentId + */ + private String proIndex; + + /** + * 步骤主键 + */ + private String execIndex; + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowQueryVo.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowQueryVo.java new file mode 100644 index 000000000..c4d19a650 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowQueryVo.java @@ -0,0 +1,32 @@ +package com.njcn.process.pojo.vo.flowable; + + +import lombok.Data; + +/** + *

流程任务

+ * + * @author Tony + * @date 2021-04-03 + */ +@Data + +public class FlowQueryVo { + + + private String name; + + + private String startTime; + + + private String endTime; + + + private Integer pageNum; + + + private Integer pageSize; + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowTaskVo.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowTaskVo.java new file mode 100644 index 000000000..952ee6325 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/FlowTaskVo.java @@ -0,0 +1,55 @@ +package com.njcn.process.pojo.vo.flowable; + + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + *

流程任务

+ * + * @author Tony + * @date 2021-04-03 + */ +@Data + +public class FlowTaskVo { + + + private String taskId; + + + private String userId; + + + private String comment; + + + private String instanceId; + + + private String targetKey; + + private String deploymentId; + + private String defId; + + + private String currentChildExecutionId; + + + private Boolean flag; + + + private Map variables; + + + private String assignee; + + + private List candidateUsers; + + + private List candidateGroups; +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/ReturnTaskNodeVo.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/ReturnTaskNodeVo.java new file mode 100644 index 000000000..34b2f2bd8 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/flowable/ReturnTaskNodeVo.java @@ -0,0 +1,21 @@ +package com.njcn.process.pojo.vo.flowable; + + +import lombok.Data; + +/** + *

可退回节点

+ * + * @author tony + * @date 2022-04-23 11:01:52 + */ +@Data + +public class ReturnTaskNodeVo { + + private String id; + + + private String name; + +} diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index ffa315673..92a2fb884 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -90,6 +90,27 @@ common-oss ${project.version} + + + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.1 + + + + + org.flowable + flowable-spring-boot-starter + 6.7.2 + + + + org.flowable + flowable-spring-security + + + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java new file mode 100644 index 000000000..7443f4a19 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java @@ -0,0 +1,95 @@ +package com.njcn.process.controller.flowable; + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.process.service.flowable.IFlowDefinitionService; +import com.njcn.process.service.flowable.IFlowTaskService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.flowable.common.engine.api.FlowableObjectNotFoundException; +import org.flowable.engine.HistoryService; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; +import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.repository.Deployment; +import org.flowable.engine.repository.ProcessDefinition; +import org.flowable.engine.runtime.ProcessInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Objects; + +/** + * pqs + * 工作流 + * @author cdf + * @date 2023/4/10 + */ +@Slf4j +@Api(tags = "工作流") +@RestController +@RequestMapping("/flowable/definition") +@RequiredArgsConstructor +public class FlowDefinitionController extends BaseController { + + + private final IFlowDefinitionService flowDefinitionService; + + private final RepositoryService repositoryService; + + private final RuntimeService runtimeService; + + private final TaskService taskService; + + private final HistoryService historyService; + + + private final IFlowTaskService flowTaskService; + + + + @GetMapping("deployment") + @ApiOperation(value = "工作流_部署流程") + public void createDeployment() { + Deployment deployment = repositoryService.createDeployment() + .addClasspathResource("aa.bpmn20.xml") + .name("技术监督预警流程").category("testCategory") + .deploy(); + + ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult(); + repositoryService.setProcessDefinitionCategory(definition.getId(), "testCategory"); + System.out.println(deployment.getId()); + } + + + @ApiOperation(value = "工作流_发起流程") + @PostMapping("/start") + public HttpResult start(@ApiParam(value = "流程定义id") @RequestParam(value = "procDefId") String procDefId, + @ApiParam(value = "监督单id") @RequestParam(value = "thsIndex") String thsIndex, + @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { + String methodDescribe = getMethodDescribe("start"); + String res = flowDefinitionService.startProcessInstanceById(procDefId,thsIndex, variables); + if(Objects.nonNull(res)){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + + + @ApiOperation(value = "工作流_定义删除") + @DeleteMapping(value = "delete/{deployIds}") + public HttpResult delete(@PathVariable String[] deployIds) { + String methodDescribe = getMethodDescribe("delete"); + for (String deployId : deployIds) { + flowDefinitionService.delete(deployId); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowTaskController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowTaskController.java new file mode 100644 index 000000000..a2380fce8 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowTaskController.java @@ -0,0 +1,74 @@ +package com.njcn.process.controller.flowable; + + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.process.pojo.vo.flowable.FlowQueryVo; +import com.njcn.process.pojo.vo.flowable.FlowTaskVo; +import com.njcn.process.service.flowable.IFlowTaskService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +/** + *

工作流任务管理

+ * + * @author Tony + * @date 2021-04-03 + */ +@Slf4j +@Api(tags = "工作流流程任务管理") +@RestController +@RequestMapping("/flowable/task") +@RequiredArgsConstructor +public class FlowTaskController extends BaseController { + + + private final IFlowTaskService flowTaskService; + + + + + + @ApiOperation(value = "工作流_审批任务") + @PostMapping(value = "/complete") + public HttpResult complete(@RequestBody FlowTaskVo flowTaskVo) { + boolean res = flowTaskService.complete(flowTaskVo); + return null; + } + + + + /** + * 流程节点信息 + * + * @param procInsId 流程实例id + * @return + */ + @GetMapping("/flowXmlAndNode") + @ApiOperation(value = "工作流_流程节点信息") + public HttpResult flowXmlAndNode(@RequestParam(value = "procInsId", required = false) String procInsId, + @RequestParam(value = "deployId", required = false) String deployId) { + String methodDescribe = getMethodDescribe("flowXmlAndNode"); + + Map res = flowTaskService.flowXmlAndNode(procInsId, deployId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); + } + + + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/factory/FlowServiceFactory.java b/pqs-process/process-boot/src/main/java/com/njcn/process/factory/FlowServiceFactory.java new file mode 100644 index 000000000..9e0ac9435 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/factory/FlowServiceFactory.java @@ -0,0 +1,41 @@ +package com.njcn.process.factory; + +import lombok.Getter; +import org.flowable.engine.*; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * flowable 引擎注入封装 + * @author Tony + * @date 2021-04-03 + */ +@Component +@Getter +public class FlowServiceFactory { + + @Resource + protected RepositoryService repositoryService; + + @Resource + protected RuntimeService runtimeService; + + @Resource + protected IdentityService identityService; + + @Resource + protected TaskService taskService; + + @Resource + protected HistoryService historyService; + + @Resource + protected ManagementService managementService; + + @Qualifier("processEngine") + @Resource + protected ProcessEngine processEngine; + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/FlowableAssMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/FlowableAssMapper.java new file mode 100644 index 000000000..e4c4b4ffe --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/FlowableAssMapper.java @@ -0,0 +1,17 @@ +package com.njcn.process.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.FlowableAss; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2023-04-13 + */ +public interface FlowableAssMapper extends BaseMapper { + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml index 0dc9d7589..70362a0e4 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsSuperviseMapper.xml @@ -4,7 +4,9 @@