fix: 增加事件查看

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

@@ -96,6 +96,10 @@ public class SettingEngineController {
     public StResult getServiceMapping(String serviceName) {
         return StResult.success(settingService.getServiceMapping(serviceName));
     }
+    @GetMapping("/getQueryServiceRelated")
+    public StResult getQueryServiceRelated(String queryId) {
+        return StResult.success(settingService.getQueryServiceRelated(queryId));
+    }
 
     @GetMapping("/getEventService")
     public StResult getEventService(String serviceName) {
@@ -316,4 +320,8 @@ public class SettingEngineController {
     public StResult updatePrint(@RequestBody StPrint print) {
         return settingService.updatePrint(print.getFlowCode(), print.getContent());
     }
+    @GetMapping("/getScriptByFlowCode")
+    public StResult getScriptByFlowCode(String flowCode) {
+        return settingService.getScriptByFlowCode(flowCode);
+    }
 }

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

@@ -8,6 +8,8 @@ import com.cloud.sa.flow.commom.domain.virentity.StInstanceEvent;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author lc
@@ -17,23 +19,30 @@ import java.time.LocalDateTime;
 @RestController
 public class DemoEngineController {
     @GetMapping("/queryTest")
-    public JSONArray queryTest(String tt) {
-        if(StString.isNotEmpty(tt)){
+    public List<StInstanceEvent> queryTest(String tt) {
+        if (StString.isNotEmpty(tt)) {
             return null;
         }
-        JSONArray jsonArray = new JSONArray();
+//        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);
+//        }
+        List<StInstanceEvent> stInstanceEvents = new ArrayList<>();
         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);
+            StInstanceEvent stInstanceEvent = new StInstanceEvent();
+            stInstanceEvents.add(stInstanceEvent);
+            stInstanceEvent.setState(i);
         }
-        return jsonArray;
+        return stInstanceEvents;
     }
+
     @PostMapping("/eventTest")
     public JSONArray eventTest(@RequestBody StInstanceEvent event) {
         if (StString.isNotEmpty(event.toString())) {

bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/service/FlowUniversalService.java

@@ -3,6 +3,7 @@ package com.cloud.sa.service;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.cloud.sa.flow.commom.common.utils.StString;
 import com.cloud.sa.flow.commom.domain.common.EngineParams;
 import com.cloud.sa.flow.commom.domain.entity.StInstance;
 import com.cloud.sa.flow.commom.domain.entity.StTaskitem;
@@ -69,7 +70,7 @@ public class FlowUniversalService {
         Thread thread = new Thread(() -> {
             try {
                 Thread.sleep(10000);
-                StHttpRequest.postHttpClient("http://localhost:" + port + "/bpm/core/instance/autosubmit", JSON.toJSONString(flowEnteredParam),token);
+                StHttpRequest.postHttpClient(StString.getLocalHost(port) + "/bpm/core/instance/autosubmit", JSON.toJSONString(flowEnteredParam),token);
             } catch (Exception e) {
             }
         });

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/common/utils/StString.java

@@ -111,6 +111,10 @@ public class StString extends org.apache.commons.lang3.StringUtils {
         return !isEmpty(map);
     }
 
+    public static String getLocalHost(String port) {
+        return "http://localhost:" + port;
+    }
+
     /**
      * * 判断一个字符串是否为空串
      *

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/domain/mapper/StFormTemplateMapper.java

@@ -58,6 +58,7 @@ public interface StFormTemplateMapper {
 
     List<StScript> getScriptByFlowCode(String flowCode);
 
+    List<String> getScriptKeyByFlowCode(String flowCode);
     List<StScriptHistory> getScriptHistory(@Param("flowCode") String flowCode, @Param("key") String key);
 
     List<StFormTemplateHistory> getFormTemplateHistory(@Param("flowCode") String flowCode, @Param("type") String type);

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

@@ -16,10 +16,7 @@ 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.common.RedisKeys;
 import com.cloud.sa.flow.commom.domain.common.StGlobalConstant;
-import com.cloud.sa.flow.commom.domain.entity.StCommonComment;
-import com.cloud.sa.flow.commom.domain.entity.StFlowExceptional;
-import com.cloud.sa.flow.commom.domain.entity.StPrint;
-import com.cloud.sa.flow.commom.domain.entity.StPrintHistory;
+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;
@@ -75,7 +72,13 @@ public class StSettingService {
     @Value("${server.port}")
     private String port;
 
+    @Autowired
+    StFormTemplateMapper stFormTemplateMapper;
 
+    public StResult getScriptByFlowCode(String flowCode) {
+        List<String> scriptByFlowCode = stFormTemplateMapper.getScriptKeyByFlowCode(flowCode);
+        return StResult.success(scriptByFlowCode);
+    }
     //region 数据查询
     public synchronized void istQueryMain(StQueryMain queryMain) {
         //TODO 插入后，要预制columns,目前先让手动写
@@ -109,8 +112,9 @@ public class StSettingService {
 
     private List<Map<String, String>> getQuerySData(StQueryMain singleQueryMain, String query, String queryMapField) {
         if ("1".equals(singleQueryMain.getQueryType())) {
+            //如果是接口的
             try {
-                String url = "http://localhost:" + port + singleQueryMain.getQuerySql();
+                String url = StString.getLocalHost(port) + singleQueryMain.getQuerySql();
                 if (StString.isNotEmpty(queryMapField)) {
                     JSONArray jsonArray = JSONArray.parseArray(queryMapField);
                     for (Object item : jsonArray) {
@@ -166,6 +170,7 @@ public class StSettingService {
                 throw new RuntimeException(e);
             }
         } else {
+            //如果是sql的
             String sql = sqlGenerator.getQueryConcatSql(singleQueryMain.getQuerySql().replaceAll("\\s+$", "").replaceAll(";+$", ""), query);
             //将所有连续的空白字符替换为一个空格
             sql = sql.replaceAll("\\s{2,}", " ");
@@ -232,12 +237,24 @@ public class StSettingService {
         });
         return queryMainDTOS;
     }
+
+    public StResult getQueryServiceRelated(String queryId) {
+        List<Map<String, String>> queryDataList = commonMapper.getQueryDataList("" +
+                "select flow_code flowCode,flow_name flowName from st_flow_menu where flow_code in (\n" +
+                "select flow_code from st_form_template where content like '%\"queryService\":" + queryId + ",%'\n" +
+                "union \n" +
+                "select flow_code from st_form_template where content like '%\"queryService\": " + queryId + ",%')");
+        return StResult.success(queryDataList);
+    }
+
     public StQueryMainDTO getQueryMainSingleForMapping(Integer queryId) {
         StQueryMain singleQueryMain = settingMapper.getSingleQueryMain(queryId);
         singleQueryMain.initList();
         StQueryMainDTO queryMainDTO = StConvert.copy(singleQueryMain, StQueryMainDTO.class);
         return queryMainDTO;
     }
+
+
     //endregion
 
     /**

bound-link-api/sa-flow-common/src/main/resources/mapper/StFormTemplateMapper.xml

@@ -122,7 +122,11 @@
         FROM st_script
         WHERE flow_code = #{flowCode}
     </select>
-
+    <select id="getScriptKeyByFlowCode" resultType="java.lang.String">
+        SELECT key
+        FROM st_script
+        WHERE flow_code = #{flowCode}
+    </select>
     <select id="deleteAndInsertScript" parameterType="com.cloud.sa.flow.commom.domain.entity.StScript">
         DELETE
         from st_script