Explorar el Código

fix: 流程优化

liuc hace 5 meses
padre
commit
a1868ad602

+ 4 - 1
bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/SettingEngineController.java

@@ -303,7 +303,10 @@ public class SettingEngineController {
         List<TreeNode> treeNodes = organizeService.buildDeptSelectUserTreeSearch(searchText);
         return ResponseDTO.ok(treeNodes);
     }
-
+    @GetMapping("/getQueryMainSingleForMapping")
+    public StResult getQueryMainSingleForMapping(Integer queryId) {
+        return StResult.success(settingService.getQueryMainSingleForMapping(queryId));
+    }
     @GetMapping("/getPrint")
     public StResult getPrint(String flowCode) {
         return settingService.getPrint(flowCode);

+ 19 - 19
bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/demo/DemoEngineController.java

@@ -2,30 +2,12 @@ package com.cloud.sa.demo;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.cloud.sa.flow.commom.aspect.EventProgram;
-import com.cloud.sa.flow.commom.common.model.StResult;
-import com.cloud.sa.flow.commom.common.system.StUserInfo;
 import com.cloud.sa.flow.commom.common.utils.StConvert;
 import com.cloud.sa.flow.commom.common.utils.StString;
-import com.cloud.sa.flow.commom.domain.entity.*;
-import com.cloud.sa.flow.commom.domain.entity.setting.StEventAdditive;
-import com.cloud.sa.flow.commom.domain.entity.setting.StEventMain;
-import com.cloud.sa.flow.commom.domain.entity.setting.StQueryMain;
-import com.cloud.sa.flow.commom.domain.virentity.TreeNode;
-import com.cloud.sa.flow.commom.service.StMenuService;
-import com.cloud.sa.flow.commom.service.StOrganizeService;
-import com.cloud.sa.flow.commom.service.setting.StAdmitService;
-import com.cloud.sa.flow.commom.service.setting.StSettingService;
-import com.cloud.sa.flow.commom.service.setting.StTaskAgentService;
-import com.cloud.sa.flow.engine.service.StFlowService;
-import com.wx.blink.base.common.annoation.NoNeedLogin;
-import com.wx.blink.base.common.domain.ResponseDTO;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.cloud.sa.flow.commom.domain.virentity.StInstanceEvent;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author lc
@@ -52,4 +34,22 @@ public class DemoEngineController {
         }
         return jsonArray;
     }
+    @PostMapping("/eventTest")
+    public JSONArray eventTest(@RequestBody StInstanceEvent event) {
+        if (StString.isNotEmpty(event.toString())) {
+            return null;
+        }
+        JSONArray jsonArray = new JSONArray();
+        for (int i = 0; i < 10; i++) {
+            JSONObject jsonObject = new JSONObject();
+            jsonArray.add(jsonObject);
+            //所有值必须是字符串,否则前端无法获取
+            jsonObject.put("code", StConvert.toStr(i));
+            jsonObject.put("name", i + "name");
+            jsonObject.put("address", LocalDateTime.now().toString());
+            jsonObject.put("address3", i + "address");
+            jsonObject.put("address2", null);
+        }
+        return jsonArray;
+    }
 }

+ 6 - 0
bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/service/setting/StSettingService.java

@@ -232,6 +232,12 @@ public class StSettingService {
         });
         return queryMainDTOS;
     }
+    public StQueryMainDTO getQueryMainSingleForMapping(Integer queryId) {
+        StQueryMain singleQueryMain = settingMapper.getSingleQueryMain(queryId);
+        singleQueryMain.initList();
+        StQueryMainDTO queryMainDTO = StConvert.copy(singleQueryMain, StQueryMainDTO.class);
+        return queryMainDTO;
+    }
     //endregion
 
     /**