home 2 năm trước cách đây
mục cha
commit
f9f27f3d10

+ 9 - 5
hx-service-api/service-flow-api/src/main/java/com/fjhx/feign/IFlowClient.java

@@ -7,6 +7,8 @@ import com.fjhx.entity.process.ProcessTenant;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * File Feign接口类
@@ -14,26 +16,28 @@ import org.springframework.web.bind.annotation.PostMapping;
 @FeignClient(value = "service-flow")
 public interface IFlowClient {
 
-    String GET_PROCESS_TENANT = ClientConstant.API_PREFIX + "/getProcessTenantByCode";
-    String EXAMPLE_INFO_SAVE = ClientConstant.API_PREFIX + "/exampleInfoSave";
+    String GET_PROCESS_TENANT = ClientConstant.API_PREFIX + "/getProcessTenant";
     String GET_PROCESS_NODE_BUTTON_BY_PROCESS_TENANT_ID = ClientConstant.API_PREFIX + "/getProcessNodeButtonByProcessTenantId";
+    String EXAMPLE_INFO_SAVE = ClientConstant.API_PREFIX + "/exampleInfoSave";
 
     /**
      * 通过流程编码获取租户流程
      */
     @PostMapping(GET_PROCESS_TENANT)
-    R<ProcessTenant> getProcessTenant(Long businessId, String code);
+    R<ProcessTenant> getProcessTenant(@RequestParam("businessId") Long businessId, @RequestParam("code") String code);
 
     /**
      * 通过租户业务流程id获取开始节点按钮信息
      */
     @PostMapping(GET_PROCESS_NODE_BUTTON_BY_PROCESS_TENANT_ID)
-    R<ProcessNodeButton> getProcessNodeButtonByProcessTenantId(Long processTenantId, String processNodeCode);
+    R<ProcessNodeButton> getProcessNodeButtonByProcessTenantId(
+            @RequestParam("businessId") Long businessId,
+            @RequestParam("processNodeCode") String processNodeCode);
 
     /**
      * 保存流程实例
      */
     @PostMapping(EXAMPLE_INFO_SAVE)
-    R<ExampleInfo> exampleInfoSave(ExampleInfo exampleInfo);
+    R<ExampleInfo> exampleInfoSave(@RequestBody ExampleInfo exampleInfo);
 
 }

+ 13 - 3
hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/ExampleAbstract.java

@@ -1,7 +1,7 @@
 package com.fjhx.utils;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import lombok.Getter;
 import lombok.Setter;
 
 public abstract class ExampleAbstract {
@@ -10,13 +10,23 @@ public abstract class ExampleAbstract {
      * 流程缓存值
      */
     @Setter
-    private Object cacheData;
+    private String cacheData;
 
     /**
      * 获取缓存值
      */
     public <T> T getCacheData() {
-        return (T) JSONObject.parseObject(cacheData.toString());
+        if (ObjectUtil.isEmpty(cacheData)) {
+            return null;
+        }
+        return (T) JSONObject.parseObject(cacheData);
+    }
+
+    public void setCacheData(Object cacheData) {
+        if (ObjectUtil.isEmpty(cacheData)) {
+            return;
+        }
+        this.cacheData = JSONObject.toJSONString(cacheData);
     }
 
     /**

+ 1 - 2
hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/FlowConstructor.java

@@ -13,7 +13,7 @@ import org.springblade.core.tool.api.R;
 
 public class FlowConstructor {
 
-//    private static final
+    private static final IFlowClient flowClient = SpringUtil.getBean(IFlowClient.class);
 
     private ExampleAbstract exampleAbstract;
 
@@ -38,7 +38,6 @@ public class FlowConstructor {
      */
     public ExampleInfo create(Long businessId) {
 
-        IFlowClient flowClient = SpringUtil.getBean(IFlowClient.class);
 
         // 获取流程编码
         String code = exampleAbstract.getCode();