update 3.5.58

xlorne · xlorne · commit 8717601db302 · 2025-01-21T11:49:38.000+08:00
diff --git a/admin-ui/src/api/flow.ts b/admin-ui/src/api/flow.ts
@@ -42,6 +42,11 @@ export async function startFlow(body:any) {
     return post('/api/cmd/flowRecord/startFlow', body);
 }
 
+export async function removeFlow(body:any) {
+    return post('/api/cmd/flowRecord/remove', body);
+}
+
+
 export async function detail(id?:any,workCode?:any) {
     return get('/api/query/flowRecord/detail', {id,workCode});
 }
diff --git a/admin-ui/src/components/Flow/flow/events.tsx b/admin-ui/src/components/Flow/flow/events.tsx
@@ -1,7 +1,18 @@
 import {useEffect} from "react";
 import {FormInstance} from "antd/es/form/hooks/useForm";
 import {FlowData, FlowSubmitResultBuilder, FlowTrySubmitResultBuilder} from "@/components/Flow/flow/data";
-import {custom, postponed, recall, saveFlow, startFlow, submitFlow, transfer, trySubmitFlow, urge} from "@/api/flow";
+import {
+    custom,
+    postponed,
+    recall,
+    removeFlow,
+    saveFlow,
+    startFlow,
+    submitFlow,
+    transfer,
+    trySubmitFlow,
+    urge
+} from "@/api/flow";
 import {message} from "antd";
 import {useDispatch, useSelector} from "react-redux";
 import {
@@ -231,6 +242,24 @@ export const registerEvents = (id: string,
         })
     }
 
+
+    // 删除流程
+    const handleRemoveFlow = () => {
+        const body = {
+            recordId,
+        }
+        setRequestLoading(true);
+        removeFlow(body).then(res => {
+            if (res.success) {
+                message.success('流程已删除').then();
+                closeFlow();
+            }
+        }).finally(() => {
+            setRequestLoading(false)
+        })
+    }
+
+
     // 延期流程
     const handlePostponedFlow = () => {
         const body = {
@@ -418,6 +447,10 @@ export const registerEvents = (id: string,
                 handleRecallFlow();
                 break;
             }
+            case 'REMOVE': {
+                handleRemoveFlow();
+                break;
+            }
             case 'URGE': {
                 handlerUrgeFlow();
                 break;
diff --git a/admin-ui/src/components/Flow/flow/types.ts b/admin-ui/src/components/Flow/flow/types.ts
@@ -16,7 +16,8 @@ export type CustomButtonType =
     | 'POSTPONED'
     | 'URGE'
     | 'CUSTOM'
-    | 'VIEW';
+    | 'VIEW'
+    | 'REMOVE';
 
 // 流程图中线的类型
 export type EdgeType = 'line' | 'polyline' | 'bezier';
diff --git a/admin-ui/src/components/Flow/panel/ButtonPanel.tsx b/admin-ui/src/components/Flow/panel/ButtonPanel.tsx
@@ -69,6 +69,10 @@ const buttonEventOptions = [
         label: "自定义事件",
         value: "VIEW"
     },
+    {
+        label: "删除",
+        value: "REMOVE"
+    },
 ] as {
     label: string;
     value: CustomButtonType;
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java b/example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java
@@ -100,4 +100,11 @@ public Response urge(@RequestBody FlowCmd.UrgeFlow request) {
     }
 
 
+    @PostMapping("/remove")
+    public Response remove(@RequestBody FlowCmd.RemoveFlow request) {
+        User current = userRepository.getUserByUsername(request.getUserName());
+        flowService.remove(request.getRecordId(), current);
+        return Response.buildSuccess();
+    }
+
 }
diff --git a/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java b/example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java
@@ -180,6 +180,17 @@ public String getUserName() {
         }
     }
 
+    @Setter
+    @Getter
+    public static class RemoveFlow {
+
+        private long recordId;
+
+        public String getUserName() {
+            return TokenContext.current().getUsername();
+        }
+    }
+
 
     @Setter
     @Getter
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowProcessEntityRepository.java b/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowProcessEntityRepository.java
@@ -7,4 +7,7 @@ public interface FlowProcessEntityRepository extends FastRepository<FlowProcessE
 
     FlowProcessEntity getFlowProcessEntityByProcessId(String processId);
 
+
+    void deleteByProcessId(String processId);
+
 }
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java b/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java
@@ -13,6 +13,8 @@ public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEnt
 
     FlowRecordEntity getFlowRecordEntityById(long id);
 
+    void deleteByProcessId(String processId);
+
 
     List<FlowRecordEntity> findFlowRecordEntityByPreId(long preId);
 
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowProcessRepositoryImpl.java b/example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowProcessRepositoryImpl.java
@@ -40,4 +40,10 @@ public FlowWork getFlowWorkByProcessId(String processId) {
         }
         return null;
     }
+
+
+    @Override
+    public void deleteByProcessId(String processId) {
+        flowProcessEntityRepository.deleteByProcessId(processId);
+    }
 }
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowRecordRepositoryImpl.java b/example/example-infra-flow/src/main/java/com/codingapi/example/repository/FlowRecordRepositoryImpl.java
@@ -68,4 +68,9 @@ public void finishFlowRecordByProcessId(String processId) {
     public void delete(List<FlowRecord> childrenRecords) {
         flowRecordEntityRepository.deleteAll(childrenRecords.stream().map(FlowRecordConvertor::convert).toList());
     }
+
+    @Override
+    public void deleteByProcessId(String processId) {
+        flowRecordEntityRepository.deleteByProcessId(processId);
+    }
 }
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.57</version>
+    <version>3.3.58</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.57</version>
+    <version>3.3.58</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>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.57</version>
+        <version>3.3.58</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>3.3.57</version>
+        <version>3.3.58</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>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowButtonType.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowButtonType.java
@@ -26,4 +26,6 @@ public enum FlowButtonType {
     CUSTOM,
     // 前端
     VIEW,
+    // 删除
+    REMOVE,
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowProcessRepository.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowProcessRepository.java
@@ -13,4 +13,6 @@ public interface FlowProcessRepository {
 
     FlowWork getFlowWorkByProcessId(String processId);
 
+    void deleteByProcessId(String processId);
+
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java
@@ -71,4 +71,6 @@ public interface FlowRecordRepository {
      */
     void delete(List<FlowRecord> childrenRecords);
 
+    void deleteByProcessId(String processId);
+
 }
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
@@ -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);
@@ -238,5 +240,14 @@ public void recall(long recordId, IFlowOperator currentOperator) {
         flowRecallService.recall(recordId, currentOperator);
     }
 
+    /**
+     * 删除流程
+     *
+     * @param recordId        流程记录id
+     * @param currentOperator 当前操作者
+     */
+    public void remove(long recordId, IFlowOperator currentOperator) {
+        flowRemoveService.remove(recordId, currentOperator);
+    }
 
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowRemoveService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowRemoveService.java
@@ -0,0 +1,51 @@
+package com.codingapi.springboot.flow.service.impl;
+
+import com.codingapi.springboot.flow.domain.FlowNode;
+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 lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@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());
+    }
+}
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowProcessRepositoryImpl.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowProcessRepositoryImpl.java
@@ -34,5 +34,8 @@ public FlowWork getFlowWorkByProcessId(String processId) {
         return flowBackup.resume(userRepository);
     }
 
-
+    @Override
+    public void deleteByProcessId(String processId) {
+        cache.removeIf(flowProcess -> flowProcess.getProcessId().equals(processId));
+    }
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowRecordRepositoryImpl.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowRecordRepositoryImpl.java
@@ -160,4 +160,9 @@ public void finishFlowRecordByProcessId(String processId) {
     public void delete(List<FlowRecord> childrenRecords) {
         cache.removeAll(childrenRecords);
     }
+
+    @Override
+    public void deleteByProcessId(String processId) {
+        cache.removeIf(record -> record.getProcessId().equals(processId));
+    }
 }
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>3.3.57</version>
+        <version>3.3.58</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>3.3.57</version>
+        <version>3.3.58</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 3.3.57
+CodingApi SpringBoot-Starter 3.3.58
 springboot version (${spring-boot.version})
 ------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ export async function startFlow(body:any) {`
`42`	`42`	`return post('/api/cmd/flowRecord/startFlow', body);`
`43`	`43`	`}`
`44`	`44`
	`45`	`+export async function removeFlow(body:any) {`
	`46`	`+ return post('/api/cmd/flowRecord/remove', body);`
	`47`	`+}`
	`48`	`+`
	`49`	`+`
`45`	`50`	`export async function detail(id?:any,workCode?:any) {`
`46`	`51`	`return get('/api/query/flowRecord/detail', {id,workCode});`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,11 @@ public Response urge(@RequestBody FlowCmd.UrgeFlow request) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`
	`103`	`+ @PostMapping("/remove")`
	`104`	`+ public Response remove(@RequestBody FlowCmd.RemoveFlow request) {`
	`105`	`+ User current = userRepository.getUserByUsername(request.getUserName());`
	`106`	`+ flowService.remove(request.getRecordId(), current);`
	`107`	`+ return Response.buildSuccess();`
	`108`	`+ }`
	`109`	`+`
`103`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,7 @@ public interface FlowProcessEntityRepository extends FastRepository<FlowProcessE`
`7`	`7`
`8`	`8`	`FlowProcessEntity getFlowProcessEntityByProcessId(String processId);`
`9`	`9`
	`10`	`+`
	`11`	`+ void deleteByProcessId(String processId);`
	`12`	`+`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,10 @@ public FlowWork getFlowWorkByProcessId(String processId) {`
`40`	`40`	`}`
`41`	`41`	`return null;`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+`
	`45`	`+ @Override`
	`46`	`+ public void deleteByProcessId(String processId) {`
	`47`	`+ flowProcessEntityRepository.deleteByProcessId(processId);`
	`48`	`+ }`
`43`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,9 @@ public void finishFlowRecordByProcessId(String processId) {`
`68`	`68`	`public void delete(List<FlowRecord> childrenRecords) {`
`69`	`69`	`flowRecordEntityRepository.deleteAll(childrenRecords.stream().map(FlowRecordConvertor::convert).toList());`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ @Override`
	`73`	`+ public void deleteByProcessId(String processId) {`
	`74`	`+ flowRecordEntityRepository.deleteByProcessId(processId);`
	`75`	`+ }`
`71`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@ public enum FlowButtonType {`
`26`	`26`	`CUSTOM,`
`27`	`27`	`// 前端`
`28`	`28`	`VIEW,`
	`29`	`+ // 删除`
	`30`	`+ REMOVE,`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ public interface FlowProcessRepository {`
`13`	`13`
`14`	`14`	`FlowWork getFlowWorkByProcessId(String processId);`
`15`	`15`
	`16`	`+ void deleteByProcessId(String processId);`
	`17`	`+`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,6 @@ public interface FlowRecordRepository {`
`71`	`71`	`*/`
`72`	`72`	`void delete(List<FlowRecord> childrenRecords);`
`73`	`73`
	`74`	`+ void deleteByProcessId(String processId);`
	`75`	`+`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,8 @@ public FlowWork getFlowWorkByProcessId(String processId) {`
`34`	`34`	`return flowBackup.resume(userRepository);`
`35`	`35`	`}`
`36`	`36`
`37`		`-`
	`37`	`+ @Override`
	`38`	`+ public void deleteByProcessId(String processId) {`
	`39`	`+ cache.removeIf(flowProcess -> flowProcess.getProcessId().equals(processId));`
	`40`	`+ }`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,9 @@ public void finishFlowRecordByProcessId(String processId) {`
`160`	`160`	`public void delete(List<FlowRecord> childrenRecords) {`
`161`	`161`	`cache.removeAll(childrenRecords);`
`162`	`162`	`}`
	`163`	`+`
	`164`	`+ @Override`
	`165`	`+ public void deleteByProcessId(String processId) {`
	`166`	`+ cache.removeIf(record -> record.getProcessId().equals(processId));`
	`167`	`+ }`
`163`	`168`	`}`