From 21a25ae47424b387ef9102ce46c254fa843a29f3 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 26 Oct 2023 16:01:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ModelerController.java         | 28 +++++++++++++++++++
 .../impl/ProcessEsInitChangeServiceImpl.java  |  4 +++
 2 files changed, 32 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java
index 4392578c..2ba48d76 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java
@@ -27,10 +27,13 @@ import org.activiti.bpmn.model.*;
 import org.activiti.bpmn.model.Process;
 import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.delegate.BaseExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
 import org.activiti.engine.repository.*;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanMap;
@@ -437,6 +440,31 @@ public class ModelerController {
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
+    @GetMapping("/clearAllProcesses")
+    @ApiOperation("清理所有流程")
+    public void clearAllProcesses() {
+        // 获取流程引擎
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+
+        // 获取RuntimeService并删除所有流程实例
+        List<ProcessInstance> instances = processEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .list();
+        for (ProcessInstance instance : instances) {
+            processEngine.getRuntimeService()
+                    .deleteProcessInstance(instance.getId(), "Cleanup all instances");
+        }
+
+        // 获取RepositoryService并删除所有流程
+        List<ProcessDefinition> definitions = processEngine.getRepositoryService()
+                .createProcessDefinitionQuery()
+                .list();
+        for (ProcessDefinition definition : definitions) {
+            processEngine.getRepositoryService()
+                    .deleteDeployment(definition.getDeploymentId(), true);
+        }
+    }
+
 
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 4a777136..02cf9bc3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -73,6 +73,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
 
     @Override
     public InitChangeDataVO getHandleData(String taskId) {
+        if (!actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException("任务不存在");
+        }
         InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -81,6 +84,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
         CommonVO commonVO = new CommonVO();
         commonVO.setPrcName(process.getPrcName());
+        commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
         initChangeDataVO.setCommonVO(commonVO);