流程配置

hx-file/src/test/java/Main.java

@@ -8,8 +8,8 @@ public class Main {
                 .username("fjhx2012mysql")
                 .password("3PN-Mzn#vnP&q6d")
                 .port(9989)
-                .module("hx-tenant")
-                .parent("com.fjhx.tenant")
+                .module("hx-flow")
+                .parent("com.fjhx.flow")
                 .superServiceClass("com.ruoyi.common.core.service.BaseService")
                 .build();
     }

hx-flow/src/main/java/com/fjhx/flow/core/FlowBean.java

@@ -30,11 +30,17 @@ public class FlowBean {
      * @return springBean
      */
     public static FlowDelegate getBean(String flowKey) {
+
         String beanBane = map.get(flowKey);
+        if (beanBane == null) {
+            throw new ServiceException("没有把流程 " + flowKey + " 注册到spring中");
+        }
+
         FlowDelegate bean = SpringUtil.getBean(beanBane);
         if (bean == null) {
             throw new ServiceException("没有把流程 " + flowKey + " 注册到spring中");
         }
+
         return bean;
     }
 

hx-flow/src/main/java/com/fjhx/flow/core/FlowDelegate.java

@@ -43,8 +43,9 @@ public abstract class FlowDelegate {
      * 结束流程实现类
      *
      * @param flowId     流程id
+     * @param businessId 业务id
      * @param submitData 流程入参
      */
-    public abstract void end(Long flowId, JSONObject submitData);
+    public abstract void end(Long flowId, Long businessId, JSONObject submitData);
 
 }

hx-flow/src/main/java/com/fjhx/flow/core/FlowThreadLocalUtil.java

@@ -8,56 +8,56 @@ import java.util.Map;
 
 public class FlowThreadLocalUtil {
 
-    private static final ThreadLocal<FlowThreadLocalData> FLOW_HOLDER = new NamedThreadLocal<>("saas-flow");
+    private static final ThreadLocal<FlowThreadLocalData> FLOW_HOLDER = new NamedThreadLocal<>("hx-flow");
 
     public static Long getFlowId() {
         return getData().getFlowId();
     }
-
     public static void setFlowId(Long flowId) {
         getData().setFlowId(flowId);
     }
 
+
     public static Long getBusinessId() {
         return getData().getBusinessId();
     }
-
     public static void setBusinessId(Long businessId) {
         getData().setBusinessId(businessId);
     }
 
+
     public static JSONObject getCurrentData() {
         return getData().getCurrentData();
     }
-
     public static void setCurrentData(JSONObject currentData) {
         getData().setCurrentData(currentData);
     }
 
+
     public static JSONObject getStartData() {
         return getData().getStartData();
     }
-
     public static void setStartData(JSONObject startData) {
         getData().setStartData(startData);
     }
 
+
     public static Map<String, Object> getTemplateData() {
         return getData().getTemplateData();
     }
-
     public static void setTemplateData(Map<String, Object> templateData) {
         getData().setTemplateData(templateData);
     }
 
+
     public static HandleTypeEnum getHandleTypeEnum() {
         return getData().getHandleTypeEnum();
     }
-
     public static void setHandleTypeEnum(HandleTypeEnum handleTypeEnum) {
         getData().setHandleTypeEnum(handleTypeEnum);
     }
 
+
     private static FlowThreadLocalData getData() {
         FlowThreadLocalData flowThreadLocalData = FLOW_HOLDER.get();
         if (flowThreadLocalData == null) {

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -371,7 +371,10 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 invokeMethod(flowDelegate, handlingMethod);
             } else {
                 // 执行默认方法
-                flowDelegate.end(FlowThreadLocalUtil.getFlowId(), FlowThreadLocalUtil.getCurrentData());
+                flowDelegate.end(
+                        FlowThreadLocalUtil.getFlowId(),
+                        FlowThreadLocalUtil.getBusinessId(),
+                        FlowThreadLocalUtil.getCurrentData());
             }
         } catch (Exception e) {
             log.error("结束节点方法异常", e);

ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/holder/LogicHolder.java

@@ -11,7 +11,7 @@ import org.springframework.core.NamedThreadLocal;
 @Setter
 public class LogicHolder {
 
-    private static final ThreadLocal<LogicHolder> LOGIC_KEY_HOLDER = new NamedThreadLocal<>("saas-delFlag");
+    private static final ThreadLocal<LogicHolder> LOGIC_KEY_HOLDER = new NamedThreadLocal<>("hx-delFlag");
     /**
      * 排除表名
      */

ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/holder/TenantHolder.java

@@ -7,7 +7,7 @@ import org.springframework.core.NamedThreadLocal;
  */
 public class TenantHolder {
 
-    private static final ThreadLocal<Boolean> TENANT_KEY_HOLDER = new NamedThreadLocal<Boolean>("saas-tenant") {
+    private static final ThreadLocal<Boolean> TENANT_KEY_HOLDER = new NamedThreadLocal<Boolean>("hx-tenant") {
         @Override
         protected Boolean initialValue() {
             return Boolean.FALSE;