From 1c68bc0661b282610385fb08f94b258d634eadac Mon Sep 17 00:00:00 2001 From: lbw Date: Sun, 30 Jul 2023 21:00:28 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20=E5=88=A0=E9=99=A4json=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=BD=ACbpmn=20=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EngineFlowController.java | 71 ------------------- .../api/feign/RemoteFlowEngineService.java | 7 -- .../controller/ProcessInstanceController.java | 12 ---- .../task/service/IProcessInstanceService.java | 6 -- .../impl/ProcessInstanceServiceImpl.java | 9 --- 5 files changed, 105 deletions(-) diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java index 28671dd30..0d98c83fe 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java @@ -107,77 +107,6 @@ public class EngineFlowController { } - @GetMapping("/showImg") - public R showImg(String procInsId) { - - String procDefId; - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(procInsId) - .singleResult(); - if (processInstance == null) { - HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() - .processInstanceId(procInsId) - .singleResult(); - procDefId = historicProcessInstance.getProcessDefinitionId(); - - } - else { - procDefId = processInstance.getProcessDefinitionId(); - } - - // 使用流程实例ID，查询正在执行的执行对象表，返回流程实例对象 - BpmnModel bpmnModel = repositoryService.getBpmnModel(procDefId); - - // 创建默认的流程图生成器 - DefaultProcessDiagramGenerator defaultProcessDiagramGenerator = new DefaultProcessDiagramGenerator(); - // 生成图片的类型 - String imageType = "png"; - // 高亮节点集合 - List highLightedActivities = new ArrayList<>(); - // 高亮连线集合 - List highLightedFlows = new ArrayList<>(); - // 查询所有历史节点信息 - List hisActInsList = historyService.createHistoricActivityInstanceQuery() - .processInstanceId(procInsId) - .list(); - - // 遍历 - hisActInsList.forEach(historicActivityInstance -> { - if ("sequenceFlow".equals(historicActivityInstance.getActivityType())) { - // 添加高亮连线 - highLightedFlows.add(historicActivityInstance.getActivityId()); - } - else { - // 添加高亮节点 - highLightedActivities.add(historicActivityInstance.getActivityId()); - } - }); - // 节点字体 - String activityFontName = "宋体"; - // 连线标签字体 - String labelFontName = "微软雅黑"; - // 连线标签字体 - String annotationFontName = "宋体"; - // 类加载器 - ClassLoader customClassLoader = null; - // 比例因子，默认即可 - double scaleFactor = 1.0d; - // 不设置连线标签不会画 - boolean drawSequenceFlowNameWithNoLabelDI = true; - - BpmnAutoLayout bpmnAutoLayout = new BpmnAutoLayout(bpmnModel); - bpmnAutoLayout.setTaskHeight(120); - bpmnAutoLayout.setTaskWidth(120); - bpmnAutoLayout.execute(); - // 生成图片 - InputStream inputStream = defaultProcessDiagramGenerator.generateDiagram(bpmnModel, imageType, - highLightedActivities, highLightedFlows, activityFontName, labelFontName, annotationFontName, null, - scaleFactor, drawSequenceFlowNameWithNoLabelDI); // 获取输入流 - - String content = Base64.encode(inputStream); - return R.ok(content); - } - /** * 审批任务 * @param taskId 任务ID diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java index 7f3047f40..6bb830147 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/api/feign/RemoteFlowEngineService.java @@ -115,13 +115,6 @@ public interface RemoteFlowEngineService { @PostMapping("/task/delegateTask") R delegateTask(@RequestBody TaskParamDto taskParamDto); - /** - * 显示流程图 - * @param procInsId 流程实例ID - * @return 流程图地址 - */ - @GetMapping("/flow/showImg") - R showImg(@RequestParam("procInsId") String procInsId); /** * 查询任务 diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/controller/ProcessInstanceController.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/controller/ProcessInstanceController.java index b9024b518..feeba5c28 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/controller/ProcessInstanceController.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/controller/ProcessInstanceController.java @@ -74,18 +74,6 @@ public class ProcessInstanceController { return processInstanceService.queryMineCC(taskQueryParamDto); } - /** - * 显示流程图 - * @param procInsId - * @return - */ - - @SneakyThrows - @GetMapping("showImg") - public R showImg(String procInsId) { - return processInstanceService.showImg(procInsId); - } - /** * 格式化流程显示 * @param nodeFormatParamVo diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java index 0b0c0fd82..96685c1d3 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/IProcessInstanceService.java @@ -52,12 +52,6 @@ public interface IProcessInstanceService { */ R queryMineCC(TaskQueryParamDto taskQueryParamDto); - /** - * 显示流程实例图片 - * @param procInsId - * @return - */ - R showImg(String procInsId); /** * 格式化流程显示 diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java index 8b2863a45..367ba3de6 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java @@ -289,15 +289,6 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService { return R.ok(p); } - /** - * 显示流程实例图片 - * @param procInsId - * @return - */ - @Override - public R showImg(String procInsId) { - return flowEngineService.showImg(procInsId); - } /** * 格式化流程显示