day_23

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

@@ -59,9 +59,12 @@ public final class DataFormatUtil {
     }
 
     public static String toString(Object source) {
-        if (Objects.isNull(source)) return null;
-        if (source instanceof String || source instanceof Number)
+        if (Objects.isNull(source)) {
+            return null;
+        }
+        if (source instanceof String || source instanceof Number) {
             return source.toString();
+        }
         if (source instanceof LocalDate result) {
             return result.format(dateTimeFormatter);
         }
@@ -123,7 +126,9 @@ public final class DataFormatUtil {
     }
 
     public static Map<?, ?> toMap(Object value) {
-        if (Objects.isNull(value)) return null;
+        if (Objects.isNull(value)) {
+            return null;
+        }
         if (value instanceof Map<?, ?> map) {
             return map;
         }
@@ -135,17 +140,17 @@ public final class DataFormatUtil {
                     return stringToMap(str);
                 } catch (JsonProcessingException e) {
                     try {
-                        return new HashMap<>() {{
-                            put("root", toJsonNode(str));
-                        }};
+                        HashMap<Object, Object> data = new HashMap<>();
+                        data.put("root", toJsonNode(str));
+                        return data;
                     } catch (JsonProcessingException ex) {
 
                     }
                 }
             }
         }
-        return new HashMap<>() {{
-            put("root", value);
-        }};
+        HashMap<Object, Object> data = new HashMap<>();
+        data.put("root", value);
+        return data;
     }
 }

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

@@ -16,6 +16,7 @@ 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;
 
@@ -52,7 +53,7 @@ public final class JsScriptEngineUtil {
         try {
             function = scriptPool.borrowObject(script);
             if (function.canExecute()) {
-                Value result = function.execute(args);
+                Value result = function.execute(Arrays.stream(args).map(Value::asValue).toArray());
 
                 return UniReturnUtil.success(toHostObject(result));
             } else {

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

@@ -119,7 +119,7 @@ public class LoggerService {
 
 //                        解析发送目标连接字符串
                         try {
-                            List<Map<String, Object>> dataSourceList = DataBase.query(Config.getCenterConnectionStr(), "sselect   connectset, datasourcetype from datasource where datasourceid=?", datasourceid);
+                            List<Map<String, Object>> dataSourceList = DataBase.query(Config.getCenterConnectionStr(), "select   connectset, datasourcetype from datasource where datasourceid=?", datasourceid);
                             if (dataSourceList.isEmpty()) {
                                 return;
                             }

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

@@ -1,7 +1,10 @@
 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.Map;
 
 class JsScriptEngineUtilTest {
@@ -14,7 +17,10 @@ class JsScriptEngineUtilTest {
 
     @Test
     void testEval() throws Exception {
-
+        Value value = Value.asValue(new HashMap<String, Object>() {{
+            put("a", 1);
+        }});
+        System.out.println(DataFormatUtil.toString(value));
 
     }
 }