Merge pull request #123 from codingapi/dev

update version

Author: xlorne

flow-engine-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.24</version>
+        <version>0.0.25</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

flow-engine-example/src/main/java/com/codingapi/example/entity/User.java

@@ -2,7 +2,7 @@
 
 import com.codingapi.flow.context.GatewayContext;
 import com.codingapi.flow.operator.IFlowOperator;
-import com.codingapi.flow.session.FlowSession;
+import com.codingapi.flow.script.request.GroovyScriptRequest;
 import jakarta.persistence.*;
 import lombok.Data;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -30,7 +30,7 @@ public class User implements IFlowOperator {
     private String password;
 
 
-    public static User admin(PasswordEncoder passwordEncoder){
+    public static User admin(PasswordEncoder passwordEncoder) {
         User user = new User();
         user.setName(ADMIN_ACCOUNT);
         user.setAccount(ADMIN_ACCOUNT);
@@ -40,7 +40,7 @@ public static User admin(PasswordEncoder passwordEncoder){
     }
 
 
-    public void encodePassword(PasswordEncoder passwordEncoder){
+    public void encodePassword(PasswordEncoder passwordEncoder) {
         this.password = passwordEncoder.encode(password);
     }
 
@@ -65,8 +65,8 @@ public boolean isFlowManager() {
     }
 
     @Override
-    public IFlowOperator forwardOperator(FlowSession flowSession) {
-        if(flowOperatorId!=null && flowOperatorId > 0){
+    public IFlowOperator forwardOperator(GroovyScriptRequest request) {
+        if (flowOperatorId != null && flowOperatorId > 0) {
             return GatewayContext.getInstance().getFlowOperator(flowOperatorId);
         }
         return null;

flow-engine-framework/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.24</version>
+        <version>0.0.25</version>
     </parent>
 
     <name>flow-engine-framework</name>

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

@@ -1,5 +1,6 @@
 package com.codingapi.flow.operator;
 
+import com.codingapi.flow.script.request.GroovyScriptRequest;
 import com.codingapi.flow.session.FlowSession;
 import com.codingapi.springboot.framework.user.IUser;
 
@@ -35,10 +36,10 @@ public interface IFlowOperator extends IUser {
      * 转交审批人
      * 转交审批人不为空时，当前操作者将由转交审批人操作者执行
      *
-     * @param flowSession 流程会话上下文，可用于根据表单数据、当前节点等条件动态决定转交人
+     * @param request 流程会话上下文，可用于根据表单数据、当前节点等条件动态决定转交人
      * @return 转交后的审批人，如果无需转交返回null
      */
-    IFlowOperator forwardOperator(FlowSession flowSession);
+    IFlowOperator forwardOperator(GroovyScriptRequest request);
 
 
 }

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/OperatorMatchScript.java

@@ -1,7 +1,7 @@
 package com.codingapi.flow.script.node;
 
-import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.script.registry.ScriptRegistryContext;
+import com.codingapi.flow.script.request.GroovyWorkflowRequest;
 import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -15,8 +15,8 @@ public class OperatorMatchScript {
     @Getter
     private final String script;
 
-    public boolean execute(IFlowOperator current) {
-        return ScriptRuntimeContext.getInstance().run(script, Boolean.class, current);
+    public boolean execute(GroovyWorkflowRequest request) {
+        return ScriptRuntimeContext.getInstance().run(script, Boolean.class, request);
     }
 
     /**

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java

@@ -67,12 +67,6 @@ public class GroovyScriptRequest {
     @Getter
     private IFlowOperator submitOperator;
 
-    /**
-     * 流程提交人姓名
-     */
-    @Getter
-    private String submitOperatorName;
-
 
     private final FlowSession flowSession;
 

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyWorkflowRequest.java

@@ -0,0 +1,21 @@
+package com.codingapi.flow.script.request;
+
+import com.codingapi.flow.operator.IFlowOperator;
+import com.codingapi.flow.workflow.Workflow;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ *  流程groovy脚本请求对象 request
+ *  def run(request){
+ *      request.getOperatorName()
+ *  }
+ */
+@Getter
+@AllArgsConstructor
+public class GroovyWorkflowRequest {
+
+    private final IFlowOperator currentOperator;
+    private final Workflow workflow;
+
+}

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -11,6 +11,7 @@
 import com.codingapi.flow.pojo.request.FlowActionRequest;
 import com.codingapi.flow.pojo.request.FlowCreateRequest;
 import com.codingapi.flow.record.FlowRecord;
+import com.codingapi.flow.script.request.GroovyScriptRequest;
 import com.codingapi.flow.workflow.Workflow;
 import lombok.Getter;
 import lombok.Setter;
@@ -136,7 +137,8 @@ public boolean isMock(){
      */
     public IFlowOperator loadFinalForwardOperator(IFlowOperator currentOperator) {
         // 传递更新后的 session，确保 forwardOperator(FlowSession) 中的 currentOperator 是当前操作者
-        IFlowOperator forward = currentOperator.forwardOperator(this.updateSession(currentOperator));
+        GroovyScriptRequest request = new GroovyScriptRequest(this.updateSession(currentOperator));
+        IFlowOperator forward = currentOperator.forwardOperator(request);
         if (forward != null) {
             return this.loadFinalForwardOperator(forward);
         }

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

@@ -13,6 +13,7 @@
 import com.codingapi.flow.node.nodes.StartNode;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.script.node.OperatorMatchScript;
+import com.codingapi.flow.script.request.GroovyWorkflowRequest;
 import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy;
 import com.codingapi.flow.strategy.workflow.IWorkflowStrategy;
 import com.codingapi.flow.strategy.workflow.InterfereStrategy;
@@ -252,7 +253,8 @@ public WorkflowStrategyManager strategyManager() {
      * @return 是否匹配
      */
     public boolean matchCreatedOperator(IFlowOperator flowOperator) {
-        return operatorCreateScript.execute(flowOperator);
+        GroovyWorkflowRequest request = new GroovyWorkflowRequest(flowOperator,this);
+        return operatorCreateScript.execute(request);
     }
 
     /**

flow-engine-framework/src/test/java/com/codingapi/flow/script/OperatorMatchScriptTest.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.script.node.OperatorMatchScript;
+import com.codingapi.flow.script.request.GroovyWorkflowRequest;
 import com.codingapi.flow.user.User;
 import org.junit.jupiter.api.Test;
 
@@ -13,6 +14,6 @@ class OperatorMatchScriptTest {
     void execute() {
         IFlowOperator flowOperator = new User(1, "lorne");
         OperatorMatchScript operatorMatchScript = OperatorMatchScript.any();
-        assertTrue(operatorMatchScript.execute(flowOperator));
+        assertTrue(operatorMatchScript.execute(new GroovyWorkflowRequest(flowOperator,null)));
     }
 }