修改 数据库查询为同步

src/main/java/com/scbfkj/uni/api/LogAop.java

@@ -29,7 +29,7 @@ public class LogAop {
     @Resource
     private SecurityService securityService;
 
-    @Around(value = "within( com.scbfkj.uni.api.*Api)")
+    @Around(value = "within(com.scbfkj.uni.api.*Api)")
     public ResponseEntity<Map<String, Object>> invokeAround(ProceedingJoinPoint joinPoint) {
         LocalDateTime requestTime = LocalDateTime.now();
 //        请求
@@ -41,7 +41,6 @@ public class LogAop {
         ResponseEntity<Map<String, Object>> returnData = null;
         String message = null;
 
-
         if (Config.isDebug()) {
             System.out.println("请求参数：" + DataFormatUtil.toString(args));
             System.out.println("请求路径：" + uri);

src/main/java/com/scbfkj/uni/library/UniReturnUtil.java

@@ -1,5 +1,6 @@
 package com.scbfkj.uni.library;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -69,6 +70,9 @@ public class UniReturnUtil {
     }
 
     public static String getMessage(Throwable e) {
+        if (e instanceof InvocationTargetException ex) {
+            e = ex.getTargetException();
+        }
         String detailMessage = Arrays.stream(e.getStackTrace()).limit(8).map(it -> "%s.%s:%s".formatted(it.getClassName(), it.getMethodName(), it.getLineNumber())).collect(Collectors.joining("\n"));
         return """
                 异常消息：%s, 错误详情:%s

src/main/java/com/scbfkj/uni/library/script/DatabaseScriptUtil.java

@@ -38,12 +38,15 @@ public class DatabaseScriptUtil {
         if (isTableName) {
             List<String> valueNames = null;
             List<String> filterNames = null;
+
+            List<String> allColumns = DataBase.getColumnsByTableName(connectionStr, expression);
+
 //            查询
             if (Objects.equals("0", event)) {
-                Map<String, Object> argMap = args.get(0);
+                Map<String, Object> argMap = Objects.isNull(args) || args.isEmpty() ? new HashMap<>() : args.get(0);
 
                 Object filter = argMap.getOrDefault("filter", argMap);
-                Map map = null;
+                Map map = new HashMap<>();
                 if (filter instanceof ArrayNode f) {
                     map = ((Map<?, ?>) f.get(0));
                 } else if (filter instanceof List<?> f) {
@@ -74,7 +77,7 @@ public class DatabaseScriptUtil {
                             objects.add(map.get("value"));
                         }
                     }
-                    expression = "select * from %s where %s and %s".formatted(expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr, whereStr.trim().isEmpty() ? " 1=? " : whereStr);
+                    expression = "select %s from %s where %s and %s".formatted(String.join(",", allColumns), expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr, whereStr.trim().isEmpty() ? " 1=? " : whereStr);
                     if (whereStr.trim().isEmpty()) {
                         values.add(new Object[]{1});
                     } else {
@@ -83,7 +86,10 @@ public class DatabaseScriptUtil {
                 } else {
                     filterNames = map.keySet().stream().toList();
 
-                    expression = "select * from %s where %s and  %s".formatted(expression, filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")), Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+                    expression = "select %s from %s where   %s  %s".formatted(String.join(",", allColumns), expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr,
+                            filterNames.isEmpty() ?
+                                    "" : (" and " +
+                                    filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and "))));
 
                     for (Map<String, Object> arg : args) {
                         Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
@@ -94,8 +100,8 @@ public class DatabaseScriptUtil {
                 if (!filterColumns.isEmpty()) {
                     expression = "select %s from (%s) as T".formatted(String.join(",", filterColumns), expression);
                 }
-                if (pageable != null && !expression.contains(" limit ")) {
-                    expression = "select * from (%s) TA limit %d,%d ".formatted(expression, pageable.page * pageable.pageSize, pageable.pageSize);
+                if (pageable != null) {
+                    expression = "%s limit %d,%d ".formatted(expression, pageable.page * pageable.pageSize, pageable.pageSize);
                 }
                 List<Map<String, Object>> result = DataBase.queryBatch(connectionStr, expression, values);
                 return UniReturnUtil.success(result);
@@ -176,6 +182,12 @@ public class DatabaseScriptUtil {
                     }
                     filterNames = map.keySet().stream().toList();
                     expression = "delete from %s where %s and  %s".formatted(expression, filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")), Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+                } else if (Objects.equals("7", event)) {
+//                    先删除
+                    exec(connectionStr, expression, args, "3", filterColumns, filterLines, pageable);
+//                    再新增
+                    return exec(connectionStr, expression, args, "1", filterColumns, filterLines, pageable);
+
                 }
                 List<Object[]> values = new ArrayList<>();
 //                按照名称 和过滤条件取值
@@ -239,7 +251,7 @@ public class DatabaseScriptUtil {
             }
 
             if (pageable != null && !sql.contains(" limit ")) {
-                sql = "select * from (%s) TA limit %d,%d ".formatted(sql, pageable.page * pageable.pageSize, pageable.pageSize);
+                sql = "%s limit %d,%d ".formatted(sql, pageable.page * pageable.pageSize, pageable.pageSize);
             }
             List<Map<String, Object>> queryResult = DataBase.queryBatch(connectionStr, sql, Collections.singletonList(dbFilter.toArray()));
             return UniReturnUtil.success(queryResult);
@@ -337,8 +349,8 @@ public class DatabaseScriptUtil {
                 result.add(args);
             }
 
-            if (pageable != null && !newSql.contains(" limit ")) {
-                newSql = "select * from (%s) TA limit %d,%d ".formatted(newSql, pageable.page * pageable.pageSize, pageable.pageSize);
+            if (pageable != null) {
+                newSql = "%s limit %d,%d ".formatted(newSql, pageable.page * pageable.pageSize, pageable.pageSize);
             }
             return DataBase.queryBatch(connectionStr, newSql, result.stream().map(List::toArray).toList());
         }

src/main/java/com/scbfkj/uni/library/script/JavaScriptEngineUtil.java

@@ -41,7 +41,7 @@ public class JavaScriptEngineUtil {
                 }
 
                 Class<?> classExample = classLoader.loadClass(className.asText()); //获取类实例
-                Object classInstance = classExample.getConstructor().newInstance();//类实例接口 无参数构造
+//                Object classInstance = classExample.getConstructor().newInstance();//类实例接口 无参数构造
                 Method javaMethod = null;
                 Method closeMethod = null;
                 for (Method currentMethod : classExample.getMethods()) {//循环所有方法
@@ -52,7 +52,7 @@ public class JavaScriptEngineUtil {
                         closeMethod = currentMethod;
                     }
                 }
-                return new JavaApply(classInstance, javaMethod, closeMethod);
+                return new JavaApply(null, javaMethod, closeMethod);
             } finally {
                 if (Objects.nonNull(classLoader)) {
                     if (classLoader instanceof URLClassLoader cl) {

src/main/java/com/scbfkj/uni/library/script/JsScriptEngineUtil.java

@@ -12,17 +12,13 @@ import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 
 public final class JsScriptEngineUtil {
 
-    private final static String TO_STRING_SCRIPT = """
+    private static final String TO_STRING_SCRIPT = """
             (value) => {
                 if (typeof value === 'string') return value
                 return JSON.stringify(value);
@@ -30,7 +26,7 @@ public final class JsScriptEngineUtil {
             """;
 
 
-    private final static KeyedObjectPool<String, Value> scriptPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<String, Value>() {
+    private static final KeyedObjectPool<String, Value> scriptPool = new GenericKeyedObjectPool<>(new BaseKeyedPooledObjectFactory<>() {
         @Override
         public Value create(String script) throws Exception {
             return Context.create("js").eval(Source.create("js", script));
@@ -54,7 +50,6 @@ public final class JsScriptEngineUtil {
             function = scriptPool.borrowObject(script);
             if (function.canExecute()) {
                 Value result = function.execute(Arrays.stream(args).map(Value::asValue).toArray());
-                System.out.println(DataFormatUtil.toString(result));
                 return UniReturnUtil.success(toHostObject(result));
             } else {
                 return UniReturnUtil.success(toString(function));
@@ -66,64 +61,17 @@ public final class JsScriptEngineUtil {
         } finally {
             if (Objects.nonNull(function)) {
                 scriptPool.returnObject(script, function);
-
             }
         }
     }
 
     public static Object toHostObject(Value result) throws Exception {
+
         if (result.isString()) {
             return result.asString();
-        } else if (result.isBoolean()) {
-            return result.asBoolean();
-        } else if (result.isNumber()) {
-            if (result.fitsInShort()) {
-                return result.asShort();
-            }
-            if (result.fitsInInt()) {
-                return result.asInt();
-            }
-            if (result.fitsInLong()) {
-                return result.asLong();
-            }
-            if (result.fitsInFloat()) {
-                return result.asFloat();
-            }
-            if (result.fitsInDouble()) {
-                return result.asDouble();
-            }
-            if (result.fitsInBigInteger()) {
-                return result.asBigInteger();
-            }
-            if (result.fitsInByte()) {
-                return result.asByte();
-            }
-        } else if (result.isInstant()) {
-            Instant instant = result.asInstant();
-            return LocalDateTime.now(ZoneId.from(instant));
-        } else if (result.isNull()) {
-            return null;
-        } else if (result.isHostObject()) {
-            return result.asHostObject();
-        } else if (result.hasIterator()) {
-            ArrayList<Object> objects = new ArrayList<>();
-            Value iterator = result.getIterator();
-
-            while (iterator.hasIteratorNextElement()) {
-                Value next = iterator.getIteratorNextElement();
-                objects.add(toHostObject(next));
-            }
-            return objects;
-        }
-        try {
-            return result.as(Map.class);
-        } catch (Exception e) {
-            try {
-                return result.as(Object.class);
-            } catch (Exception e2) {
-                return DataFormatUtil.toString(result);
-            }
         }
+        String string = toString(result);
+        return DataFormatUtil.toJsonNode(string);
     }
 
     private static String toString(Value value) throws Exception {

src/main/java/com/scbfkj/uni/process/DataBase.java

@@ -18,7 +18,7 @@ public class DataBase {
     private static final Map<String, List<String>> columns = new HashMap<>();
     private static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
 
-    public static List<Map<String, Object>> queryBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
+    public synchronized static List<Map<String, Object>> queryBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
 
 //        缓存数据 connectionStr + sql
 
@@ -33,7 +33,6 @@ public class DataBase {
             } else {
                 return ((List<Map<String, Object>>) cacheData.get("data"));
             }
-
         }
 
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
@@ -47,10 +46,9 @@ public class DataBase {
                 ResultSet resultSet = preparedStatement.executeQuery();
                 return getResult(connectionStr, sql, resultSet).stream();
             } catch (Exception exception) {
-                throw new RuntimeException("数据异常: %s\n sql: %s ;\n args: %s ".formatted(exception.getMessage(), sql, DataFormatUtil.toDate(args)));
+                throw new RuntimeException("数据异常: %s\n sql: %s ;\n args: %s ".formatted(exception.getMessage(), sql, DataFormatUtil.toString(args)));
             }
         }).toList();
-
         String querySql = """
                 select
                     datacacheid, connectset, querysql, querytable, effectiveduration, datacachedescribe
@@ -58,15 +56,20 @@ public class DataBase {
         if (!Objects.equals(querySql, sql)) {
             cacheConfigList = query(Config.getCenterConnectionStr(), querySql);
         }
+        List<Map<String, Object>> finalResult = result;
+        saveCacheData(connectionStr, sql, key, effectivedurationColumnName, finalResult);
+        return result;
+    }
+
+    private static void saveCacheData(String connectionStr, String sql, String key, String effectivedurationColumnName, List<Map<String, Object>> finalResult) {
         cacheConfigList.stream().filter(it -> Objects.equals(it.get("querysql"), sql) && Objects.equals(it.get("connectset"), connectionStr)).findFirst().ifPresent(it -> {
             Object o = it.get(effectivedurationColumnName);
             LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(Long.parseLong(o.toString()));
             HashMap<String, Object> data = new HashMap<>();
             data.put(effectivedurationColumnName, localDateTime);
-            data.put("data", result);
+            data.put("data", finalResult);
             cacheDatas.put(key, data);
         });
-        return result;
     }
 
     public static List<Map<String, Object>> query(String connectionStr, String sql, Object... args) throws Exception {
@@ -108,14 +111,7 @@ public class DataBase {
         if (!Objects.equals(querySql, sql)) {
             cacheConfigList = query(Config.getCenterConnectionStr(), querySql);
         }
-        cacheConfigList.stream().filter(it -> Objects.equals(it.get("querysql"), sql) && Objects.equals(it.get("connectset"), connectionStr)).findFirst().ifPresent(it -> {
-            Object o = it.get(effectivedurationColumnName);
-            LocalDateTime localDateTime = LocalDateTime.now().plusSeconds(Long.parseLong(o.toString()));
-            HashMap<String, Object> data = new HashMap<>();
-            data.put(effectivedurationColumnName, localDateTime);
-            data.put("data", result);
-            cacheDatas.put(key, data);
-        });
+        saveCacheData(connectionStr, sql, key, effectivedurationColumnName, result);
         return result;
     }
 
@@ -260,7 +256,7 @@ public class DataBase {
         return new HikariPool(hikariConfig);
     }
 
-    private static List<String> getColumns(String connection, String sql, ResultSet resultSet) throws SQLException {
+    public static List<String> getColumns(String connection, String sql, ResultSet resultSet) throws SQLException {
         if (columns.containsKey(connection + sql)) {
             return columns.get(connection + sql);
         }
@@ -273,6 +269,26 @@ public class DataBase {
         return names;
     }
 
+    public static List<String> getColumnsByTableName(String connection, String tabelName) throws SQLException {
+        if (columns.containsKey(connection + tabelName)) {
+            return columns.get(connection + tabelName);
+        }
+        ResultSet resultSet;
+        try (Connection conn = getDataSourcePool(connection).getConnection();
+             PreparedStatement preparedStatement = conn.prepareStatement("select * from %s".formatted(tabelName))) {
+            resultSet = preparedStatement.executeQuery();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        ArrayList<String> names = new ArrayList<>();
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        for (int i = 0; i < metaData.getColumnCount(); i++) {
+            names.add(metaData.getColumnName(i + 1));
+        }
+        columns.put(connection + tabelName, names);
+        return names;
+    }
+
     public static List<Map<String, Object>> getResult(String connection, String sql, ResultSet resultSet) throws SQLException {
         List<String> cs = getColumns(connection, sql, resultSet);
         List<Map<String, Object>> result = new ArrayList<>();

src/main/java/com/scbfkj/uni/service/ControlService.java

@@ -7,6 +7,7 @@ import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 import com.scbfkj.uni.system.ScheduleUtil;
 
+import java.io.File;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ public class ControlService {
     private final static String SERVICE_ID = "serviceid";
     private final static String CODE = "code";
 
-    public static Map<String, Object> stopServiceByContainerCode() {
+    public static Map<String, Object> stopServiceByContainerCode(String containerCode) {
 
 //        查询服务类型为主动采集的服务
 
@@ -30,7 +31,7 @@ public class ControlService {
 //        循环启动
 
             Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
-                    .map(it -> stop(it.get(SERVICE_ID).toString()))
+                    .map(it -> stop(it.get(SERVICE_ID).toString(), containerCode))
                     .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
             return UniReturnUtil.success(results);
         } catch (Exception e) {
@@ -38,13 +39,13 @@ public class ControlService {
         }
     }
 
-    public static Map<String, Object> startServiceByContainerCode() {
+    public static Map<String, Object> startServiceByContainerCode(String containerCode) {
 
 //        查询服务类型为主动采集的服务
         try {
             List<Map<String, Object>> serviceInfos = DataBase.query(Config.getCenterConnectionStr(), SERVICEINFO_WHERE_CONTAINERCODE, Config.getContainerCode());
             Map<String, List<Map<String, Object>>> results = serviceInfos.stream()
-                    .map(it -> start(it.get(SERVICE_ID).toString()))
+                    .map(it -> start(it.get(SERVICE_ID).toString(), containerCode))
                     .collect(Collectors.groupingBy(it -> it.get(CODE).toString()));
             return UniReturnUtil.success(results);
         } catch (Exception e) {
@@ -58,7 +59,7 @@ public class ControlService {
      * @param serviceId
      * @return
      */
-    public static Map<String, Object> start(String serviceId) {
+    public static Map<String, Object> start(String serviceId, String containerCode) {
         try {
             List<Map<String, Object>> serviceInfoList = DataBase.query(Config.getCenterConnectionStr(), "select tasktype from serviceinfo where serviceid=?", serviceId);
 
@@ -67,7 +68,7 @@ public class ControlService {
             }
             Map<String, Object> serviceInfo = serviceInfoList.get(0);
             Object taskType = serviceInfo.get("tasktype");
-            updateServiceState(serviceId, "1");
+            updateServiceState(serviceId, containerCode, "1");
             if (Objects.equals(taskType, "0")) {
 //            设置服务状态为运行中
 
@@ -93,42 +94,46 @@ public class ControlService {
      * @param serviceId
      * @return
      */
-    public static Map<String, Object> stop(String serviceId) {
+    public static Map<String, Object> stop(String serviceId, String containerCode) {
         Map<String, Object> cancel = ScheduleUtil.cancel(serviceId);
 
         boolean isCancel = Objects.equals(cancel.get(CODE), "0");
         try {
             if (isCancel)
-                updateServiceState(serviceId, "0");
+                updateServiceState(serviceId, containerCode, "0");
         } catch (Exception e) {
             return UniReturnUtil.fail(e);
         }
         return UniReturnUtil.success("停止" + (isCancel ? "成功" : "失败"));
     }
 
-    private static void updateServiceState(String serviceId, String state) throws Exception {
+    private static void updateServiceState(String serviceId, String containerCode, String state) throws Exception {
         if (Objects.equals(state, "1")) {
 
-            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select runstate,servicestateid from servicestate where starttime is not null and  serviceid=? and containercode=?", serviceId, Config.getContainerCode());
+            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select runstate,servicestateid from servicestate where starttime is not null and  serviceid=? and containercode=?", serviceId, containerCode);
             if (mapList.isEmpty()) {
 
-                DataBase.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate) values (?,?,?,'1')",
+                DataBase.update(Config.getCenterConnectionStr(), "insert into  servicestate(serviceid,starttime,containercode,runstate,workpath) values (?,?,?,'1',?)",
                         serviceId,
                         DataFormatUtil.toString(LocalDateTime.now()),
-                        Config.getContainerCode());
+                        Config.getContainerCode(),
+                        new File(".").getAbsolutePath());
             } else {
                 String serviceStateId = mapList.get(0).get("servicestateid").toString();
-                DataBase.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1' where  servicestateid = ?",
+                DataBase.update(Config.getCenterConnectionStr(), "update servicestate set starttime=?,runstate='1',workpath = ? where  servicestateid = ? and containercode =?",
                         DataFormatUtil.toString(LocalDateTime.now()),
-                        serviceStateId);
+                        new File(".").getAbsolutePath(),
+                        serviceStateId, containerCode);
             }
         } else {
-            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select servicestateid, runstate from servicestate where stoptime is null and  serviceid=? and containercode=? order by servicestateid desc", serviceId, Config.getContainerCode());
+            List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), "select servicestateid, runstate from servicestate where stoptime is null and  serviceid=? and containercode=? order by servicestateid desc", serviceId, containerCode);
 
-            String serviceStateId = mapList.get(0).get("servicestateid").toString();
-            DataBase.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where  servicestateid = ?",
-                    DataFormatUtil.toString(LocalDateTime.now()),
-                    serviceStateId);
+            if (!mapList.isEmpty()) {
+                String serviceStateId = mapList.get(0).get("servicestateid").toString();
+                DataBase.update(Config.getCenterConnectionStr(), "update servicestate set stoptime=?,runstate='0' where  servicestateid = ? and containercode =?",
+                        DataFormatUtil.toString(LocalDateTime.now()),
+                        serviceStateId, containerCode);
+            }
         }
     }
 
@@ -143,25 +148,28 @@ public class ControlService {
 
     public static Map<String, Object> startOrStop(Map<String, Object> params, String statue, boolean all) throws Exception {
         Optional<String> serviceIdOpt = DataAliasGetUtil.getValue(SERVICE_ID, params);
-        if (serviceIdOpt.isEmpty() && !all) {
+        Optional<String> containerCode = DataAliasGetUtil.getValue("containercode", params);
+        if ((serviceIdOpt.isEmpty() || containerCode.isEmpty()) && !all) {
             return UniReturnUtil.fail("服务ID不能为空");
-        } else if (serviceIdOpt.isPresent()) {
+        } else if (serviceIdOpt.isPresent() && containerCode.isPresent()) {
 
             String serviceId = serviceIdOpt.get();
             if (Objects.equals(statue, "0")) {
-                return stop(serviceId);
+                return stop(serviceId, containerCode.get());
             } else {
-                return start(serviceId);
+                return start(serviceId, containerCode.get());
             }
-        } else {
+        } else if (containerCode.isPresent()) {
             if (Objects.equals(statue, "0")) {
-                stopServiceByContainerCode();
+                stopServiceByContainerCode(containerCode.get());
 
                 return UniReturnUtil.success(true);
             } else {
-                startServiceByContainerCode();
+                startServiceByContainerCode(containerCode.get());
                 return UniReturnUtil.success(true);
             }
+        } else {
+            throw new RuntimeException("请输入启动的容器编号");
         }
     }
 }

src/main/java/com/scbfkj/uni/service/DataProcessService.java

@@ -10,14 +10,20 @@ import com.scbfkj.uni.library.script.JsScriptEngineUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.system.Config;
 
+import java.io.File;
 import java.text.NumberFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 public class DataProcessService {
 
+    //    添加一个线程池
+// 创建一个固定大小的线程池，包含2个线程
+    private static final ExecutorService executor = Executors.newWorkStealingPool();
 
     public static Map<String, Object> process(Map<String, Object> inData) {
         String lifecycleid = null;
@@ -279,23 +285,44 @@ public class DataProcessService {
             message = e.getMessage();
             return UniReturnUtil.fail(e);
         } finally {
+
 //                    不管成功还是失败都记录日志
             if (Config.isDebug() || Objects.nonNull(serviceInfo) && Objects.equals("1", serviceInfo.get("enablelog"))) {
-                LoggerService.LogType target = LoggerService.LogType.SERVICE;
-                if (Objects.nonNull(message)) {
-                    target = LoggerService.LogType.SERVICE_ERR;
-                }
-                HashMap<String, Object> logData = new HashMap<>();
-                logData.put("begintime", startDateTime);
-                LocalDateTime dateTime = LocalDateTime.now();
-                logData.put("endtime", dateTime);
-                logData.put("serviceid", serviceId);
-                logData.put("inputdata", DataFormatUtil.toString(resource));
-                logData.put("prepesource", DataFormatUtil.toString(preResource));
-                logData.put("returnmessage", message);
-                logData.put("lifecycleid", lifecycleid);
-                LoggerService.log(target, logData);
+                String finalMessage = message;
+                LocalDateTime finalStartDateTime = startDateTime;
+                String finalServiceId = serviceId;
+                String finalLifecycleid = lifecycleid;
+//                使用线程不阻塞
+                executor.execute(() -> {
+                    LoggerService.LogType target = LoggerService.LogType.SERVICE;
+                    if (Objects.nonNull(finalMessage)) {
+                        target = LoggerService.LogType.SERVICE_ERR;
+                    }
+                    HashMap<String, Object> logData = new HashMap<>();
+                    logData.put("begintime", finalStartDateTime);
+                    LocalDateTime dateTime = LocalDateTime.now();
+                    logData.put("endtime", dateTime);
+                    logData.put("serviceid", finalServiceId);
+                    logData.put("inputdata", DataFormatUtil.toString(resource));
+                    logData.put("prepesource", DataFormatUtil.toString(preResource));
+                    logData.put("returnmessage", finalMessage);
+                    logData.put("lifecycleid", finalLifecycleid);
+                    LoggerService.log(target, logData);
+                });
+
             }
+//                使用线程不阻塞
+            String finalServiceId1 = serviceId;
+            executor.execute(() -> {
+                try {
+                    DataBase.update(Config.getCenterConnectionStr(), """
+                            update servicestate
+                            set lasttime = ?,workpath = ?
+                            where serviceid=? and containercode=?""", LocalDateTime.now(), new File(".").getAbsolutePath(), finalServiceId1, Config.getContainerCode());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
         }
 
     }
@@ -310,17 +337,17 @@ public class DataProcessService {
      */
     public static Map<String, Object> processByAlgorithm(Object type, List<Object> parameters) throws Exception {
 
-        switch (type.toString()) {
+        switch (type.toString().toUpperCase()) {
             // java反射
-            case "1" -> {
+            case "1", "JAVA" -> {
                 return JavaScriptEngineUtil.invoke((Map<String, Object>) parameters.get(0), DataFormatUtil.toString(parameters.get(1)), parameters.subList(2, parameters.size()).toArray());
             }
             // JS表达式
-            case "2" -> {
+            case "2", "JS" -> {
                 return JsScriptEngineUtil.eval(DataFormatUtil.toString(parameters.get(0)), parameters.subList(1, parameters.size()).toArray());
             }
             // 数据库
-            case "3" -> {
+            case "3", "DB" -> {
                 // 下放到Database中处理数据
                 // 参数表达式顺序是 数据源连接字符串（String.$.datasource.connectset）,sql表达式(String.$.algorithm.computingexpression），需要操作的值(List.$.args[1].returnData)，执行编号(String.$.algorithm.executionnumber)
                 return DatabaseScriptUtil.exec(DataFormatUtil.toString(parameters.get(0)), DataFormatUtil.toString(parameters.get(1)), ((List<Map<String, Object>>) parameters.get(2)), parameters.get(3), (List<String>) parameters.get(4), (List<Map<String, Object>>) parameters.get(5), null);

src/main/java/com/scbfkj/uni/service/SecurityService.java

@@ -478,6 +478,9 @@ public class SecurityService {
                            groupid,
                            alias,
                            labelcode,
+                           selected,
+                           charttype,
+                          triggerserviceid,
                            null as serviceid,
                            null as insetcolumnlist,
                            null as updatecolumnlist,
@@ -533,7 +536,11 @@ public class SecurityService {
                            t3.groupid,
                            t3.alias,
                            t3.labelcode,
-                           t1.serviceid, insetcolumnlist,
+                           t3.selected,
+                          t3.triggerserviceid,
+                          t3.charttype,
+                           t1.serviceid,
+                           insetcolumnlist,
                            updatecolumnlist,
                            selectcolumnlist,
                            filterset
@@ -562,7 +569,6 @@ public class SecurityService {
             DataBase.update(Config.getSecurityConnectionStr(), update, passwordOpt.get(), userId);
             return UniReturnUtil.success("成功");
         }
-
     }
 
     //用户心跳

src/main/java/com/scbfkj/uni/system/SystemInit.java

@@ -139,7 +139,7 @@ public class SystemInit {
             }
         }
         readConfigFile();
-        ControlService.startServiceByContainerCode();
+        ControlService.startServiceByContainerCode(Config.getContainerCode());
     }
 
     private String readConfigFile() throws Exception {

src/test/java/com/scbfkj/uni/library/script/JsScriptEngineUtilTest.java

@@ -1,26 +1,251 @@
 package com.scbfkj.uni.library.script;
 
-import com.scbfkj.uni.library.DataFormatUtil;
-import org.graalvm.polyglot.Value;
 import org.junit.jupiter.api.Test;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 class JsScriptEngineUtilTest {
 
-    @Test
-    void eval() throws Exception {
-        Map<String, Object> result = JsScriptEngineUtil.eval("(a,b) => a+b", 1, 2);
-        System.out.println(result);
-    }
+    public static final String script2 = """
+            new Date()
+                        
+            """;
+    static final String script = """
+            (type) => {
+                switch (type) {
+                    case 'pageType':{
+                        return [{
+                            'id':'module',
+                            'name':'模块'
+                        },{
+                            'id':'page',
+                            'name':'页面'
+                        },{
+                            'id':'tree',
+                            'name':'树'
+                        },{
+                            'id':'table',
+                            'name':'表格'
+                        },{
+                            'id':'column',
+                            'name':'数据项'
+                        },{
+                            'id':'form',
+                            'name':'表单'
+                        },{
+                            'id':'chart',
+                            'name':'图表'
+                        },{
+                            'id':'button',
+                            'name':'按钮'
+                        }]
+                    }
+                    case 'boolean':{
+                        return [{
+                            'id':1,
+                            'name':'是'
+                        },{
+                            'id':0,
+                            'name':'否'
+                        }]
+                    }
+                    case 'taskType':{
+                        return [{
+                            'id':0,
+                            'name':'接口服务'
+                        },{
+                            'id':1,
+                            'name':'定时服务'
+                        },{
+                            'id':2,
+                            'name':'轮询服务'
+                        }]
+                    }
+                    case 'serviceType':{
+                        return [{
+                            'id':0,
+                            'name':'高级查询'
+                        },{
+                            'id':1,
+                            'name':'查询'
+                        },{
+                            'id':2,
+                            'name':'新增'
+                        },{
+                            'id':3,
+                            'name':'编辑'
+                        },{
+                            'id':4,
+                            'name':'删除'
+                        },{
+                            'id':5,
+                            'name':'其他'
+                        }]
+                    }
+                    case 'algorithmlibraryType':{
+                        return [{
+                            'id':'category',
+                            'name':'大类'
+                        },{
+                            'id':'algorithm',
+                            'name':'算法'
+                        },{
+                            'id':'parameter',
+                            'name':'参数'
+                        }]
+                    }
+                    case 'algorithmlibraryParamenterType':{
+                        return [{
+                            'id':'string',
+                            'name':'字符串'
+                        },{
+                            'id':'number',
+                            'name':'数字'
+                        }]
+                    }
+                    case 'datasource':{
+                        return [{
+                            'id':0,
+                            'name':'全局变量'
+                        },{
+                            'id':1,
+                            'name':'算法配置'
+                        },{
+                            'id':2,
+                            'name':'固定值'
+                        },{
+                            'id':3,
+                            'name':'数据订阅'
+                        }]
+                    }
+                    case 'openmode':{
+                        return [{
+                            'id':1,
+                            'name':'打开页面'
+                        },{
+                            'id':2,
+                            'name':'打开表单'
+                        },{
+                            'id':3,
+                            'name':'页面内联查询'
+                        },{
+                            'id':4,
+                            'name':'打开弹窗'
+                        }]
+                    }
+                    case 'charttype':{
+                        return [{
+                            'id':"line",
+                            'name':'折线图'
+                        },{
+                            'id':"bar",
+                            'name':'柱状图'
+                        },{
+                            'id':"pie",
+                            'name':'饼图'
+                        },{
+                            'id':"radar",
+                            'name':'雷达图'
+                        }]
+                    }
+                    case 'renderType':{
+                        return [{
+                            'id':'radio',
+                            'name':'radio'
+                        },{
+                            'id':'checkbox',
+                            'name':'checkbox'
+                        },{
+                            'id':'textarea',
+                            'name':'textarea'
+                        },{
+                            'id':'text',
+                            'name':'text'
+                        },{
+                            'id':'password',
+                            'name':'password'
+                        },{
+                            'id':'unpassword',
+                            'name':'unpassword'
+                        },{
+                            'id':'number',
+                            'name':'number'
+                        },{
+                            'id':'select',
+                            'name':'select'
+                        },{
+                            'id':'cascader',
+                            'name':'cascader'
+                        },{
+                            'id':'switch',
+                            'name':'switch'
+                        },{
+                            'id':'time',
+                            'name':'time'
+                        },{
+                            'id':'date',
+                            'name':'date'
+                        },{
+                            'id':'datetime',
+                            'name':'datetime'
+                        },{
+                            'id':'upload',
+                            'name':'upload'
+                        }]
+                    }
+                    default:{
+                        return []
+                    }
+                }
+            }
+            """;
 
     @Test
-    void testEval() throws Exception {
-        Value value = Value.asValue(new HashMap<String, Object>() {{
-            put("a", 1);
-        }});
-        System.out.println(DataFormatUtil.toString(value));
+    void testPool() {
+
+        ArrayList<String> list = new ArrayList<>();
+        list.add("pageType");
+        list.add("boolean");
+        list.add("taskType");
+        list.add("serviceType");
+        list.add("algorithmlibraryType");
+        list.add("algorithmlibraryParamenterType");
+        list.add("datasource");
+        list.add("openmode");
+        list.add("charttype");
+        list.add("renderType");
+        ArrayList<Future<Map>> objects = new ArrayList<>();
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < 10000; i++) {
+            String type = list.get(i % list.size());
+            CompletableFuture<Map> future = CompletableFuture.supplyAsync(() -> {
+                Map value = null;
+                try {
+                    value = JsScriptEngineUtil.eval(script2);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return value;
+            });
+            objects.add(future);
+        }
+        objects.stream().map(valueFuture -> {
+            try {
+                return valueFuture.get();
+            } catch (InterruptedException | ExecutionException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }).forEach(System.out::println);
+
+        long end = System.currentTimeMillis();
+        System.out.println("thread new object:" + (end - start));
 
     }
+
+
 }