add ui

Author: xlorne

flow-engine-example/src/main/java/com/codingapi/example/security/MyAuthenticationTokenFilter.java

@@ -0,0 +1,31 @@
+package com.codingapi.example.security;
+
+import com.codingapi.example.entity.User;
+import com.codingapi.example.repository.UserRepository;
+import com.codingapi.springboot.framework.user.UserContext;
+import com.codingapi.springboot.security.filter.AuthenticationTokenFilter;
+import com.codingapi.springboot.security.gateway.TokenContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+
+@Component
+@AllArgsConstructor
+public class MyAuthenticationTokenFilter implements AuthenticationTokenFilter {
+
+    private final UserRepository userRepository;
+
+    @Override
+    public void doFilter(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        String userId = TokenContext.current().getExtra();
+        if (StringUtils.hasText(userId)) {
+            User user = userRepository.getUserById(Long.parseLong(userId));
+            UserContext.getInstance().setCurrent(user);
+        }
+    }
+}

flow-engine-example/src/main/java/com/codingapi/example/security/UserDetailServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.example.entity.User;
 import com.codingapi.example.repository.UserRepository;
+import com.codingapi.springboot.security.gateway.TokenContext;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -22,6 +23,8 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
             throw new UsernameNotFoundException("can't fond username " + username + " account");
         }
 
+        TokenContext.pushExtra(String.valueOf(user.getUserId()));
+
         return org.springframework.security.core.userdetails.User.builder()
                 .username(user.getAccount())
                 .password(user.getPassword())

flow-engine-framework/src/main/java/com/codingapi/flow/operator/IFlowOperator.java

@@ -1,9 +1,11 @@
 package com.codingapi.flow.operator;
 
+import com.codingapi.springboot.framework.user.IUser;
+
 /**
  * 流程参与用户
  */
-public interface IFlowOperator {
+public interface IFlowOperator extends IUser {
 
     /**
      * 获取用户ID

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/Workflow.java

@@ -162,8 +162,12 @@ public String toJson(boolean hasSchema) {
         map.put("id", id);
         map.put("code", code);
         map.put("title", title);
-        map.put("createdOperator", String.valueOf(createdOperator.getUserId()));
-        map.put("form", form.toMap());
+        if(createdOperator!=null) {
+            map.put("createdOperator", String.valueOf(createdOperator.getUserId()));
+        }
+        if(form!=null) {
+            map.put("form", form.toMap());
+        }
         map.put("operatorCreateScript", operatorCreateScript.getScript());
         map.put("nodes", nodes.stream().map(IFlowNode::toMap).toList());
         map.put("edges", edges);

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/WorkflowBuilder.java

@@ -87,9 +87,15 @@ public WorkflowBuilder edges(List<FlowEdge> edges) {
         return this;
     }
 
-    public Workflow build() {
-        workflow.verify();
+    public Workflow build(boolean verify) {
+        if(verify) {
+            workflow.verify();
+        }
         return workflow;
     }
 
+    public Workflow build() {
+        return this.build(true);
+    }
+
 }

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java

@@ -1,13 +1,16 @@
 package com.codingapi.flow.api.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.repository.WorkflowRepository;
 import com.codingapi.flow.workflow.Workflow;
 import com.codingapi.flow.workflow.WorkflowBuilder;
+import com.codingapi.springboot.framework.dto.request.IdRequest;
+import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.framework.dto.response.SingleResponse;
+import com.codingapi.springboot.framework.user.UserContext;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
@@ -17,12 +20,37 @@ public class WorkflowController {
 
     private final WorkflowRepository workflowRepository;
 
-    @GetMapping("/create")
-    public SingleResponse<Workflow> create() {
+    @PostMapping("/remove")
+    public Response remove(@RequestBody IdRequest request) {
+        Workflow workflow = workflowRepository.get(request.getStringId());
+        workflowRepository.delete(workflow);
+        return Response.buildSuccess();
+    }
+
+    @PostMapping("/create")
+    public SingleResponse<JSONObject> create() {
         Workflow workflow = WorkflowBuilder.builder()
-                .build();
-        workflowRepository.save(workflow);
-        return SingleResponse.of(workflow);
+                .build(false);
+        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson(true));
+        return SingleResponse.of(jsonObject);
+    }
+
+    @PostMapping("/save")
+    public Response save(@RequestBody JSONObject request) {
+        IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();
+        if(current!=null){
+            request.put("createdOperator",String.valueOf(current.getUserId()));
+        }
+        Workflow workflow =  Workflow.formJson(request.toJSONString());
+        System.out.println(workflow);
+        return Response.buildSuccess();
+    }
+
+    @GetMapping("/load")
+    public SingleResponse<JSONObject> load(String id) {
+        Workflow workflow = workflowRepository.get(id);
+        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson(true));
+        return SingleResponse.of(jsonObject);
     }
 
 }

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/convert/FlowOperatorConvertor.java

@@ -16,7 +16,7 @@ public Long convertToDatabaseColumn(IFlowOperator operator) {
 
     @Override
     public IFlowOperator convertToEntityAttribute(Long dbData) {
-        if(dbData<=0){
+        if(dbData==null || dbData<=0){
             return null;
         }
         return GatewayContext.getInstance().getFlowOperator(dbData);

frontend/packages/flow-design/package.json

@@ -26,6 +26,7 @@
     "@flow-engine/flow-types": "workspace:*",
     "@reduxjs/toolkit": "^2.11.2",
     "antd": "^6.2.1",
+    "dayjs": "^1.11.19",
     "react-redux": "^9.2.0"
   },
   "devDependencies": {

frontend/packages/flow-design/src/api/workflow.ts

@@ -2,4 +2,20 @@ import { httpClient } from ".";
 
 export const list = (request: any) => {
     return httpClient.page('/api/query/workflow/list', request, {}, {}, []);
+}
+
+export const remove = (id:string) => {
+    return httpClient.post('/api/cmd/workflow/remove',{id});
+}
+
+export const create = () => {
+    return httpClient.post('/api/cmd/workflow/create',{});
+}
+
+export const save = (body:any) => {
+    return httpClient.post('/api/cmd/workflow/save',body);
+}
+
+export const load = (id:string) => {
+    return httpClient.get('/api/cmd/workflow/load',{id});
 }

frontend/packages/flow-design/src/components/table/index.tsx

@@ -3,10 +3,8 @@ import { Table as AntdTable, TableProps as AntdTableProps,Flex,Space,Card } from
 
 
 export interface Result<T> {
-    data:{
-        total: number;
-        list: T[];
-    }
+    data:T[]
+    total: number;
     success: boolean
 }
 
@@ -57,8 +55,8 @@ export function Table<RecordType extends object = any>(props: TableProps<RecordT
             if (res.success) {
                 setCurrent(request.current);
                 setPageSize(request.pageSize);
-                setTotal(res.data.total);
-                setDataSource(res.data.list);
+                setTotal(res.total);
+                setDataSource(res.data);
             }
         })
     };
@@ -88,6 +86,8 @@ export function Table<RecordType extends object = any>(props: TableProps<RecordT
                            pageSize: pageSize,
                            current: current,
                            total: total,
+                           showSizeChanger: true,
+                           showQuickJumper: true,
                            defaultCurrent: defaultCurrent,
                            defaultPageSize: defaultPageSize,
                            onChange: (pageSize, current) => {