Merge pull request #74 from codingapi/dev

Dev

Author: xlorne

.DS_Store

@@ -18,6 +18,7 @@ v.3.x 为springboot 3.x版本,使用jdk17版本
 
 * springboot-starter | Springboot领域驱动框架
 * springboot-starter-data-fast | 快速数据呈现框架
+* springboot-starter-flow | 流程引擎框架
 * springboot-starter-security | security权限框架支持基于JWT的无状态权限认证与Redis的有状态权限认证
 
 ## SpringBoot DDD Architecture | SpringBoot DDD 框架图
@@ -41,6 +42,13 @@ v.3.x 为springboot 3.x版本,使用jdk17版本
         <version>${last.version}</version>
     </dependency>
     
+     <!-- 快速数据呈现框架 -->
+     <dependency>
+        <groupId>com.codingapi.springboot</groupId>
+        <artifactId>springboot-starter-flow</artifactId>
+        <version>${last.version}</version>
+    </dependency>
+    
      <!-- security&jwt权限框架 -->
      <dependency>
         <groupId>com.codingapi.springboot</groupId>

README.md

@@ -3,7 +3,7 @@
 class GroovyScript {
 
     public static defaultOutTrigger = "def run(content) {return true;}";
-    public static defaultTitleGenerator = "def run(content){ return content.getCreateOperator().getName() + \'-\' + content.getFlowWork().getTitle() + \'-\' + content.getFlowNode().getName();}";
+    public static defaultTitleGenerator = "def run(content){ return content.getCurrentOperator().getName() + '-' + content.getFlowWork().getTitle() + '-' + content.getFlowNode().getName();}";
 
     public static anyOperatorMatcher="def run(content) {return [content.getCurrentOperator().getUserId()];}";
     public static creatorOperatorMatcher="def run(content) {return [content.getCreateOperator().getUserId()];}";

admin-ui/src/components/Flow/utils/script.ts

@@ -92,7 +92,7 @@ const LeavePage = () => {
                 >
 
                     <ProFormText
-                        name={"flowId"}
+                        name={"flowCode"}
                         hidden={true}
                     />
 
@@ -143,7 +143,7 @@ const LeavePage = () => {
 
                 <FlowSelect visible={flowSelectVisible} setVisible={setFlowSelectVisible} onSelect={(flow) => {
 
-                    form.setFieldValue('flowId', flow.id);
+                    form.setFieldValue('flowCode', flow.code);
                     form.setFieldValue('flowName', flow.title);
 
                 }}/>

admin-ui/src/pages/flow/leave/index.tsx

@@ -75,6 +75,10 @@ const FlowPage = () => {
             dataIndex: 'id',
             search: false,
         },
+        {
+            title: '编码',
+            dataIndex: 'code',
+        },
         {
             title: '标题',
             dataIndex: 'title',
@@ -218,6 +222,17 @@ const FlowPage = () => {
                     ]}
                 />
 
+                <ProFormText
+                    name={"code"}
+                    label={"编码"}
+                    rules={[
+                        {
+                            required: true,
+                            message: "请输入编码"
+                        }
+                    ]}
+                />
+
                 <ProFormTextArea
                     name={"description"}
                     label={"描述"}

admin-ui/src/pages/flow/work/index.tsx

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-application/pom.xml

@@ -3,7 +3,8 @@
 import com.codingapi.example.domain.User;
 import com.codingapi.example.pojo.cmd.FlowCmd;
 import com.codingapi.example.repository.UserRepository;
-import com.codingapi.springboot.flow.pojo.FlowDetail;
+import com.codingapi.springboot.flow.pojo.FlowResult;
+import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.service.FlowService;
 import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.framework.dto.response.SingleResponse;
@@ -24,22 +25,20 @@ public class FlowRecordCmdController {
     private final UserRepository userRepository;
 
     @PostMapping("/startFlow")
-    public Response startFlow(@RequestBody FlowCmd.StartFlow request) {
+    public SingleResponse<FlowResult> startFlow(@RequestBody FlowCmd.StartFlow request) {
         User current = userRepository.getUserByUsername(request.getUserName());
-        flowService.startFlow(request.getWorkId(), current, request.getBindData(), request.getAdvice());
-        return Response.buildSuccess();
+        return SingleResponse.of(flowService.startFlow(request.getWorkCode(), current, request.getBindData(), request.getAdvice()));
     }
 
 
     @PostMapping("/submitFlow")
-    public Response submitFlow(@RequestBody FlowCmd.SubmitFlow request) {
+    public SingleResponse<FlowResult> submitFlow(@RequestBody FlowCmd.SubmitFlow request) {
         User current = userRepository.getUserByUsername(request.getUserName());
         if(current.isFlowManager()){
-            flowService.interfere(request.getRecordId(), current, request.getBindData(), request.getOpinion());
+            return SingleResponse.of(flowService.interfere(request.getRecordId(), current, request.getBindData(), request.getOpinion()));
         }else {
-            flowService.submitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion());
+            return SingleResponse.of(flowService.submitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion()));
         }
-        return Response.buildSuccess();
     }
 
 

example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java

@@ -4,8 +4,9 @@
 import com.codingapi.example.domain.User;
 import com.codingapi.example.pojo.cmd.LeaveCmd;
 import com.codingapi.example.repository.UserRepository;
+import com.codingapi.springboot.flow.pojo.FlowResult;
 import com.codingapi.springboot.flow.service.FlowService;
-import com.codingapi.springboot.framework.dto.response.Response;
+import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@ public class LeaveCmdController {
 
 
     @PostMapping("/startLeave")
-    public Response startLeave(@RequestBody LeaveCmd.StartLeave request) {
+    public SingleResponse<FlowResult> startLeave(@RequestBody LeaveCmd.StartLeave request) {
         User user = userRepository.getUserByUsername(request.getUsername());
 
         Leave leave = new Leave();
@@ -31,8 +32,6 @@ public Response startLeave(@RequestBody LeaveCmd.StartLeave request) {
         leave.setDays(request.getDays());
         leave.setCreateTime(System.currentTimeMillis());
 
-        flowService.startFlow(request.getFlowId(), user, leave, request.getDesc());
-
-        return Response.buildSuccess();
+        return SingleResponse.of(flowService.startFlow(request.getFlowCode(), user, leave, request.getDesc()));
     }
 }

example/example-application/src/main/java/com/codingapi/example/command/LeaveCmdController.java

@@ -14,7 +14,7 @@ public class FlowCmd {
     @Getter
     public static class StartFlow {
 
-        private long workId;
+        private String workCode;
         private String advice;
         private JSONObject formData;
 

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java

@@ -13,6 +13,7 @@ public static class CreateRequest{
 
         private long id;
         private String title;
+        private String code;
         private String description;
         private int postponedMax;