add flow map data & save event state

xlorne · xlorne · commit d141d18a0d67 · 2025-06-10T10:41:53.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.2</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.1</version>
+        <version>2.10.2</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.1</version>
+        <version>2.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.1</version>
+        <version>2.10.2</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/bind/FlowMapBindData.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/bind/FlowMapBindData.java
@@ -0,0 +1,48 @@
+package com.codingapi.springboot.flow.bind;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.HashMap;
+
+/**
+ * 流程绑定Map数据对象，用于分布式服务下的流程对象数据传递能力
+ * 该对象中，将clazzName 当做了普通的key来使用，
+ */
+public class FlowMapBindData extends HashMap<String, Object> implements IBindData {
+
+
+    /**
+     * 获取类名称
+     *
+     * @return 类名称
+     */
+    @Override
+    public String getClazzName() {
+        return (String) this.get(CLASS_NAME_KEY);
+    }
+
+    /**
+     * 转化为类对象
+     */
+    @Override
+    public <T> T toJavaObject(Class<T> clazz) {
+        return JSONObject.parseObject(toJsonSnapshot(), clazz);
+    }
+
+    public static FlowMapBindData fromJson(String json) {
+       return JSONObject.parseObject(json, FlowMapBindData.class);
+    }
+
+    public static FlowMapBindData fromObject(Object obj) {
+        return JSONObject.parseObject(JSONObject.toJSONString(obj), FlowMapBindData.class);
+    }
+
+    public static FlowMapBindData fromJson(JSONObject json) {
+        return JSONObject.parseObject(json.toJSONString(), FlowMapBindData.class);
+    }
+
+    public boolean match(String matchKey) {
+        String className = this.getClazzName();
+        return matchKey.equals(className);
+    }
+}
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/bind/IBindData.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/bind/IBindData.java
@@ -7,6 +7,8 @@
  */
 public interface IBindData {
 
+    String CLASS_NAME_KEY = "clazzName";
+
     /**
      * 数据快照
      *
@@ -19,9 +21,27 @@ default String toJsonSnapshot() {
 
     /**
      * 获取类名称
+     *
      * @return 类名称
      */
     default String getClazzName() {
         return this.getClass().getName();
     }
+
+
+    /**
+     * 类对象匹配
+     */
+    default boolean match(String dataKey) {
+        String className = this.getClazzName();
+        return dataKey.equals(className);
+    }
+
+
+    /**
+     * 转化为类对象
+     */
+    default <T> T toJavaObject(Class<T> clazz) {
+        return (T) this;
+    }
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java
@@ -34,6 +34,8 @@ public class FlowApprovalEvent implements ISyncEvent {
     public static final int STATE_URGE = 8;
     // 抄送
     public static final int STATE_CIRCULATE = 9;
+    // 保存
+    public static final int STATE_SAVE = 10;
 
 
     private final int state;
@@ -52,8 +54,23 @@ public FlowApprovalEvent(int state, FlowRecord flowRecord, IFlowOperator operato
     }
 
 
-    public boolean match(Class<?> bindDataClass) {
-        return bindDataClass.isInstance(bindData);
+    public boolean match(String matchKey) {
+        return bindData.match(matchKey);
+    }
+
+    /**
+     * 匹配类名
+     * 当前bingData下的clazzName变成了普通的key字段了，推荐使用match(String matchKey)方法
+     * @param clazz 类名
+     * @return 是否匹配
+     */
+    @Deprecated
+    public boolean match(Class<?> clazz) {
+        return bindData.match(clazz.getName());
+    }
+
+    public <T> T toJavaObject(Class<T> clazz) {
+        return bindData.toJavaObject(clazz);
     }
 
     public boolean isUrge() {
@@ -64,6 +81,10 @@ public boolean isTodo() {
         return state == STATE_TODO;
     }
 
+    public boolean isSave() {
+        return state == STATE_SAVE;
+    }
+
     public boolean isCreate() {
         return state == STATE_CREATE;
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSaveService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSaveService.java
@@ -2,14 +2,17 @@
 
 import com.codingapi.springboot.flow.bind.BindDataSnapshot;
 import com.codingapi.springboot.flow.bind.IBindData;
+import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.domain.Opinion;
+import com.codingapi.springboot.flow.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.FlowBindDataRepository;
 import com.codingapi.springboot.flow.repository.FlowProcessRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
 import com.codingapi.springboot.flow.repository.FlowWorkRepository;
 import com.codingapi.springboot.flow.service.FlowRecordVerifyService;
 import com.codingapi.springboot.flow.user.IFlowOperator;
+import com.codingapi.springboot.framework.event.EventPusher;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +51,15 @@ public void save(long recordId, IFlowOperator currentOperator, IBindData bindDat
 
         flowRecord.setOpinion(opinion);
         flowRecordRepository.update(flowRecord);
+
+        FlowWork flowWork = flowRecordVerifyService.getFlowWork();
+
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_SAVE,
+                        flowRecord,
+                        flowRecord.getCurrentOperator(),
+                        flowWork,
+                        snapshot.toBindData()),
+                true);
     }
 
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowStartService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowStartService.java
@@ -189,6 +189,7 @@ public FlowResult startFlow() {
         for (FlowRecord record : records) {
             this.pushEvent(FlowApprovalEvent.STATE_CREATE, record);
             this.pushEvent(FlowApprovalEvent.STATE_TODO, record);
+            this.pushEvent(FlowApprovalEvent.STATE_SAVE, record);
         }
         // 当前的审批记录
         return new FlowResult(flowWork, records);
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/flow/Leave.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/flow/Leave.java
@@ -1,11 +1,15 @@
 package com.codingapi.springboot.flow.flow;
 
 import com.codingapi.springboot.flow.bind.IBindData;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Setter
 @Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class Leave implements IBindData {
 
     private long id;
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/flow/Leave2.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/flow/Leave2.java
@@ -0,0 +1,23 @@
+package com.codingapi.springboot.flow.flow;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class Leave2  {
+
+    private long id;
+    private String title;
+    private int days;
+
+    public Leave2(String title) {
+        this(title,0);
+    }
+
+    public Leave2(String title, int days) {
+        this.title = title;
+        this.days = days;
+    }
+
+}
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/LeaveRepository.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/LeaveRepository.java
@@ -1,6 +1,7 @@
 package com.codingapi.springboot.flow.repository;
 
 import com.codingapi.springboot.flow.flow.Leave;
+import com.codingapi.springboot.flow.flow.Leave2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,4 +16,8 @@ public void save(Leave leave) {
             leave.setId(cache.size());
         }
     }
+    public void save(Leave2 leave2) {
+        Leave leave = new Leave(leave2.getId(), leave2.getTitle(), leave2.getDays());
+        this.save(leave);
+    }
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowMapTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowMapTest.java
@@ -0,0 +1,127 @@
+package com.codingapi.springboot.flow.test;
+
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.bind.FlowMapBindData;
+import com.codingapi.springboot.flow.build.FlowWorkBuilder;
+import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.domain.Opinion;
+import com.codingapi.springboot.flow.em.ApprovalType;
+import com.codingapi.springboot.flow.flow.Leave2;
+import com.codingapi.springboot.flow.matcher.OperatorMatcher;
+import com.codingapi.springboot.flow.pojo.FlowDetail;
+import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.*;
+import com.codingapi.springboot.flow.service.FlowService;
+import com.codingapi.springboot.flow.user.User;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.PageRequest;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class FlowMapTest {
+
+    private final UserRepository userRepository = new UserRepository();
+    private final FlowWorkRepository flowWorkRepository = new FlowWorkRepositoryImpl();
+    private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
+    private final FlowBindDataRepositoryImpl flowBindDataRepository = new FlowBindDataRepositoryImpl();
+    private final LeaveRepository leaveRepository = new LeaveRepository();
+    private final FlowBackupRepository flowBackupRepository = new FlowBackupRepositoryImpl();
+    private final FlowProcessRepository flowProcessRepository = new FlowProcessRepositoryImpl(flowBackupRepository, userRepository);
+    private final FlowService flowService = new FlowService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, userRepository, flowProcessRepository, flowBackupRepository);
+
+    /**
+     * map数据绑定对象测试
+     */
+    @Test
+    void mapFlowTest() {
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User user = new User("张飞");
+        userRepository.save(user);
+
+        User dept = new User("刘备");
+        userRepository.save(dept);
+
+        User boss = new User("诸葛亮");
+        userRepository.save(boss);
+
+        FlowWork flowWork = FlowWorkBuilder.builder(user)
+                .title("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("部门领导审批", "start", "dept")
+                .relation("总经理审批", "dept", "manager")
+                .relation("结束节点", "manager", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave2 leave = new Leave2("我要出去看看");
+        FlowMapBindData bindData = FlowMapBindData.fromObject(leave);
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, user, bindData, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 提交流程
+        FlowRecord userTodo = userTodos.get(0);
+        // 保存流程
+        leave.setTitle("我要出去看看~~");
+        bindData = FlowMapBindData.fromObject(leave);
+        flowService.save(userTodo.getId(), user, bindData, "暂存");
+
+        // 查看流程详情
+        FlowDetail flowDetail = flowService.detail(userTodo.getId(), user);
+        assertEquals("我要出去看看~~", (flowDetail.getBindData().toJavaObject(Leave2.class)).getTitle());
+        assertTrue(flowDetail.getFlowRecord().isRead());
+
+
+        flowService.submitFlow(userTodo.getId(), user, bindData, Opinion.pass("同意"));
+
+        // 查看部门经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        FlowRecord deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, bindData, Opinion.pass("同意"));
+
+        // 查看总经理的待办
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 提交总经理的审批
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, bindData, Opinion.pass("同意"));
+
+        // 查看所有流程
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(3, records.size());
+
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(0, userTodos.size());
+
+
+        records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(3, records.size());
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+        List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
+        assertEquals(4, snapshots.size());
+
+    }
+}
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/META-INF/banner.txt b/springboot-starter/src/main/resources/META-INF/banner.txt

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ public FlowResult startFlow() {`
`189`	`189`	`for (FlowRecord record : records) {`
`190`	`190`	`this.pushEvent(FlowApprovalEvent.STATE_CREATE, record);`
`191`	`191`	`this.pushEvent(FlowApprovalEvent.STATE_TODO, record);`
	`192`	`+ this.pushEvent(FlowApprovalEvent.STATE_SAVE, record);`
`192`	`193`	`}`
`193`	`194`	`// 当前的审批记录`
`194`	`195`	`return new FlowResult(flowWork, records);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.codingapi.springboot.flow.repository;`
`2`	`2`
`3`	`3`	`import com.codingapi.springboot.flow.flow.Leave;`
	`4`	`+import com.codingapi.springboot.flow.flow.Leave2;`
`4`	`5`
`5`	`6`	`import java.util.ArrayList;`
`6`	`7`	`import java.util.List;`
`@@ -15,4 +16,8 @@ public void save(Leave leave) {`
`15`	`16`	`leave.setId(cache.size());`
`16`	`17`	`}`
`17`	`18`	`}`
	`19`	`+ public void save(Leave2 leave2) {`
	`20`	`+ Leave leave = new Leave(leave2.getId(), leave2.getTitle(), leave2.getDays());`
	`21`	`+ this.save(leave);`
	`22`	`+ }`
`18`	`23`	`}`