update 2.9.25

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.24</version>
+    <version>2.9.25</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.24</version>
+        <version>2.9.25</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.24</version>
+        <version>2.9.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.24</version>
+        <version>2.9.25</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowButtonType.java

@@ -26,4 +26,6 @@ public enum FlowButtonType {
     CUSTOM,
     // 前端
     VIEW,
+    // 删除
+    REMOVE,
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowProcessRepository.java

@@ -13,4 +13,7 @@ public interface FlowProcessRepository {
 
     FlowWork getFlowWorkByProcessId(String processId);
 
+
+    void deleteByProcessId(String processId);
+
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java

@@ -71,4 +71,10 @@ public interface FlowRecordRepository {
      */
     void delete(List<FlowRecord> childrenRecords);
 
+    /**
+     * 根据流程id删除流程记录
+     * @param processId 流程id
+     */
+    void deleteByProcessId(String processId);
+
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java

@@ -22,6 +22,7 @@ public class FlowService {
     private final FlowDetailService flowDetailService;
     private final FlowCustomEventService flowCustomEventService;
     private final FlowRecallService flowRecallService;
+    private final FlowRemoveService flowRemoveService;
     private final FlowSaveService flowSaveService;
     private final FlowTransferService flowTransferService;
     private final FlowPostponedService flowPostponedService;
@@ -40,6 +41,7 @@ public FlowService(FlowWorkRepository flowWorkRepository,
         this.flowDetailService = new FlowDetailService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository);
         this.flowCustomEventService = new FlowCustomEventService(flowWorkRepository,flowRecordRepository, flowProcessRepository);
         this.flowRecallService = new FlowRecallService(flowWorkRepository,flowRecordRepository, flowProcessRepository);
+        this.flowRemoveService = new FlowRemoveService(flowWorkRepository,flowRecordRepository, flowProcessRepository);
         this.flowSaveService = new FlowSaveService(flowWorkRepository,flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowTransferService = new FlowTransferService(flowWorkRepository,flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowPostponedService = new FlowPostponedService(flowWorkRepository,flowRecordRepository, flowProcessRepository);
@@ -239,4 +241,14 @@ public void recall(long recordId, IFlowOperator currentOperator) {
     }
 
 
+
+    /**
+     * 删除流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     */
+    public void remove(long recordId, IFlowOperator currentOperator) {
+        flowRemoveService.remove(recordId, currentOperator);
+    }
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowRemoveService.java

@@ -0,0 +1,58 @@
+package com.codingapi.springboot.flow.service.impl;
+
+import com.codingapi.springboot.flow.domain.FlowNode;
+import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.event.FlowApprovalEvent;
+import com.codingapi.springboot.flow.record.FlowRecord;
+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;
+
+import java.util.Collections;
+import java.util.List;
+
+@Transactional
+@AllArgsConstructor
+public class FlowRemoveService {
+
+    private final FlowWorkRepository flowWorkRepository;
+    private final FlowRecordRepository flowRecordRepository;
+    private final FlowProcessRepository flowProcessRepository;
+
+
+    /**
+     * 删除流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     */
+    public void remove(long recordId, IFlowOperator currentOperator) {
+        FlowRecordVerifyService flowRecordVerifyService = new FlowRecordVerifyService(
+                flowWorkRepository,
+                flowRecordRepository,
+                flowProcessRepository,
+                recordId, currentOperator);
+
+
+        flowRecordVerifyService.verifyFlowRecordCurrentOperator();
+        flowRecordVerifyService.loadFlowWork();
+        flowRecordVerifyService.loadFlowNode();
+        flowRecordVerifyService.verifyFlowRecordNotFinish();
+        flowRecordVerifyService.verifyFlowRecordIsTodo();
+        FlowNode flowNode =  flowRecordVerifyService.getFlowNode();
+        FlowRecord flowRecord = flowRecordVerifyService.getFlowRecord();
+
+        if(!flowNode.isStartNode()){
+            throw new IllegalArgumentException("flow record not remove");
+        }
+
+        flowProcessRepository.deleteByProcessId(flowRecord.getProcessId());
+
+        flowRecordRepository.deleteByProcessId(flowRecord.getProcessId());
+    }
+}

springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowProcessRepositoryImpl.java

@@ -35,5 +35,8 @@ public FlowWork getFlowWorkByProcessId(String processId) {
         return flowBackup.resume(userRepository);
     }
 
-
+    @Override
+    public void deleteByProcessId(String processId) {
+        cache.removeIf(flowProcess -> flowProcess.getProcessId().equals(processId));
+    }
 }