update 2.9.28

xlorne · xlorne · commit a50655d8918a · 2025-02-06T10:19:25.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.9.27</version>
+    <version>2.9.28</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.9.27</version>
+        <version>2.9.28</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.9.27</version>
+        <version>2.9.28</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.9.27</version>
+        <version>2.9.28</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java
@@ -217,7 +217,8 @@ public FlowRecord createRecord(long workId,
                                    String title,
                                    IFlowOperator createOperator,
                                    IFlowOperator currentOperator,
-                                   BindDataSnapshot snapshot) {
+                                   BindDataSnapshot snapshot,
+                                   boolean isWaiting) {
 
         // 当前操作者存在委托人时，才需要寻找委托人
         IFlowOperator flowOperator = currentOperator;
@@ -239,7 +240,7 @@ public FlowRecord createRecord(long workId,
         record.setPreId(preId);
         record.setTitle(title);
         record.setTimeoutTime(this.loadTimeoutTime());
-        record.setFlowType(FlowType.TODO);
+        record.setFlowType(isWaiting?FlowType.WAITING:FlowType.TODO);
         record.setErrMessage(null);
         record.setSnapshotId(snapshot.getId());
         return record;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java
@@ -33,6 +33,9 @@ public class Opinion {
     public static final int RESULT_REJECT = 3;
     // 审批结果 抄送
     public static final int RESULT_CIRCULATE = 4;
+    // 审批结果 等待
+    public static final int RESULT_WAITING = 5;
+
 
     /**
      * 审批意见
@@ -88,6 +91,10 @@ public static Opinion transfer(String advice) {
         return new Opinion(advice, RESULT_TRANSFER, TYPE_DEFAULT);
     }
 
+    public static Opinion waiting(String advice) {
+        return new Opinion(advice, RESULT_WAITING, TYPE_DEFAULT);
+    }
+
     public static Opinion unSignAutoSuccess() {
         return new Opinion("非会签自动审批", RESULT_PASS, TYPE_AUTO);
     }
@@ -104,6 +111,10 @@ public boolean isSuccess() {
         return result == RESULT_PASS;
     }
 
+    public boolean isWaiting() {
+        return result == RESULT_WAITING;
+    }
+    
     public boolean isReject() {
         return result == RESULT_REJECT;
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowType.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowType.java
@@ -20,7 +20,11 @@ public enum FlowType {
     /**
      * 转办
      */
-    TRANSFER;
+    TRANSFER,
+    /**
+     * 等待执行
+     */
+    WAITING;
 
 
     public static FlowType parser(String type){
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java
@@ -321,6 +321,13 @@ public boolean isFinish() {
         return this.flowStatus == FlowStatus.FINISH;
     }
 
+    /**
+     * 是否等待
+     */
+    public boolean isWaiting() {
+        return this.flowType == FlowType.WAITING;
+    }
+
     /**
      * 是否是待办
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java
@@ -40,15 +40,14 @@ public void bindHistoryRecords(List<FlowRecord> historyRecords) {
      * 解析当前的审批方向
      */
     public void loadFlowSourceDirection() {
-        if (opinion.isSuccess()) {
+        if (opinion.isSuccess() || opinion.isWaiting()) {
             flowSourceDirection = FlowSourceDirection.PASS;
         }
         if (opinion.isReject()) {
             flowSourceDirection = FlowSourceDirection.REJECT;
         }
     }
 
-
     /**
      * 重新加载审批方向
      * 根据会签结果判断是否需要重新设置审批方向
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -264,7 +264,7 @@ private List<FlowRecord> createNextRecord() {
             String recordTitle = nextNode.generateTitle(flowSession);
             recordList = new ArrayList<>();
             for (IFlowOperator operator : operators) {
-                FlowRecord record = nextNode.createRecord(workId, flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);
+                FlowRecord record = nextNode.createRecord(workId, flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot, opinion.isWaiting());
                 recordList.add(record);
             }
         }
@@ -294,7 +294,7 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
                 for (IFlowOperator operator : operators) {
                     FlowSession content = new FlowSession(flowRecord, flowWork, currentNode, createOperator, operator, snapshot.toBindData(), opinion, historyRecords);
                     String recordTitle = currentNode.generateTitle(content);
-                    FlowRecord record = currentNode.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);
+                    FlowRecord record = currentNode.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot, opinion.isWaiting());
                     recordList.add(record);
                 }
                 return recordList;
@@ -312,7 +312,7 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
                 if (!matcherOperators.isEmpty()) {
                     for (IFlowOperator matcherOperator : matcherOperators) {
                         String recordTitle = node.generateTitle(content);
-                        FlowRecord record = node.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, matcherOperator, snapshot);
+                        FlowRecord record = node.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, matcherOperator, snapshot, opinion.isWaiting());
                         recordList.add(record);
                     }
                 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java
@@ -228,6 +228,15 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
         return flowSubmitService.submitFlow();
     }
 
+    /**
+     * 唤醒流程
+     * @param processId  流程实例id
+     * @param currentOperator 当前操作者
+     */
+    public void notifyFlow(String processId,IFlowOperator currentOperator) {
+        FlowNotifyService flowNotifyService = new FlowNotifyService(processId, currentOperator, flowServiceRepositoryHolder);
+        flowNotifyService.notifyFlow();
+    }
 
     /**
      * 自定义事件
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowNotifyService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowNotifyService.java
@@ -0,0 +1,81 @@
+package com.codingapi.springboot.flow.service.impl;
+
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.em.FlowType;
+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.FlowServiceRepositoryHolder;
+import com.codingapi.springboot.flow.user.IFlowOperator;
+import com.codingapi.springboot.framework.event.EventPusher;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Transactional
+public class FlowNotifyService {
+
+    private final String processId;
+    private final IFlowOperator currentOperator;
+    private final FlowRecordRepository flowRecordRepository;
+    private final FlowBindDataRepository flowBindDataRepository;
+    private final FlowWorkRepository flowWorkRepository;
+    private final FlowProcessRepository flowProcessRepository;
+
+
+    public FlowNotifyService(String processId, IFlowOperator currentOperator, FlowServiceRepositoryHolder flowServiceRepositoryHolder) {
+        this.processId = processId;
+        this.currentOperator = currentOperator;
+        this.flowRecordRepository = flowServiceRepositoryHolder.getFlowRecordRepository();
+        this.flowBindDataRepository = flowServiceRepositoryHolder.getFlowBindDataRepository();
+        this.flowWorkRepository = flowServiceRepositoryHolder.getFlowWorkRepository();
+        this.flowProcessRepository = flowServiceRepositoryHolder.getFlowProcessRepository();
+    }
+
+
+    /**
+     * 获取流程设计对象
+     */
+    public FlowWork loadFlowWork(FlowRecord flowRecord) {
+        FlowWork flowWork = flowProcessRepository.getFlowWorkByProcessId(flowRecord.getProcessId());
+        if (flowWork == null) {
+            flowWork = flowWorkRepository.getFlowWorkByCode(flowRecord.getWorkCode());
+        }
+        if (flowWork == null) {
+            throw new IllegalArgumentException("flow work not found");
+        }
+        flowWork.enableValidate();
+
+        return flowWork;
+    }
+
+    /**
+     * 流程通知
+     */
+    public void notifyFlow() {
+        List<FlowRecord> flowRecords = flowRecordRepository.findFlowRecordByProcessId(processId);
+        List<FlowRecord> waitingRecords = flowRecords.stream().filter(FlowRecord::isWaiting).collect(Collectors.toList());
+        for (FlowRecord flowRecord : waitingRecords) {
+            if (flowRecord.isOperator(currentOperator)) {
+                flowRecord.setFlowType(FlowType.TODO);
+                flowRecordRepository.update(flowRecord);
+
+                BindDataSnapshot snapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
+
+                FlowWork flowWork = this.loadFlowWork(flowRecord);
+
+                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO,
+                        flowRecord,
+                        flowRecord.getCurrentOperator(),
+                        flowWork,
+                        snapshot.toBindData()
+                ), true);
+            }
+        }
+    }
+}
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
@@ -209,7 +209,7 @@ private void updateFinishFlowRecord() {
     }
 
     // 保存流程记录
-    private void saveFlowRecords(List<FlowRecord> flowRecords) {
+    private void saveNextFlowRecords(List<FlowRecord> flowRecords) {
         flowServiceRepositoryHolder.getFlowRecordRepository().save(flowRecords);
     }
 
@@ -313,15 +313,17 @@ private FlowResult submitCurrentFlow() {
         }
 
         // 保存流程记录
-        this.saveFlowRecords(nextRecords);
+        this.saveNextFlowRecords(nextRecords);
 
         // 推送审批事件消息
         int eventState = flowSourceDirection == FlowSourceDirection.PASS ? FlowApprovalEvent.STATE_PASS : FlowApprovalEvent.STATE_REJECT;
         this.pushEvent(flowRecord, eventState);
 
         // 推送待办事件消息
         for (FlowRecord record : nextRecords) {
-            this.pushEvent(record, FlowApprovalEvent.STATE_TODO);
+            if(record.isTodo()) {
+                this.pushEvent(record, FlowApprovalEvent.STATE_TODO);
+            }
         }
 
         return new FlowResult(flowWork, nextRecords);
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest2.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest2.java
@@ -30,7 +30,7 @@ public class FlowTest2 {
     private final FlowService flowService = new FlowService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, userRepository,flowProcessRepository,flowBackupRepository);
 
     /**
-     * flow test
+     * 转办测试
      */
     @Test
     void flowTest() {
@@ -107,4 +107,72 @@ void flowTest() {
         assertTrue(records.stream().allMatch(FlowRecord::isFinish));
 
     }
+
+
+    /**
+     * 流程等待测试
+     */
+    @Test
+    void flowWaitingTest() {
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+        User lorne = new User("lorne");
+        userRepository.save(lorne);
+
+        User boss = new User("boss");
+        userRepository.save(boss);
+
+        FlowWork flowWork = FlowWorkBuilder.builder(lorne)
+                .title("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("老板审批", "boss", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("老板审批", "start", "boss")
+                .relation("结束节点", "boss", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave leave = new Leave("我想要出去看看");
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, lorne, leave, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(lorne.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        String processId = userTodos.get(0).getProcessId();
+
+        FlowRecord userTodo = userTodos.get(0);
+        flowService.submitFlow(userTodo.getId(), lorne, leave, Opinion.waiting("自己先提交"));
+
+        // 查看boss的待办
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(0, bossTodos.size());
+
+        // 通知流程
+        flowService.notifyFlow(processId,boss);
+
+        // 查看boss的待办
+        bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("领导审批通过"));
+
+        bossTodos = flowRecordRepository.findTodoByOperatorId(lorne.getUserId(), pageRequest).getContent();
+        assertEquals(0, bossTodos.size());
+
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(2, records.size());
+
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+    }
 }
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.27</version>
+        <version>2.9.28</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.27</version>
+        <version>2.9.28</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/resources/META-INF/banner.txt b/springboot-starter/src/main/resources/META-INF/banner.txt
@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 2.9.27
+CodingApi SpringBoot-Starter 2.9.28
 springboot version (${spring-boot.version})
 ------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,14 @@ public void bindHistoryRecords(List<FlowRecord> historyRecords) {`
`40`	`40`	`* 解析当前的审批方向`
`41`	`41`	`*/`
`42`	`42`	`public void loadFlowSourceDirection() {`
`43`		`- if (opinion.isSuccess()) {`
	`43`	`+ if (opinion.isSuccess() \|\| opinion.isWaiting()) {`
`44`	`44`	`flowSourceDirection = FlowSourceDirection.PASS;`
`45`	`45`	`}`
`46`	`46`	`if (opinion.isReject()) {`
`47`	`47`	`flowSourceDirection = FlowSourceDirection.REJECT;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-`
`52`	`51`	`/**`
`53`	`52`	`* 重新加载审批方向`
`54`	`53`	`* 根据会签结果判断是否需要重新设置审批方向`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ private List<FlowRecord> createNextRecord() {`
`264`	`264`	`String recordTitle = nextNode.generateTitle(flowSession);`
`265`	`265`	`recordList = new ArrayList<>();`
`266`	`266`	`for (IFlowOperator operator : operators) {`
`267`		`- FlowRecord record = nextNode.createRecord(workId, flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);`
	`267`	`+ FlowRecord record = nextNode.createRecord(workId, flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot, opinion.isWaiting());`
`268`	`268`	`recordList.add(record);`
`269`	`269`	`}`
`270`	`270`	`}`
`@@ -294,7 +294,7 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO`
`294`	`294`	`for (IFlowOperator operator : operators) {`
`295`	`295`	`FlowSession content = new FlowSession(flowRecord, flowWork, currentNode, createOperator, operator, snapshot.toBindData(), opinion, historyRecords);`
`296`	`296`	`String recordTitle = currentNode.generateTitle(content);`
`297`		`- FlowRecord record = currentNode.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);`
	`297`	`+ FlowRecord record = currentNode.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot, opinion.isWaiting());`
`298`	`298`	`recordList.add(record);`
`299`	`299`	`}`
`300`	`300`	`return recordList;`
`@@ -312,7 +312,7 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO`
`312`	`312`	`if (!matcherOperators.isEmpty()) {`
`313`	`313`	`for (IFlowOperator matcherOperator : matcherOperators) {`
`314`	`314`	`String recordTitle = node.generateTitle(content);`
`315`		`- FlowRecord record = node.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, matcherOperator, snapshot);`
	`315`	`+ FlowRecord record = node.createRecord(flowWork.getId(), flowWork.getCode(), processId, preId, recordTitle, createOperator, matcherOperator, snapshot, opinion.isWaiting());`
`316`	`316`	`recordList.add(record);`
`317`	`317`	`}`
`318`	`318`	`}`