分页 aop权限修改

pom.xml

@@ -50,10 +50,10 @@
             <artifactId>com.ibm.mq.allclient</artifactId>
             <version>9.3.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>co.elastic.clients</groupId>-->
+        <!--            <artifactId>elasticsearch-java</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
@@ -133,6 +133,16 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>8.8.2</version>
+        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.elasticsearch.client</groupId>-->
+        <!--            <artifactId>elasticsearch-rest-high-level-client</artifactId>-->
+        <!--            <version>7.17.9</version>-->
+        <!--        </dependency>-->
 
     </dependencies>
 

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

@@ -1,5 +1,6 @@
 package com.scbfkj.uni.api;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.util.concurrent.RateLimiter;
 import com.scbfkj.uni.library.DataAliasGetUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
@@ -51,12 +52,16 @@ public class LogAop {
 
         try {
 
+            Map body = null;
+            Optional serviceid = Optional.empty();
+
 //            判断服务状态是否为健康状态 runstate!=0
             if (args.length > 0) {
                 Object arg = args[0];
                 if (arg instanceof Map map) {
 //                    查找serviceid
-                    Optional serviceid = DataAliasGetUtil.getValue("serviceid", map);
+                    body = map;
+                    serviceid = DataAliasGetUtil.getValue("serviceid", map);
                     if (serviceid.isPresent() && uri.startsWith("/openApi")) {
 //                        查找状态
                         List<Map<String, Object>> mapList = DataBase.query(Config.getCenterConnectionStr(), """
@@ -121,15 +126,64 @@ public class LogAop {
                                 } catch (Exception e) {
                                     return ResponseEntity.ok(UniReturnUtil.fail("token验证失败"));
                                 }
+                                if (body != null) {
+                                    List<Map<String, Object>> data = DataBase.query(Config.getSecurityConnectionStr(), "select * from applicationpermissions where appid = ?", RequestUtil.getAppId());
+                                    if (data != null && !data.isEmpty()) {
+                                        Map<String, Object> result = data.get(0);
+                                        Object columnlist = result.get("columnlist");
+                                        if (columnlist != null) {
+
+                                            List list = DataFormatUtil.objectMapper.readValue(columnlist.toString(), List.class);
+                                            body.put("filterColumns", list);
+                                        }
+                                        Object filterset = result.get("filterset");
+                                        if (filterset != null) {
+
+                                            List list = DataFormatUtil.objectMapper.readValue(columnlist.toString(), List.class);
+                                            body.put("filterLines", list.stream().map(it -> {
+                                                try {
+                                                    return DataFormatUtil.objectMapper.readValue(it.toString(), Map.class);
+                                                } catch (JsonProcessingException e) {
+                                                    throw new RuntimeException(e);
+                                                }
+                                            }).toList());
+                                        }
+                                    }
+                                }
                             }
                             if (Objects.equals("usertoken", s)) {
                                 String userToken = RequestUtil.getUserToken();
                                 if (Objects.isNull(userToken)) {
                                     return ResponseEntity.ok(UniReturnUtil.fail("没有找到 usertoken"));
                                 }
-                                Map<String, Object> result = securityService.checkUserToken(userToken);
-                                if (!result.get("code").equals("0")) {
-                                    return ResponseEntity.ok(result);
+                                Map<String, Object> checkResult = securityService.checkUserToken(userToken);
+                                if (!checkResult.get("code").equals("0")) {
+                                    return ResponseEntity.ok(checkResult);
+                                }
+
+                                if (body != null && serviceid.isPresent()) {
+                                    List<Map<String, Object>> data = DataBase.query(Config.getSecurityConnectionStr(), "select * from userpermissions where userid = ? and serviceid=?", RequestUtil.getUserId(), serviceid.get());
+                                    if (data != null && !data.isEmpty()) {
+                                        Map<String, Object> result = data.get(0);
+                                        Object columnlist = result.get("selectcolumnlist");
+                                        if (columnlist != null) {
+
+                                            List list = DataFormatUtil.objectMapper.readValue(columnlist.toString(), List.class);
+                                            body.put("filterColumns", list);
+                                        }
+                                        Object filterset = result.get("filterset");
+                                        if (filterset != null) {
+
+                                            List list = DataFormatUtil.objectMapper.readValue(columnlist.toString(), List.class);
+                                            body.put("filterLines", list.stream().map(it -> {
+                                                try {
+                                                    return DataFormatUtil.objectMapper.readValue(it.toString(), Map.class);
+                                                } catch (JsonProcessingException e) {
+                                                    throw new RuntimeException(e);
+                                                }
+                                            }).toList());
+                                        }
+                                    }
                                 }
                             }
                         }

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

@@ -19,7 +19,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public final class DataFormatUtil {
-    private final static ObjectMapper objectMapper = new ObjectMapper();
+    public final static ObjectMapper objectMapper = new ObjectMapper();
     private final static String LOCAL_DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
     private final static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(LOCAL_DATETIME_PATTERN);
 

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

@@ -18,7 +18,7 @@ public class DatabaseScriptUtil {
     private static final Map<String, List<String>> sqlStrVarList = new HashMap<>();//SQL语句的书名号变量列表
     public static Map<String, String> sqlStrNewSQL = new HashMap<>();//SQL语句更换书名号变量后的可执行SQL
 
-    public static Map<String, Object> exec(String connectionStr, String expression, List<Map<String, Object>> args, Object event, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
+    public static Map<String, Object> exec(String connectionStr, String expression, List<Map<String, Object>> args, Object event, List<String> filterColumns, List<Map<String, Object>> filterLines, Pageable pageable) throws Exception {
 
         if (Objects.isNull(event) || !StringUtils.hasText(event.toString())) {
             throw new RuntimeException("执行编号不能为空");
@@ -31,16 +31,7 @@ public class DatabaseScriptUtil {
         String filterLineWhereStr = null;
         for (Object f : filterLines) {
             Map<String, Object> it = ((Map<String, Object>) f);
-            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(
-                    filterLineWhereStr,
-                    it.getOrDefault("left", ""),
-                    it.get("column"),
-                    it.get("comparator"),
-                    Objects.equals(it.get("comparator"), " is null ") ? "" : "?",
-                    !Objects.equals(it.get("comparator"), " is null ") ? " " : it.get("value"),
-                    it.getOrDefault("right", ""),
-                    it.getOrDefault("connector", "")
-            );
+            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(filterLineWhereStr, it.getOrDefault("left", ""), it.get("column"), it.get("comparator"), Objects.equals(it.get("comparator"), " is null ") ? "" : "?", !Objects.equals(it.get("comparator"), " is null ") ? " " : it.get("value"), it.getOrDefault("right", ""), it.getOrDefault("connector", ""));
         }
 
 //        只有表名
@@ -78,23 +69,12 @@ public class DatabaseScriptUtil {
                             map = f;
                         }
                         Object comparator = map.get("comparator");
-                        whereStr = " %s %s %s %s %s %s %s ".formatted(
-                                whereStr,
-                                map.getOrDefault("left", ""),
-                                map.get("column"),
-                                comparator,
-                                Objects.equals(comparator, " is null ") ? " " : "?",
-                                map.getOrDefault("right", ""),
-                                map.getOrDefault("connector", "")
-                        );
+                        whereStr = " %s %s %s %s %s %s %s ".formatted(whereStr, map.getOrDefault("left", ""), map.get("column"), comparator, Objects.equals(comparator, " is null ") ? " " : "?", map.getOrDefault("right", ""), map.getOrDefault("connector", ""));
                         if (!Objects.equals(comparator, " is null ")) {
                             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 * from %s where %s and %s".formatted(expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr, whereStr.trim().isEmpty() ? " 1=? " : whereStr);
                     if (whereStr.trim().isEmpty()) {
                         values.add(new Object[]{1});
                     } else {
@@ -103,10 +83,7 @@ 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 * from %s where %s and  %s".formatted(expression, filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")), Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
 
                     for (Map<String, Object> arg : args) {
                         Map<String, Object> o1 = ((Map<String, Object>) arg.getOrDefault("filter", arg));
@@ -117,6 +94,9 @@ 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);
+                }
                 List<Map<String, Object>> result = DataBase.queryBatch(connectionStr, expression, values);
                 return UniReturnUtil.success(result);
 //                更新或新增
@@ -141,10 +121,10 @@ public class DatabaseScriptUtil {
                 }
                 Map<String, Object> insertResult = null;
                 if (!insertValues.isEmpty())
-                    insertResult = exec(connectionStr, expression, insertValues, "1", filterColumns, filterLines);
+                    insertResult = exec(connectionStr, expression, insertValues, "1", filterColumns, filterLines, null);
                 Map<String, Object> updateResult = null;
                 if (!updateValues.isEmpty())
-                    updateResult = exec(connectionStr, expression, updateValues, "2", filterColumns, filterLines);
+                    updateResult = exec(connectionStr, expression, updateValues, "2", filterColumns, filterLines, null);
 
                 Map<String, Object> finalInsertResult = insertResult;
                 Map<String, Object> finalUpdateResult = updateResult;
@@ -178,9 +158,7 @@ public class DatabaseScriptUtil {
                     Map<String, Object> filter = ((Map<String, Object>) map.get("filter"));
                     filterNames = filter.keySet().stream().toList();
 
-                    expression = "update %s set %s where %s and %s".formatted(expression, valueNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(",")),
-                            filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")),
-                            Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+                    expression = "update %s set %s where %s and %s".formatted(expression, valueNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(",")), filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and ")), Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
 //                    删除
                 } else if (Objects.equals("3", event)) {
 
@@ -197,9 +175,7 @@ public class DatabaseScriptUtil {
                         map = f;
                     }
                     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);
+                    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);
                 }
                 List<Object[]> values = new ArrayList<>();
 //                按照名称 和过滤条件取值
@@ -240,15 +216,7 @@ public class DatabaseScriptUtil {
                 if (filterMap.containsKey("column")) {
                     for (Object f : filterList) {
                         Map<String, Object> it = ((Map<String, Object>) f);
-                        whereStr = " %s %s %s %s %s %s %s".formatted(
-                                whereStr,
-                                it.getOrDefault("left", ""),
-                                it.get("column"),
-                                it.get("comparator"),
-                                Objects.equals(it.get("comparator"), " is null ") ? "" : "?",
-                                it.getOrDefault("right", ""),
-                                it.getOrDefault("connector", "")
-                        );
+                        whereStr = " %s %s %s %s %s %s %s".formatted(whereStr, it.getOrDefault("left", ""), it.get("column"), it.get("comparator"), Objects.equals(it.get("comparator"), " is null ") ? "" : "?", it.getOrDefault("right", ""), it.getOrDefault("connector", ""));
                         if (!Objects.equals(it.get("comparator"), " is null ")) {
                             dbFilter.add(it.get("value"));
                         }
@@ -270,12 +238,15 @@ public class DatabaseScriptUtil {
                 sql = "select %s from (%s) as T".formatted(String.join(",", filterColumns), sql);
             }
 
+            if (pageable != null && !sql.contains(" limit ")) {
+                sql = "select * from (%s) TA 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);
 
         } else {
             if (Objects.equals(event, "0")) {
-                List<Map<String, Object>> queryResult = query(connectionStr, expression, args, filterColumns, filterLines);
+                List<Map<String, Object>> queryResult = query(connectionStr, expression, args, filterColumns, filterLines, pageable);
                 return UniReturnUtil.success(queryResult);
             } else if (Objects.equals(event, "1")) {
                 if (sqlStrVarList.containsKey(expression)) {
@@ -319,23 +290,14 @@ public class DatabaseScriptUtil {
         return !Objects.equals(mapList.get(0).get("existscount").toString(), "0");
     }
 
-    public static List<Map<String, Object>> query(String connectionStr, String sql, List<Map<String, Object>> argsList, List<String> filterColumns, List<Map<String, Object>> filterLines) throws Exception {
+    public static List<Map<String, Object>> query(String connectionStr, String sql, List<Map<String, Object>> argsList, List<String> filterColumns, List<Map<String, Object>> filterLines, Pageable pageable) throws Exception {
 
         sql = sql.replaceAll("(\\r)?\\n", " ");
         String filterLineWhereStr = null;
         for (Object f : filterLines) {
             Map<String, Object> it = ((Map<String, Object>) f);
             Object comparator = it.get("comparator");
-            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(
-                    filterLineWhereStr,
-                    it.getOrDefault("left", ""),
-                    it.get("column"),
-                    comparator,
-                    Objects.equals(comparator, " is null ") ? "" : "?",
-                    !Objects.equals(comparator, " is null ") ? " " : it.get("value"),
-                    it.getOrDefault("right", ""),
-                    it.getOrDefault("connector", "")
-            );
+            filterLineWhereStr = " %s %s %s %s %s %s %s %s ".formatted(filterLineWhereStr, it.getOrDefault("left", ""), it.get("column"), comparator, Objects.equals(comparator, " is null ") ? "" : "?", !Objects.equals(comparator, " is null ") ? " " : it.get("value"), it.getOrDefault("right", ""), it.getOrDefault("connector", ""));
         }
         if (Objects.nonNull(filterLineWhereStr)) {
             sql = " %s %s and %s ".formatted(sql, sql.contains(" where ") ? " 1 = 1" : " where ", filterLineWhereStr);
@@ -374,6 +336,10 @@ 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);
+            }
             return DataBase.queryBatch(connectionStr, newSql, result.stream().map(List::toArray).toList());
         }
     }
@@ -390,8 +356,11 @@ public class DatabaseScriptUtil {
         if (Objects.nonNull(filterLinesTemp))
             filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
         Object event = args.get("event");
-
-        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines);
+        Pageable pageable = null;
+        if ("0".equals(event)) {
+            pageable = pageable(args);
+        }
+        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines, pageable);
     }
 
     public static Map<String, Object> execByTableName(String datasourceId, String table, Map<String, Object> args) throws Exception {
@@ -405,7 +374,11 @@ public class DatabaseScriptUtil {
         if (Objects.nonNull(filterLinesTemp))
             filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
         Object event = args.get("event");
-        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines);
+        Pageable pageable = null;
+        if ("0".equals(event)) {
+            pageable = pageable(args);
+        }
+        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines, pageable);
     }
 
     public static Map<String, Object> execByDynamicSql(String datasourceId, String expression, Map<String, Object> args) throws Exception {
@@ -419,8 +392,11 @@ public class DatabaseScriptUtil {
         if (Objects.nonNull(filterLinesTemp))
             filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
         Object event = args.get("event");
-
-        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines);
+        Pageable pageable = null;
+        if ("0".equals(event)) {
+            pageable = pageable(args);
+        }
+        return exec(queryConnectionStr(datasourceId), expression, dataContent, event, filterColumns, filterLines, pageable);
     }
 
     public static Map<String, Object> execByDynamicTableName(String datasourceId, String table, Map<String, Object> args) throws Exception {
@@ -434,8 +410,11 @@ public class DatabaseScriptUtil {
         if (Objects.nonNull(filterLinesTemp))
             filterLines = DataFormatUtil.toList(filterLinesTemp).stream().map(it -> ((Map<String, Object>) it)).toList();
         Object event = args.get("event");
-
-        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines);
+        Pageable pageable = null;
+        if ("0".equals(event)) {
+            pageable = pageable(args);
+        }
+        return exec(queryConnectionStr(datasourceId), table, dataContent, event, filterColumns, filterLines, pageable);
     }
 
     public static String queryConnectionStr(String datasourceId) throws Exception {
@@ -459,4 +438,28 @@ public class DatabaseScriptUtil {
             return hashMap;
         }).get());
     }
+
+    public static Pageable pageable(Map<String, Object> args) {
+        Object page = args.get("page");
+        Object size = args.get("size");
+        Long pageNumber = 0L;
+        Long pageSizeNumber = 0L;
+
+        if (Objects.nonNull(page)) {
+            pageNumber = Long.parseLong(page.toString()) - 1;
+        }
+        if (pageNumber < 0) {
+            pageNumber = 0L;
+        }
+        if (Objects.nonNull(size)) {
+            pageSizeNumber = Long.parseLong(size.toString());
+        }
+        if (pageSizeNumber <= 0) {
+            pageSizeNumber = 50L;
+        }
+        return new Pageable(pageNumber, pageSizeNumber);
+    }
+
+    public record Pageable(Long page, Long pageSize) {
+    }
 }

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

@@ -1,5 +1,10 @@
 package com.scbfkj.uni.process;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.UniReturnUtil;
 import org.apache.http.Header;
@@ -13,30 +18,44 @@ import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
+import org.springframework.http.HttpStatus;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class Elasticsearch {
 
     private static final Map<String, RestClient> restClientMap = new HashMap<>();
 
 
-    public static Map<String, Object> exec(String connection, List<String> datas) {
+    public static Map<String, Object> exec(String connection, String indexName, String event, List<String> datas) {
         if (Objects.isNull(datas) || datas.isEmpty()) {
             return UniReturnUtil.fail("数据为空");
         }
 
         RestClient restClient = create(connection);
         Map<?, ?> map = DataFormatUtil.toMap(connection);
-        Object endpoint = map.get("endpoint");
+        String endpoint = indexName;
         if (Objects.isNull(endpoint)) {
             endpoint = "/";
         }
-        Object method = map.get("method");
-        if (Objects.isNull(method)) {
-            method = "GET";
+        Object method = "GET";
+        switch (event.toUpperCase()) {
+            case "CREATE" -> {
+                method = "POST";
+            }
+            case "UPDATE" -> {
+                method = "PUT";
+            }
+            case "DELETE" -> {
+                method = "DELETE";
+            }
+            case "SEARCH" -> {
+                method = "POST";
+            }
+            case "GET" -> {
+                method = "GET";
+            }
         }
 
         Map<String, String> parametersMap = new HashMap<>();
@@ -46,45 +65,134 @@ public class Elasticsearch {
         }
 
         Object finalMethod = method;
-        Object finalEndpoint = endpoint;
-        List<HashMap<Object, Object>> results = new ArrayList<>();
-        datas.stream().map(d -> {
-            Request request = new Request(finalMethod.toString(), finalEndpoint.toString());
-            request.addParameters(parametersMap);
-            request.setJsonEntity(DataFormatUtil.toString(d));
-            return request;
-        }).forEach(r -> {
-            HashMap<Object, Object> result = new HashMap<>();
-            try {
-
-                Response response = restClient.performRequest(r);
-                result.put("response", response);
-            } catch (IOException e) {
-                result.put("exception", e);
-            }
-            results.add(result);
-        });
-        List<Exception> exceptions = results.stream().map(it -> it.get("exception")).filter(Objects::nonNull).map(it -> ((Exception) it)).toList();
-        List<Response> responses = results.stream().map(it -> it.get("response")).filter(Objects::nonNull).map(it -> ((Response) it)).toList();
-
-        if (exceptions.isEmpty()) {
-            return UniReturnUtil.success(responses.stream().map(response -> {
-                try {
-                    return EntityUtils.toString(response.getEntity());
-                } catch (IOException e) {
-                    return null;
-                }
-            }).filter(Objects::nonNull));
-        } else {
-
-            return UniReturnUtil.fail(exceptions.stream().map(UniReturnUtil::getMessage).collect(Collectors.joining("\n")), responses.stream().map(response -> {
-                try {
-                    return EntityUtils.toString(response.getEntity());
-                } catch (IOException e) {
-                    return null;
+        String finalEndpoint = endpoint;
+        List<Object> results = new ArrayList<>();
+        try {
+            for (String data : datas) {
+                String uri = finalEndpoint;
+                Object result = null;
+                Request request = null;
+                switch (event.toUpperCase()) {
+                    case "CREATE" -> {
+                        uri += "/_doc/";
+                        request = new Request(finalMethod.toString(), uri);
+                        request.addParameters(parametersMap);
+                        request.setJsonEntity(data);
+                        Response response = restClient.performRequest(request);
+                        if (response != null && HttpStatus.CREATED.value() == response.getStatusLine().getStatusCode()) {
+                            String responseBody = null;
+                            try {
+                                responseBody = EntityUtils.toString(response.getEntity());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            result = Collections.singletonList(responseBody);
+                        } else {
+                            result = Collections.singletonList(false);
+                        }
+                    }
+                    case "UPDATE" -> {
+                        ObjectNode jsonNodes = DataFormatUtil.stringToObjectNode(data);
+                        JsonNode id = jsonNodes.get("_id");
+                        uri += "/_doc/" + id.asText();
+                        request = new Request(finalMethod.toString(), uri);
+                        request.addParameters(parametersMap);
+                        request.setJsonEntity(DataFormatUtil.toString(jsonNodes.get("data")));
+                        Response response = restClient.performRequest(request);
+                        if (response != null && HttpStatus.OK.value() == response.getStatusLine().getStatusCode()) {
+                            String responseBody = null;
+                            try {
+                                responseBody = EntityUtils.toString(response.getEntity());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            result = Collections.singletonList(responseBody);
+                        } else {
+                            result = Collections.singletonList(false);
+                        }
+
+                    }
+                    case "DELETE" -> {
+                        uri += "/_doc/" + data;
+                        request = new Request(finalMethod.toString(), uri);
+                        request.addParameters(parametersMap);
+                        Response response = restClient.performRequest(request);
+                        if (response != null && HttpStatus.OK.value() == response.getStatusLine().getStatusCode()) {
+                            String responseBody = null;
+                            try {
+                                responseBody = EntityUtils.toString(response.getEntity());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            result = Collections.singletonList(responseBody);
+                        } else {
+                            result = Collections.singletonList(false);
+                        }
+                    }
+                    case "GET" -> {
+                        uri += "/_doc/" + data;
+                        request = new Request(finalMethod.toString(), uri);
+                        request.addParameters(parametersMap);
+                        Response response = restClient.performRequest(request);
+                        if (response != null && HttpStatus.OK.value() == response.getStatusLine().getStatusCode()) {
+                            String responseBody = null;
+                            try {
+                                responseBody = EntityUtils.toString(response.getEntity());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            result = Collections.singletonList(responseBody);
+                        } else {
+                            result = Collections.singletonList(false);
+                        }
+                    }
+                    case "SEARCH" -> {
+                        uri += "/_search";
+                        request = new Request(finalMethod.toString(), uri);
+                        request.addParameters(parametersMap);
+
+                        ObjectNode jsonNodes = DataFormatUtil.stringToObjectNode(data);
+                        request.setJsonEntity(jsonNodes.toString());
+                        Response response = restClient.performRequest(request);
+                        if (response != null && HttpStatus.OK.value() == response.getStatusLine().getStatusCode()) {
+                            String responseBody = null;
+                            try {
+                                responseBody = EntityUtils.toString(response.getEntity());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                            ObjectNode jsonObject = null;
+                            try {
+                                jsonObject = DataFormatUtil.stringToObjectNode(responseBody);
+                            } catch (JsonProcessingException e) {
+                                throw new RuntimeException(e);
+                            }
+                            ObjectNode jsonObject1 = (ObjectNode) (jsonObject.get("hits")).get("total");
+                            if (jsonObject1.get("value") != null) {
+                                Integer total = jsonObject1.get("value").asInt();
+                                System.out.println("总记录数:" + total);
+                            }
+                            //处理返回结果
+                            ArrayNode jsonArray = (ArrayNode) (jsonObject.get("hits")).get("hits");
+
+                            ArrayNode objects = new ArrayNode(JsonNodeFactory.instance);
+                            for (JsonNode e : jsonArray) {
+                                ObjectNode source = (ObjectNode) e.get("_source");
+                                objects.add(source);
+                            }
+                            result = objects;
+                        }
+
+                    }
                 }
-            }).filter(Objects::nonNull));
+
+
+                results.add(result);
+            }
+        } catch (Exception e) {
+            return UniReturnUtil.fail(e);
         }
+        return UniReturnUtil.success(results);
     }
 
 
@@ -96,26 +204,21 @@ public class Elasticsearch {
         Map<?, ?> map = DataFormatUtil.toMap(connection);
 
         List<String> hosts = (List<String>) map.get("host");
-        Object[] list = hosts.stream().map(HttpHost::create).toArray();
-
-        HttpHost[] httpHosts = (HttpHost[]) list;
+        HttpHost[] httpHosts = hosts.stream().map(HttpHost::create).toArray(HttpHost[]::new);
         RestClientBuilder builder = RestClient.builder(httpHosts);
         Object username = map.get("username");
         Object password = map.get("password");
         Object token = map.get("token");
         if (Objects.nonNull(username) && Objects.nonNull(password)) {
-            builder
-                    .setHttpClientConfigCallback(httpClientBuilder -> {
-                        BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-                        credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username.toString(), password.toString()));
-                        httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-                        return httpClientBuilder;
-                    });
+            builder.setHttpClientConfigCallback(httpClientBuilder -> {
+                BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+                credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username.toString(), password.toString()));
+                httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                return httpClientBuilder;
+            });
 
         } else if (Objects.nonNull(token)) {
-            builder.setDefaultHeaders(new Header[]{
-                    new BasicHeader("AuthorizationScript", "Bearer " + token)
-            });
+            builder.setDefaultHeaders(new Header[]{new BasicHeader("AuthorizationScript", "Bearer " + token)});
         }
         restClient = builder.build();
         restClientMap.put(connection, restClient);

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

@@ -323,7 +323,7 @@ public class DataProcessService {
             case "3" -> {
                 // 下放到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));
+                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);
             }
             default -> {
                 return UniReturnUtil.fail("算法类型不支持");

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

@@ -19,7 +19,6 @@ import static org.springframework.web.context.request.RequestAttributes.SCOPE_SE
 @Service
 public class SecurityService {
 
-
     private static final SecureRandom RANDOM = new SecureRandom();
     @Value("${app.token-effective:604800}")
     private long defaultAppTokenEffective;
@@ -476,6 +475,9 @@ public class SecurityService {
                            defaultvalue,
                            calculationformula,
                            servicetype,
+                           groupid,
+                           alias,
+                           labelcode,
                            null as serviceid,
                            null as insetcolumnlist,
                            null as updatecolumnlist,
@@ -528,6 +530,9 @@ public class SecurityService {
                            t3.defaultvalue,
                            t3.calculationformula,
                            t3.servicetype,
+                           t3.groupid,
+                           t3.alias,
+                           t3.labelcode,
                            t1.serviceid, insetcolumnlist,
                            updatecolumnlist,
                            selectcolumnlist,

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

@@ -62,6 +62,17 @@ public class SystemInit {
         return content.toString();
     }
 
+    private static void containerHeartbeat() {
+        try {
+            DataBase.update(Config.getCenterConnectionStr(), "update container set runstate =1 ,lasttime=? where containercode=?", LocalDateTime.now(), Config.getContainerCode());
+        } catch (Exception e) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("logtime", LocalDateTime.now());
+            data.put("errordata", UniReturnUtil.getMessage(e));
+            LoggerService.log(LoggerService.LogType.SYSTEM, data);
+        }
+    }
+
     @PostConstruct
     public void init() throws Exception {
         Config.setContainerCode(containerCode);
@@ -103,6 +114,7 @@ public class SystemInit {
                 System.out.println(UniReturnUtil.getMessage(e));
             }
         }, 1000);
+        ScheduleUtil.startFrequencyTask(SystemInit::containerHeartbeat, 60000);
     }
 
     private void initializeSystemEnvironment() throws Exception {

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

@@ -38,7 +38,7 @@ class DatabaseScriptUtilTest {
                 }
                                 """, "select * from interfacelog where  interfacelogid > 《id》", Collections.singletonList(new HashMap<>() {{
             put("id", 1);
-        }}), "0", null, null);
+        }}), "0", null, null, new DatabaseScriptUtil.Pageable(1L, 10L));
         System.out.println(UniReturnUtil.success(new ArrayList<>()));
     }
 }

src/test/java/com/scbfkj/uni/process/DataBaseTest.java

@@ -73,37 +73,37 @@ class DataBaseTest {
     void testExec() throws Exception {
 
 
-        Map<String, Object> exec = exec(connectionStr, tableName, insert, "3", filterColumns, filterLines);
+        Map<String, Object> exec = exec(connectionStr, tableName, insert, "3", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, insert, "1", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, insert, "1", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, insert, "0", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, insert, "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, update, "2", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, update, "2", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, update, "0", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, update, "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, insertOrupdate, "6", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, insertOrupdate, "6", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
-        exec = exec(connectionStr, tableName, insertOrupdate, "0", filterColumns, filterLines);
+        exec = exec(connectionStr, tableName, insertOrupdate, "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
     }
 
     @Test
     void testWhereStr() throws Exception {
-        Map<String, Object> exec = exec(connectionStr, "select * from %s where 《whereStr》".formatted(tableName), insert, "0", filterColumns, filterLines);
+        Map<String, Object> exec = exec(connectionStr, "select * from %s where 《whereStr》".formatted(tableName), insert, "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
     }
 
     @Test
     void testBookTitleSymbol() throws Exception {
-        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert, "0", filterColumns, filterLines);
+        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert, "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
     }
 
     @Test
     void testBookTitleSymbol2() throws Exception {
-        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert.stream().map(it -> ((Map<String, Object>) it.get("filter"))).toList(), "0", filterColumns, filterLines);
+        Map<String, Object> exec = exec(connectionStr, "select * from %s where id=《id》".formatted(tableName), insert.stream().map(it -> ((Map<String, Object>) it.get("filter"))).toList(), "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
     }
 
@@ -119,7 +119,7 @@ class DataBaseTest {
                     put("right", ")");
                 }});
             }});
-        }}), "0", filterColumns, filterLines);
+        }}), "0", filterColumns, filterLines, null);
         System.out.println(DataFormatUtil.toString(exec));
     }
 }

src/test/java/com/scbfkj/uni/process/ElasticsearchTest.java

@@ -0,0 +1,105 @@
+package com.scbfkj.uni.process;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.Map;
+
+class ElasticsearchTest {
+
+    @Test
+    void exec3() {
+        Map<String, Object> exec = Elasticsearch.exec("""
+                                                {
+                  "host": [
+                    "http://120.26.64.82:9200"
+                  ],
+                  "username": null,
+                  "password": null,
+                  "auth": null
+                }
+                                                """, "test", "search", Collections.singletonList(
+                """
+                        {
+                           "query": {
+                             "match": {
+                               "a": 1
+                             }
+                           }
+                         }"""));
+        System.out.println(exec);
+    }
+
+    @Test
+    void exec() {
+        Map<String, Object> exec = Elasticsearch.exec("""
+                                                {
+                  "host": [
+                    "http://120.26.64.82:9200"
+                  ],
+                  "username": null,
+                  "password": null,
+                  "auth": null
+                }
+                                                """, "test", "CREATE", Collections.singletonList("""
+                                {
+                  "a": 1,
+                  "b": 2
+                }
+                                """));
+        System.out.println(exec);
+    }
+
+    @Test
+    void exec4() {
+        Map<String, Object> exec = Elasticsearch.exec("""
+                                                {
+                  "host": [
+                    "http://120.26.64.82:9200"
+                  ],
+                  "username": null,
+                  "password": null,
+                  "auth": null
+                }
+                                                """, "test", "UPDATE", Collections.singletonList("""
+                                {
+                  "_id": "_VtWZowBdZt8yNMHSgge",
+                  "data": {
+                    "a": 1,
+                    "b": 3
+                  }
+                }
+                                                """));
+        System.out.println(exec);
+    }
+
+    @Test
+    void exec5() {
+        Map<String, Object> exec = Elasticsearch.exec("""
+                                                {
+                  "host": [
+                    "http://120.26.64.82:9200"
+                  ],
+                  "username": null,
+                  "password": null,
+                  "auth": null
+                }
+                                                """, "test", "DELETE", Collections.singletonList("_VtWZowBdZt8yNMHSgge"));
+        System.out.println(exec);
+    }
+
+    @Test
+    void exec2() {
+        Map<String, Object> exec = Elasticsearch.exec("""
+                                                {
+                  "host": [
+                    "http://120.26.64.82:9200"
+                  ],
+                  "username": null,
+                  "password": null,
+                  "auth": null
+                }
+                                                """, "test", "get", Collections.singletonList("_FtTZowBdZt8yNMH2gg7"));
+        System.out.println(exec);
+    }
+}