升级 flowlong 1.0.5

build.gradle

@@ -32,7 +32,7 @@ buildscript {
         springBootVersion = "3.1.1"
         springdocVersion = "2.5.0"
         mybatisPlusVersion = "3.5.9"
-        flowlongVersion = "1.0.3"
+        flowlongVersion = "1.0.5"
         aizudaVersion = "1.0.2"
     }
 

pom.xml

@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<aizuda.version>1.0.2</aizuda.version>
-		<flowlong.version>1.0.3</flowlong.version>
+		<flowlong.version>1.0.5</flowlong.version>
 		<springdoc.version>2.5.0</springdoc.version>
 		<skipTests>true</skipTests>
 	</properties>

src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskListener.java

@@ -39,11 +39,11 @@ public class FlowTaskListener implements TaskListener {
 
 
     @Override
-    public boolean notify(EventType eventType, Supplier<FlwTask> supplier, NodeModel nodeModel, FlowCreator flowCreator) {
+    public boolean notify(TaskEventType eventType, Supplier<FlwTask> supplier, NodeModel nodeModel, FlowCreator flowCreator) {
         FlwTask flwTask = supplier.get();
 
         // 不进行二次执行自动跳转逻辑，防止出现taskId不存在，退回需要发起人手动审批
-        if (EventType.create.eq(eventType) || EventType.recreate.eq(eventType)) {
+        if (TaskEventType.create.eq(eventType) || TaskEventType.recreate.eq(eventType)) {
             // 获取当前节点信息
             NodeModel currentNodeModel = this.getNodeModel(flwTask, nodeModel);
             if (null != flwTask) {
@@ -76,7 +76,7 @@ public class FlowTaskListener implements TaskListener {
                 // 发起
                 fpa.setType(1);
             } else {
-                if (eventType == EventType.assignment) {
+                if (eventType == TaskEventType.assignment) {
                     TaskType taskType = TaskType.get(flwTask.getTaskType());
                     if (taskType == TaskType.transfer) {
                         // 转办、代理人办理完任务直接进入下一个节点
@@ -94,7 +94,7 @@ public class FlowTaskListener implements TaskListener {
                 NodeModel currentNodeModel = this.getNodeModel(flwTask, nodeModel);
                 boolean saveContent = false;
                 ApprovalContent content = new ApprovalContent();
-                if (EventType.cc.eq(eventType)) {
+                if (TaskEventType.cc.eq(eventType)) {
                     // 抄送
                     content.setNodeUserList(currentNodeModel.getNodeAssigneeList());
                     saveContent = true;
@@ -134,8 +134,8 @@ public class FlowTaskListener implements TaskListener {
             fpa.setTaskKey(flwTask.getTaskKey());
         }
 
-        if (EventType.autoComplete.eq(eventType) || EventType.autoReject.eq(eventType)
-                || EventType.trigger.eq(eventType)) {
+        if (TaskEventType.autoComplete.eq(eventType) || TaskEventType.autoReject.eq(eventType)
+                || TaskEventType.trigger.eq(eventType)) {
             // 自动审批情况，设置默认处理人信息
             fpa.setCreateId(0L);
             fpa.setCreateBy("admin");
@@ -158,52 +158,52 @@ public class FlowTaskListener implements TaskListener {
         return nodeModel;
     }
 
-    private int getType(EventType eventType) {
+    private int getType(TaskEventType eventType) {
         // 办理
         int type = 3;
-        if (eventType == EventType.start) {
+        if (eventType == TaskEventType.start) {
             // 发起
             type = 1;
-        } else if (eventType == EventType.cc) {
+        } else if (eventType == TaskEventType.cc) {
             // 抄送
             type = 2;
-        } else if (eventType == EventType.reject) {
+        } else if (eventType == TaskEventType.reject) {
             // 驳回
             type = 4;
-        } else if (eventType == EventType.claimRole || eventType == EventType.claimDepartment) {
+        } else if (eventType == TaskEventType.claimRole || eventType == TaskEventType.claimDepartment) {
             // 认领
             type = 5;
-        } else if (eventType == EventType.jump) {
+        } else if (eventType == TaskEventType.jump) {
             // 跳转
             type = 8;
-        } else if (eventType == EventType.reclaim) {
+        } else if (eventType == TaskEventType.reclaim) {
             // 拿回
             type = 9;
-        } else if (eventType == EventType.resume) {
+        } else if (eventType == TaskEventType.resume) {
             // 唤醒
             type = 10;
-        } else if (eventType == EventType.revoke) {
+        } else if (eventType == TaskEventType.revoke) {
             // 撤销
             type = 15;
-        } else if (eventType == EventType.terminate) {
+        } else if (eventType == TaskEventType.terminate) {
             // 终止
             type = 16;
-        } else if (eventType == EventType.timeout) {
+        } else if (eventType == TaskEventType.timeout) {
             // 超时
             type = 17;
-        } else if (eventType == EventType.autoJump) {
+        } else if (eventType == TaskEventType.autoJump) {
             // 自动跳转
             type = 19;
-        } else if (eventType == EventType.autoComplete) {
+        } else if (eventType == TaskEventType.autoComplete) {
             // 自动完成
             type = 20;
-        } else if (eventType == EventType.autoReject) {
+        } else if (eventType == TaskEventType.autoReject) {
             // 自动拒绝
             type = 21;
-        } else if (eventType == EventType.callProcess) {
+        } else if (eventType == TaskEventType.callProcess) {
             // 调用外部流程任务【办理子流程】
             type = 22;
-        } else if (eventType == EventType.trigger) {
+        } else if (eventType == TaskEventType.trigger) {
             // 触发器任务
             type = 23;
         }

src/main/java/com/aizuda/boot/modules/test/service/impl/TestPurchaseOrderServiceImpl.java

@@ -9,7 +9,7 @@ import com.aizuda.boot.modules.test.entity.dto.TestProcessStartDTO;
 import com.aizuda.boot.modules.test.mapper.TestPurchaseOrderMapper;
 import com.aizuda.boot.modules.test.service.ITestPurchaseOrderService;
 import com.aizuda.bpm.engine.core.FlowCreator;
-import com.aizuda.bpm.engine.core.enums.EventType;
+import com.aizuda.bpm.engine.core.enums.InstanceEventType;
 import com.aizuda.bpm.engine.entity.FlwInstance;
 import com.aizuda.bpm.spring.event.InstanceEvent;
 import com.aizuda.core.api.ApiAssert;
@@ -69,12 +69,12 @@ public class TestPurchaseOrderServiceImpl extends BaseServiceImpl<TestPurchaseOr
     // application.yml 开启 flowlong.eventing.instance = true
     @EventListener(condition = "#event.flwInstance.businessKey == 'purchaseOrder'")
     public void onInstanceEvent(InstanceEvent event) {
-        EventType eventType = event.getEventType();
-        if (eventType == EventType.end || eventType == EventType.reject) {
+        InstanceEventType eventType = event.getEventType();
+        if (eventType == InstanceEventType.end || eventType == InstanceEventType.forceComplete) {
             // 审批结束更新业务状态为 2，已通过 3，已拒绝
             TestPurchaseOrder tpo = new TestPurchaseOrder();
             String opinion = FlowHelper.getProcessApprovalOpinion();
-            if (eventType == EventType.end) {
+            if (eventType == InstanceEventType.end) {
                 tpo.setStatus(2);
                 tpo.setFlwComment(opinion);
             } else {