init_11

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

@@ -12,14 +12,38 @@ public class DataAliasGetUtil {
 
     public static Optional<String> getValue(String key, Map<String, Object> data) throws Exception {
 
-        if(Objects.isNull(data)) return Optional.empty();
+        if (Objects.isNull(data)) return Optional.empty();
         Optional<String> result = Optional.ofNullable(data.get(key)).map(Object::toString);
         if (result.isPresent()) return result;
         if (Objects.isNull(keyAlias) || keyAlias.isEmpty()) {
+
             keyAlias = DataBase.query(Config.centerConnectionStr, "select * from keyalias where aliasid>?", Collections.singletonList(new Object[]{0}));
+
         }
         List<Map<String, Object>> keynames = keyAlias.stream().filter(it -> Objects.equals(it.get("keyname"), key)).toList();
         if (keynames.isEmpty()) return Optional.empty();
         return keynames.stream().map(it -> it.get("aliasname")).map(data::get).filter(Objects::nonNull).map(Object::toString).findAny();
     }
+
+
+    private static long sequence = 0L;
+    private static long lastTimestamp = -1L;
+    public synchronized static String createLifeCycleCol(String containerCode, String serviceId) {
+        long timestamp = System.currentTimeMillis();
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (lastTimestamp == timestamp) { //如果是同一时间生成的，则进行毫秒内序列
+            sequence++;
+            if (sequence > 999L) {//毫秒内序列溢出
+                sequence = 0;
+                while (lastTimestamp == System.currentTimeMillis()) {//阻塞到下一个毫秒,获得新的时间戳
+                }
+                timestamp = System.currentTimeMillis();
+            }
+        } else {
+            sequence = 0L;
+        }
+        lastTimestamp = timestamp;//上次生成ID的时间截
+        //移位并通过或运算拼到一起组成64位的ID
+        return String.valueOf(timestamp).concat(String.format("%03d", sequence)).concat(String.format("%6s", containerCode)).concat(String.format("%6s", serviceId)).replaceAll("\\s", "0");
+    }
 }

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

@@ -20,7 +20,7 @@ public class DataBase {
 
     private final static Map<String, Map<String, Object>> cacheDatas = new HashMap<>();
     private final static List<Map<String, Object>> cacheConfigList = new ArrayList<>();
-    private final static Map<String, HikariPool> dataSourcePools = new HashMap<>();
+    public final static Map<String, HikariPool> dataSourcePools = new HashMap<>();
 
 
     public static List<Map<String, Object>> query(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
@@ -507,7 +507,7 @@ public class DataBase {
         return names;
     }
 
-    private static List<Map<String, Object>> getResult(String connection, String sql, ResultSet resultSet) throws SQLException {
+    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<>();
         while (resultSet.next()) {

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

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jayway.jsonpath.JsonPath;
 import com.scbfkj.uni.library.DataAliasGetUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
-import com.scbfkj.uni.library.RequestUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.library.script.JavaScriptEngineUtil;
 import com.scbfkj.uni.library.script.JsScriptEngineUtil;
@@ -20,98 +19,201 @@ public class DataProcessService {
 
 
     public static Map<String, Object> process(Map<String, Object> inData) {
-
         String lifecycleid = null;
         Map<String, Object> result;
         List<Map<String, Object>> resource = new ArrayList<>();
         resource.add(inData);
-        Object algorithmlibraryid;
+        String serviceId = null;
+        Object algorithmlibraryid = null;
+        Optional<String> serviceIdOpt = null;
+        LocalDateTime startDateTime = LocalDateTime.now();
         try {
-            Optional<String> serviceIdOpt = DataAliasGetUtil.getValue("serviceid", inData);
-            if (Objects.isNull(inData) || inData.isEmpty() || serviceIdOpt.isEmpty())
-                return UniReturnUtil.fail("服务编号不能为空");
-            String serviceId = serviceIdOpt.get();
+            serviceIdOpt = DataAliasGetUtil.getValue("serviceid", inData);
+        } catch (Exception e) {
+            LoggerService.logService(
+                    startDateTime,
+                    serviceId,
+                    DataFormatUtil.toString(resource),
+                    null,
+                    LocalDateTime.now(),
+                    null,
+                    "-1",
+                    e.getMessage(),
+                    lifecycleid
+            );
+            return UniReturnUtil.fail(e.getMessage());
+        }
+        if (Objects.isNull(inData) || inData.isEmpty() || serviceIdOpt.isEmpty())
+            return UniReturnUtil.fail("服务编号不能为空");
+        serviceId = serviceIdOpt.get();
 
 //        熔断
 
-            List<Map<String, Object>> algorithmLibraries;
+        List<Map<String, Object>> algorithmLibraries;
+        try {
             if (serviceId.matches("^\\d+$")) {
                 algorithmLibraries = DataBase.query(Config.centerConnectionStr, "select * from algorithmlibrary where serviceid=?", Collections.singletonList(new Object[]{serviceId}));
             } else {
                 algorithmLibraries = DataBase.query(Config.localCenterConnectionStr, "select * from algorithmlibrary where serviceid=?", Collections.singletonList(new Object[]{serviceId}));
             }
+        } catch (Exception e) {
+//            记录异常
+            LoggerService.logService(
+                    startDateTime,
+                    serviceId,
+                    DataFormatUtil.toString(resource),
+                    null,
+                    LocalDateTime.now(),
+                    null,
+                    "-1",
+                    e.getMessage(),
+                    lifecycleid
+            );
+            return UniReturnUtil.fail(e.getMessage());
+        }
 
-            Optional<String> lifecycleidOpt = DataAliasGetUtil.getValue("lifecycleid", inData);
-            if (lifecycleidOpt.isEmpty()) {
-                lifecycleid = createLifeCycleCol(Config.containerCode, serviceId);
-                inData.put("lifecycleid", lifecycleid);
-            } else {
-                lifecycleid = lifecycleidOpt.get();
-            }
+        Optional<String> lifecycleidOpt = null;
+        try {
+            lifecycleidOpt = DataAliasGetUtil.getValue("lifecycleid", inData);
+        } catch (Exception e) {
+            LoggerService.logService(
+                    startDateTime,
+                    serviceId,
+                    DataFormatUtil.toString(resource),
+                    null,
+                    LocalDateTime.now(),
+                    null,
+                    "-1",
+                    e.getMessage(),
+                    lifecycleid
+            );
+            return UniReturnUtil.fail(e.getMessage());
+        }
+        if (lifecycleidOpt.isEmpty()) {
+            lifecycleid = DataAliasGetUtil.createLifeCycleCol(Config.containerCode, serviceId);
+            inData.put("lifecycleid", lifecycleid);
+        } else {
+            lifecycleid = lifecycleidOpt.get();
+        }
 
-            for (Map<String, Object> algorithmLibrary : algorithmLibraries) {
+        for (Map<String, Object> algorithmLibrary : algorithmLibraries) {
 
-                Object preConditions = algorithmLibrary.get("preconditions");
-                Object preparameterset = algorithmLibrary.get("preparameterset");
+            Map<String, Object> algorithmResult = null;
+
+            long execTime;
+            String code = null;
+            String message = null;
+
+            startDateTime = LocalDateTime.now();
+            long startTime = System.currentTimeMillis();
+            List<Object> parameters = null;
+            algorithmlibraryid = algorithmLibrary.get("algorithmlibraryid");
+            Object preConditions = algorithmLibrary.get("preconditions");
+            Object preparameterset = algorithmLibrary.get("preparameterset");
+            try {
+                HashMap<String, Object> data = new HashMap<>();
+                resource.add(data);
+//                记录生命周期ID
+                data.put("lifecycleid", lifecycleid);
                 if (Objects.nonNull(preConditions)) {
-                    String preCode = preConditionScript(preConditions.toString(), resource, DataFormatUtil.toString(preparameterset));
+
+                    String preCode;
+                    if (Objects.isNull(preparameterset)) {
+                        preCode = JsScriptEngineUtil.eval(DataFormatUtil.toString(preConditions), resource);
+                    } else {
+                        List<Object> params = getParams(Objects.requireNonNull(DataFormatUtil.toString(preparameterset)), resource);
+                        preCode = JsScriptEngineUtil.eval(DataFormatUtil.toString(preConditions), params.toArray());
+                    }
+//                    记录前置条件结果
+                    data.put("preResult", preCode);
                     if (Objects.equals("2", preCode)) {
+                        LoggerService.logService(
+                                startDateTime,
+                                serviceId,
+                                DataFormatUtil.toString(resource),
+                                DataFormatUtil.toString(parameters),
+                                LocalDateTime.now(),
+                                DataFormatUtil.toString(algorithmResult),
+                                "0",
+                                message,
+                                lifecycleid
+                        );
                         return UniReturnUtil.success(resource.size() - 1);
                     } else if (Objects.equals("1", preCode)) {
-                        resource.add(null);
                         continue;
                     }
                 }
-                algorithmlibraryid = algorithmLibrary.get("algorithmlibraryid");
-                Map<String, Object> algorithmResult = null;
-                try {
-                    algorithmResult = processByAlgorithm(algorithmLibrary, resource);
-                } catch (Exception e) {
-//                    把错误细化后往上一层抛出统一记录日志
-                    throw new RuntimeException("算法id: %s 异常信息：%s ".formatted(algorithmlibraryid, e.getMessage()));
-                }
-                if (!Objects.equals(algorithmResult.get("code"), "0")) {
-                    resource.add(algorithmResult);
-                } else {
-                    throw new RuntimeException(algorithmResult.get("message").toString());
+
+                Object parameterSet = algorithmLibrary.get("parameterset");
+                Object dataSourceId = algorithmLibrary.get("datasourceid");
+                List<Map<String, Object>> datasourceList = DataBase.query(Config.centerConnectionStr, "select * from datasource where datasourceid=?", Collections.singletonList(new Object[]{dataSourceId}));
+                Map<String, Object> datasource = datasourceList.get(0);
+
+//        获取入参列表
+                parameters = new ArrayList<>();
+                if (Objects.nonNull(parameterSet)) {
+                    HashMap<String, Object> source = new HashMap<>();
+                    source.put("args", resource);
+                    source.put("algorithm", algorithmLibrary);
+                    source.put("datasource", datasource);
+                    parameters.addAll(getParams(parameterSet.toString(), source));
+//                    算法入参
+                    data.put("parameters", parameters);
+
                 }
+                List<String> filterColumns = Optional.of(resource).map(it -> it.get(0)).map(it -> it.get("filterColumns")).map(it -> ((List<String>) it)).orElse(new ArrayList<>());
+                List<Map<String, Object>> filterLines = Optional.of(resource).map(it -> it.get(0)).map(it -> it.get("filterLines")).map(it -> ((List<Map<String, Object>>) it)).orElse(new ArrayList<>());
+
+                algorithmResult = processByAlgorithm(algorithmLibrary, datasource, parameters, filterColumns, filterLines);
+//                    算法执行结果
+                data.put("result", algorithmResult);
+                execTime = System.currentTimeMillis() - startTime;
+//                    执行时长
+                data.put("execTime", execTime);
+//                    执行成功与否
+                code = Optional.ofNullable(algorithmResult.get("code")).map(DataFormatUtil::toString).orElse(null);
+                message = Optional.ofNullable(algorithmResult.get("message")).map(DataFormatUtil::toString).orElse(null);
+                data.put("resultCode", code);
+            } catch (Exception e) {
+                message = e.getMessage();
+//                    把错误细化后往上一层抛出统一记录日志
+                throw new RuntimeException("算法id: %s 异常信息：%s ".formatted(algorithmlibraryid, e.getMessage()));
+            } finally {
+//                    不管成功还是失败都记录日志
+                LoggerService.logService(
+                        startDateTime,
+                        serviceId,
+                        DataFormatUtil.toString(resource),
+                        DataFormatUtil.toString(parameters),
+                        LocalDateTime.now(),
+                        DataFormatUtil.toString(algorithmResult),
+                        Optional.ofNullable(code).orElse("-1"),
+                        message,
+                        lifecycleid
+                );
+            }
+            if (!Objects.equals(code, "0")) {
+                return resource.get(resource.size() - 1);
             }
-            result = resource.get(resource.size() - 1);
-        } catch (Exception e) {
-//            异常
-            LoggerService.logServiceError(RequestUtil.getIpAddr(), RequestUtil.getUri(), RequestUtil.getSessionId(), DataFormatUtil.toString(resource), null, "-1", e.getMessage(), lifecycleid);
-            return UniReturnUtil.fail(e.getMessage());
         }
-//        成功
-        LoggerService.logService(RequestUtil.getIpAddr(), RequestUtil.getUri(), RequestUtil.getSessionId(), DataFormatUtil.toString(inData), DataFormatUtil.toString(result), "0", null, lifecycleid);
-        return result;
+        return resource.get(resource.size() - 1);
+
     }
 
     /**
      * @param algorithmLibrary 算法配置
-     * @param args             算法参数
+     * @param datasource
+     * @param parameters       算法参数
+     * @param filterColumns
+     * @param filterLines
      * @return
      * @throws Exception
      */
-    public static Map<String, Object> processByAlgorithm(Map<String, Object> algorithmLibrary, List<Map<String, Object>> args) throws Exception {
+    public static Map<String, Object> processByAlgorithm(Map<String, Object> algorithmLibrary, Map<String, Object> datasource, List<Object> parameters, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
 
-        List<String> filterColumns = Optional.ofNullable(args).map(it -> it.get(0)).map(it -> it.get("filterColumns")).map(it -> ((List<String>) it)).orElse(new ArrayList<>());
-        List<Map<String, Object>> filterLines = Optional.ofNullable(args).map(it -> it.get(0)).map(it -> it.get("filterLines")).map(it -> ((List<Map<String, Object>>) it)).orElse(new ArrayList<>());
         Object type = algorithmLibrary.get("algorithmtype");
         Object expression = algorithmLibrary.get("computingexpression");
-        Object parameterSet = algorithmLibrary.get("parameterset");
-        Object dataSourceId = algorithmLibrary.get("datasourceid");
-        List<Map<String, Object>> datasourceList = DataBase.query(Config.centerConnectionStr, "select * from datasource where datasourceid=?", Collections.singletonList(new Object[]{dataSourceId}));
-        Map<String, Object> datasource = datasourceList.get(0);
-        List<Object> parameters = new ArrayList<>();
-//        获取入参列表
-        if (Objects.nonNull(parameterSet)) {
-            HashMap<String, Object> source = new HashMap<>();
-            source.put("args", args);
-            source.put("algorithm", algorithmLibrary);
-            source.put("datasource", datasource);
-            parameters.addAll(getParams(parameterSet.toString(), source));
-        }
+
 
         switch (type.toString()) {
 //            java反射
@@ -140,6 +242,8 @@ public class DataProcessService {
      * @throws Exception
      */
     private static String preConditionScript(String script, List<Map<String, Object>> args, String parameterSet) throws Exception {
+//        todo 兼容之前版本的写法的
+//        判断算法中是否存在书名号
         if (Objects.isNull(parameterSet)) {
             return JsScriptEngineUtil.eval(script, args);
         } else {
@@ -153,7 +257,7 @@ public class DataProcessService {
      * @param source       jsonpath需要取值的数据源
      * @return
      */
-    public static List<Object> getParams(String parameterSet, Object source) throws JsonProcessingException {
+    public static List<Object> getParams(String parameterSet, Object source) {
         String[] paths = parameterSet.split(";;");
         String json = DataFormatUtil.toString(source);
         List<Object> result = new ArrayList<>();
@@ -210,25 +314,5 @@ public class DataProcessService {
         return result;
     }
 
-    private static long sequence = 0L;
-    private static long lastTimestamp = -1L;
-
-    public synchronized static String createLifeCycleCol(String containerCode, String serviceId) {
-        long timestamp = System.currentTimeMillis();
-        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
-        if (lastTimestamp == timestamp) { //如果是同一时间生成的，则进行毫秒内序列
-            sequence++;
-            if (sequence > 999L) {//毫秒内序列溢出
-                sequence = 0;
-                while (lastTimestamp == System.currentTimeMillis()) {//阻塞到下一个毫秒,获得新的时间戳
-                }
-                timestamp = System.currentTimeMillis();
-            }
-        } else {
-            sequence = 0L;
-        }
-        lastTimestamp = timestamp;//上次生成ID的时间截
-        //移位并通过或运算拼到一起组成64位的ID
-        return String.valueOf(timestamp).concat(String.format("%03d", sequence)).concat(String.format("%6s", containerCode)).concat(String.format("%6s", serviceId)).replaceAll("\\s", "0");
-    }
+
 }

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

@@ -1,8 +1,5 @@
 package com.scbfkj.uni.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.jayway.jsonpath.JsonPath;
 import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
@@ -10,10 +7,12 @@ import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.process.Elasticsearch;
 import com.scbfkj.uni.process.Kafka;
 import com.scbfkj.uni.system.Config;
+import com.zaxxer.hikari.pool.HikariPool;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.sql.*;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -25,122 +24,66 @@ public class LoggerService {
 
     private static Map<String, Integer> flag = new HashMap<>();
 
-
-    //    应用
-    public static void logInterface(String appId, String ip, String requestPath, String sessionId, String requestData, String returnData, String returnCode, String returnMessage, String lifecycleId) {
-        try {
-            String tableName = "interfacelog";
-            String connectionStr = getCurrentThreadConnection(tableName);
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("applicationid", appId);
-            data.put("requesttime", LocalDateTime.now());
-            data.put("requestip", ip);
-            data.put("requestpath", requestPath);
-            data.put("sessionid", sessionId);
-            data.put("requestdata", requestData);
-            data.put("returndata", returnData);
-            data.put("returncode", returnCode);
-            data.put("returnmessage", returnMessage);
-            data.put("lifecycleid", lifecycleId);
-            DataBase.exec(connectionStr, tableName, Collections.singletonList(data), "1", null, null);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+    //写日志方法：log()--提供给程序内部使用
+    //用户操作日志
+    public static void logUser(LocalDateTime requestTime, String requestIP, String requestPath
+            , String requestData, String sessionID, LocalDateTime returnDate
+            , String returnData, String returnCode, String returnMessage
+            , String dataObjectID, String applicationID, String userID) {
+        //调用工具类的获取雪花编号getUniqueNumber(时间戳+当前容器编号+0)
+        //打开雪花编号对应的临时Sqlite（日志文件夹下）
+        //写入数据
     }
 
-    public static void logService(String ip, String requestPath, String sessionId, String requestData, String returnData, String returnCode, String returnMessage, String lifecycleId) {
-        try {
-            String tableName = "servicelog";
-            String connectionStr = getCurrentThreadConnection(tableName);
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("requesttime", LocalDateTime.now());
-            data.put("requestip", ip);
-            data.put("requestpath", requestPath);
-            data.put("sessionid", sessionId);
-            data.put("requestdata", requestData);
-            data.put("returndata", returnData);
-            data.put("returncode", returnCode);
-            data.put("returnmessage", returnMessage);
-            data.put("lifecycleid", lifecycleId);
-            DataBase.exec(connectionStr, tableName, Collections.singletonList(data), "1", null, null);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
+    //接口日志
+    public static void logInterface(LocalDateTime requestTime, String requestIP, String requestPath
+            , String requestData, String sessionID, LocalDateTime returnDate
+            , String returnData, String returnCode, String returnMessage
+            , String dataObjectID, String applicationID) {
+        //
+        //调用工具类的获取雪花编号getUniqueNumber(时间戳+当前容器编号+0)
+        //打开雪花编号对应的临时Sqlite（日志文件夹下）
+        //写入数据
     }
 
-    public static void logServiceError(String ip, String requestPath, String sessionId, String requestData, String returnData, String returnCode, String returnMessage, String lifecycleId) {
-        try {
-            String tableName = "serviceerrlog";
-            String connectionStr = getCurrentThreadConnection(tableName);
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("requesttime", LocalDateTime.now());
-            data.put("requestip", ip);
-            data.put("requestpath", requestPath);
-            data.put("sessionid", sessionId);
-            data.put("requestdata", requestData);
-            data.put("returndata", returnData);
-            data.put("returncode", returnCode);
-            data.put("returnmessage", returnMessage);
-            data.put("lifecycleid", lifecycleId);
-            DataBase.exec(connectionStr, tableName, Collections.singletonList(data), "1", null, null);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-    }
+    /**
+     * @param beginTime     算法开始时间
+     * @param serviceID     服务id
+     * @param resource      算法数据历史
+     * @param requestData   入参
+     * @param endTime       算法结束时间
+     * @param returnData    算法执行结果
+     * @param returnCode    算法结果成功失败编号
+     * @param returnMessage 算法失败错误消息
+     * @param dataObjectID  数据声明周期
+     */
+    //服务日志
+    public static void logService(LocalDateTime beginTime, String serviceID, String resource, String requestData,
+                                  LocalDateTime endTime, String returnData,
+                                  String returnCode, String returnMessage
+            , String dataObjectID) {
+        //调用工具类的获取雪花编号getUniqueNumber(时间戳+当前容器编号+0)
+        //打开雪花编号对应的临时Sqlite（日志文件夹下）
+        //写入数据
 
-    public static void logSystemError(String ip, String requestPath, String sessionId, String requestData, String returnData, String returnCode, String returnMessage) {
         try {
-            String tableName = "systemerrlog";
+            String tableName = "servicelog";
             String connectionStr = getCurrentThreadConnection(tableName);
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("requesttime", LocalDateTime.now());
-            data.put("requestip", ip);
-            data.put("requestpath", requestPath);
-            data.put("sessionid", sessionId);
-            data.put("requestdata", requestData);
-            data.put("returndata", returnData);
-            data.put("returncode", returnCode);
-            data.put("returnmessage", returnMessage);
-            DataBase.exec(connectionStr, tableName, Collections.singletonList(data), "1", null, null);
-
+            if (!Objects.equals(returnCode, "0")) {
+                tableName = "serviceerrlog";
+            }
+            insertLog(connectionStr, "insert into %s ('begintime','endtime','serviceid','resource','requestdata','returndata','returncode','returnmessage','lifecycleid') values (?,?,?,?,?,?,?,?,?)".formatted(tableName), List.of(beginTime, endTime, serviceID, resource, requestData, requestData, returnCode, returnMessage, dataObjectID));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-
     }
 
-    public static void logUser(String userId, String appId, String ip, String requestPath, String sessionId, String requestData, String returnData, String returnCode, String returnMessage, String lifecycleId) {
-
-        try {
-            String tableName = "userlog";
-            String connectionStr = getCurrentThreadConnection(tableName);
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("applicationid", appId);
-            data.put("requesttime", LocalDateTime.now());
-            data.put("requestip", ip);
-            data.put("requestpath", requestPath);
-            data.put("sessionid", sessionId);
-            data.put("requestdata", requestData);
-            data.put("returndata", returnData);
-            data.put("returncode", returnCode);
-            data.put("returnmessage", returnMessage);
-            data.put("lifecycleid", lifecycleId);
-            data.put("userid", userId);
-            DataBase.exec(connectionStr, tableName, Collections.singletonList(data), "1", null, null);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+    //系统异常日志
+    public static void logSystemError(LocalDateTime occurrenceTime, String occurrenceAddress
+            , String detailedMessage) {
+        //调用工具类的获取雪花编号getUniqueNumber(时间戳+当前容器编号+0)
+        //打开雪花编号对应的临时Sqlite（日志文件夹下）
+        //写入数据
     }
 
     private static String getCurrentThreadConnection(String targetName) throws Exception {
@@ -160,17 +103,18 @@ public class LoggerService {
                         CREATE TABLE interfacelog (
                              
                             logid         Integer
-                                primary key autoincrement,
-                             requesttime DATETIME,
-                             requestip VARCHAR(255),
-                             requestpath VARCHAR(255),
-                             requestdata TEXT,
-                             sessionid VARCHAR(255),
-                             returndata TEXT,
-                             returncode INT,
-                             returnmessage TEXT,
-                             applicationid INT,
-                             lifecycleid INT
+                                primary key auto_increment,
+                            requesttime DATETIME,
+                            requestip TEXT,
+                            requestpath TEXT,
+                            requestdata TEXT,
+                            sessionid TEXT,
+                            returndate DATETIME,
+                            returndata TEXT,
+                            returncode TEXT,
+                            returnmessage TEXT,
+                            dataobjectid TEXT,
+                            applicationid TEXT
                          )
                                                 """;
             } else if (targetName.equals("servicelog")) {
@@ -178,16 +122,16 @@ public class LoggerService {
                         CREATE TABLE servicelog (
                              
                             logid         Integer
-                                primary key autoincrement,
-                             requesttime DATETIME,
-                             requestip VARCHAR(255),
-                             requestpath VARCHAR(255),
+                                primary key auto_increment,
+                             begintime DATETIME,
+                             endtime DATETIME,
+                             serviceid TEXT,
+                             resource TEXT,
                              requestdata TEXT,
-                             sessionid VARCHAR(255),
                              returndata TEXT,
-                             returncode INT,
+                             returncode TEXT,
                              returnmessage TEXT,
-                             lifecycleid INT
+                             lifecycleid TEXT
                          )
                                                                         """;
             } else if (targetName.equals("serviceerrlog")) {
@@ -195,16 +139,16 @@ public class LoggerService {
                         CREATE TABLE serviceerrlog (
                              
                             logid         Integer
-                                primary key autoincrement,
-                             requesttime DATETIME,
-                             requestip VARCHAR(255),
-                             requestpath VARCHAR(255),
+                                primary key auto_increment,
+                             begintime DATETIME,
+                             endtime DATETIME,
+                             serviceid TEXT,
+                             resource TEXT,
                              requestdata TEXT,
-                             sessionid VARCHAR(255),
                              returndata TEXT,
-                             returncode INT,
+                             returncode TEXT,
                              returnmessage TEXT,
-                             lifecycleid INT
+                             lifecycleid TEXT
                          )
                         """;
             } else if (targetName.equals("systemerrlog")) {
@@ -212,42 +156,43 @@ public class LoggerService {
                         create table systemerrlog
                          (
                              logid         Integer
-                                 primary key autoincrement,
-                             requesttime   DATETIME,
-                             requestip     VARCHAR(255),
-                             requestpath   VARCHAR(255),
-                             requestdata   TEXT,
-                             sessionid     VARCHAR(255),
-                             returndata    TEXT,
-                             returncode    INT,
-                             returnmessage TEXT,
-                             lifecycleid   INT
+                                 primary key auto_increment,
+                             occurrencetime DATETIME,
+                             occurrenceaddress TEXT,
+                             detailedmessage TEXT
                          );
 
 
                                                  """;
             } else if (targetName.equals("userlog")) {
                 sql = """
-                        CREATE TABLE userdolog (
+                        CREATE TABLE userlog (
                               
                             logid         Integer
-                                primary key autoincrement,
-                              requesttime DATETIME,
-                              requestip VARCHAR(255),
-                              requestpath VARCHAR(255),
-                              requestdata TEXT,
-                              sessionid VARCHAR(255),
-                              returndata TEXT,
-                              returncode INT,
-                              returnmessage TEXT,
-                              applicationid INT,
-                              userid INT,
-                              lifecycleid INT
+                                primary key auto_increment,
+                            requesttime DATETIME,
+                            requestip TEXT,
+                            requestpath TEXT,
+                            requestdata TEXT,
+                            sessionid TEXT,
+                            returndate DATETIME,
+                            returndata TEXT,
+                            returncode TEXT,
+                            returnmessage TEXT,
+                            dataobjectid TEXT,
+                            applicationid TEXT,
+                            userid TEXT
                           )
                         """;
             }
 //            创建表结构
             DataBase.exec(newConnection, sql);
+            try (Connection connection = createConnection(newConnection);
+                 Statement statement = connection.createStatement()
+            ) {
+                statement.execute(sql);
+            }
+
         }
         return newConnection;
     }
@@ -278,11 +223,9 @@ public class LoggerService {
                 }
 
             }
-            List<String> targets = Config.targets;
-
 //           删除成功的日志
             if (!result.isEmpty()) {
-                for (String target : targets) {
+                for (String target : Config.targets) {
                     Object type = JsonPath.read(target, "$.type");
                     if (Objects.isNull(type)) throw new RuntimeException("日志输出目标类型没有配置");
                     switch (type.toString()) {
@@ -332,5 +275,37 @@ public class LoggerService {
         }
     }
 
+    private static void insertLog(String connection, String sql, List<Object> args) {
+        try (
+                Connection connect = createConnection(connection);
+                PreparedStatement preparedStatement = connect.prepareStatement(sql)) {
+            for (int i = 0; i < args.size(); i++) {
+                preparedStatement.setObject(i + 1, args.get(i));
+            }
+            preparedStatement.executeUpdate();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private List<Map<String, Object>> query(String connection, String sql) {
+        try (
+                Connection connect = createConnection(connection);
+                PreparedStatement preparedStatement = connect.prepareStatement(sql)) {
+
+            ResultSet resultSet = preparedStatement.executeQuery();
+            return DataBase.getResult(connection, sql, resultSet);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Connection createConnection(String connection) throws SQLException {
+        Map<?, ?> map = DataFormatUtil.toMap(connection);
+        String jdbcUrl = DataFormatUtil.toString(map.get("jdbcUrl"));
+        String driverClassName = DataFormatUtil.toString(map.get("driverClassName"));
+        Driver driver = DriverManager.getDriver(driverClassName);
+        return driver.connect(jdbcUrl, null);
+    }
 
 }

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import com.scbfkj.uni.service.LoggerService;
@@ -56,7 +57,6 @@ public class SystemInit {
             }
         }, "* * * * * *");
 
-        LoggerService.logSystemError(null, null, null, null, null, "0", "启动应用程序成功");
     }
 
     private void initializeSystemEnvironment() {

src/test/java/com/scbfkj/uni/service/DataProcessServiceTest.java

@@ -1,139 +0,0 @@
-package com.scbfkj.uni.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.scbfkj.uni.library.DataFormatUtil;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@SpringBootTest
-class DataProcessServiceTest {
-
-    @Test
-    void getParams() throws JsonProcessingException {
-        List<Object> params = DataProcessService.getParams("List.$.a[0];;map.$.c;;double.1;;Datetime.20231031000001(yyyyMMddHHmmss)", """
-                {"a":[{"b":10}],"c":{"d":"20"}}""");
-        System.out.println(params);
-    }
-
-    @Test
-    void processByAlgorithmByDB0() throws Exception {
-
-        Map<String, Object> map = DataProcessService.processByAlgorithm(new HashMap<>() {{
-            put("algorithmlibraryid", 1);
-            put("serviceid", 1);
-            put("algorithmtype", 3);
-            put("computingexpression", "log_error");
-            put("parameterset", "$.datasource.connectset;;$.algorithm.computingexpression;;$.args[1].returnData;;$.algorithm.executionnumber");
-            put("preconditions", null);
-            put("executionnumber", "0");
-            put("datasourceid", "1");
-        }}, new ArrayList<>() {{
-            add(null);
-            add(new HashMap<>() {{
-                put("returnData", new ArrayList<>() {{
-                    add(new HashMap() {{
-                        put("id", 15);
-                    }});
-                }});
-            }});
-        }});
-
-        System.out.println(map);
-
-    }
-    @Test
-    void processByAlgorithmByDB1() throws Exception {
-
-        Map<String, Object> map = DataProcessService.processByAlgorithm(new HashMap<>() {{
-            put("algorithmlibraryid", 1);
-            put("serviceid", 1);
-            put("algorithmtype", 3);
-            put("computingexpression", "log_error");
-            put("parameterset", "$.datasource.connectset;;$.algorithm.computingexpression;;$.args[1].returnData;;$.algorithm.executionnumber");
-            put("preconditions", null);
-            put("executionnumber", "1");
-            put("datasourceid", "1");
-        }}, new ArrayList<>() {{
-            add(null);
-            add(new HashMap<>() {{
-                put("returnData", new ArrayList<>() {{
-                    add(new HashMap() {{
-                        put("id", 17);
-                    }});
-                }});
-            }});
-        }});
-
-        System.out.println(map);
-
-    }
-    @Test
-    void processByAlgorithmByDB2() throws Exception {
-
-        Map<String, Object> map = DataProcessService.processByAlgorithm(new HashMap<>() {{
-            put("algorithmlibraryid", 1);
-            put("serviceid", 1);
-            put("algorithmtype", 3);
-            put("computingexpression", "log_error");
-            put("parameterset", "$.datasource.connectset;;$.algorithm.computingexpression;;$.args[1].returnData;;$.algorithm.executionnumber");
-            put("preconditions", null);
-            put("executionnumber", "2");
-            put("datasourceid", "1");
-        }}, new ArrayList<>() {{
-            add(null);
-            add(new HashMap<>() {{
-                put("returnData", new ArrayList<>() {{
-                    add(new HashMap() {{
-                        put("value", new HashMap<String,Object>(){{
-                            put("serviceId",1001);
-                        }});
-                        put("filter", new HashMap<String,Object>(){{
-                            put("id",17);
-                        }});
-                    }});
-                }});
-            }});
-        }});
-
-        System.out.println(DataFormatUtil.toString(map));
-
-    }
-    @Test
-    void processByAlgorithmByDB3() throws Exception {
-
-        Map<String, Object> map = DataProcessService.processByAlgorithm(new HashMap<>() {{
-            put("algorithmlibraryid", 1);
-            put("serviceid", 1);
-            put("algorithmtype", 3);
-            put("computingexpression", "log_error");
-            put("parameterset", "$.datasource.connectset;;$.algorithm.computingexpression;;$.args[1].returnData;;$.algorithm.executionnumber");
-            put("preconditions", null);
-            put("executionnumber", "3");
-            put("datasourceid", "1");
-        }}, new ArrayList<>() {{
-            add(null);
-            add(new HashMap<>() {{
-                put("returnData", new ArrayList<>() {{
-                    add(new HashMap() {{
-                        put("value", new HashMap<String,Object>(){{
-                            put("serviceId",1001);
-                        }});
-                        put("filter", new HashMap<String,Object>(){{
-                            put("id",17);
-                        }});
-                    }});
-                }});
-            }});
-        }});
-
-        System.out.println(DataFormatUtil.toString(map));
-
-    }
-}