email websocket 等

pom.xml

@@ -140,6 +140,24 @@
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.2.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+            <version>1.6.7</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -1,11 +1,14 @@
 package com.scbfkj.uni.api;
 
+import com.scbfkj.uni.library.DataFormatUtil;
 import com.scbfkj.uni.library.RequestUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.service.DataProcessService;
 import com.scbfkj.uni.system.Config;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +38,7 @@ public class GenericApi {
             event = "0";
         }
         body.put("event", event);
+        body.put("headers", RequestUtil.getHeaders());
 
         Map<String, Object> process = new DataProcessService().process(body);
         return ResponseEntity.ok(process);

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

@@ -114,6 +114,7 @@ public class LogAop {
             logData.put("requestdata", DataFormatUtil.toString(args));
             logData.put("sessionid", RequestUtil.getSessionId());
             logData.put("returndata", DataFormatUtil.toString(returnData));
+            logData.put("returntime", LocalDateTime.now());
             try {
                 logData.put("applicationid", RequestUtil.getAppId());
             } catch (Exception e) {

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

@@ -1,98 +0,0 @@
-package com.scbfkj.uni.api;
-
-import com.scbfkj.uni.library.IbmmqUtil;
-import com.scbfkj.uni.library.UniReturnUtil;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-
-@RestController
-@RequestMapping("util")
-public class UtilApi {
-
-    public static class IbmmqProp {
-        private String host;
-        private int port;
-        private int CCSID;
-        private String queueManager;
-        private String channel;
-        private String userName;
-        private String password;
-        private String queueName;
-
-        public String getHost() {
-            return host;
-        }
-
-        public void setHost(String host) {
-            this.host = host;
-        }
-
-        public int getPort() {
-            return port;
-        }
-
-        public void setPort(int port) {
-            this.port = port;
-        }
-
-        public int getCCSID() {
-            return CCSID;
-        }
-
-        public void setCCSID(int CCSID) {
-            this.CCSID = CCSID;
-        }
-
-        public String getChannel() {
-            return channel;
-        }
-
-        public void setChannel(String channel) {
-            this.channel = channel;
-        }
-
-        public String getUserName() {
-            return userName;
-        }
-
-        public void setUserName(String userName) {
-            this.userName = userName;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-
-        public String getQueueName() {
-            return queueName;
-        }
-
-        public void setQueueName(String queueName) {
-            this.queueName = queueName;
-        }
-
-        public String getQueueManager() {
-            return queueManager;
-        }
-
-        public void setQueueManager(String queueManager) {
-            this.queueManager = queueManager;
-        }
-    }
-
-    @PostMapping("ibmmq/depth")
-    public ResponseEntity<Map<String,Object>> ibmmqDepth(@RequestBody(required = true) IbmmqProp prop) {
-        int depth = IbmmqUtil.getDepth(prop.getHost(), prop.getPort(), prop.getCCSID(), prop.getQueueManager(), prop.getChannel(), prop.getQueueName(), prop.getUserName(), prop.getPassword());
-        return ResponseEntity.ok(UniReturnUtil.success(depth));
-    }
-}

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

@@ -0,0 +1,74 @@
+package com.scbfkj.uni.api;
+
+import com.scbfkj.uni.library.DataFormatUtil;
+import com.scbfkj.uni.library.UniReturnUtil;
+import com.scbfkj.uni.service.DataProcessService;
+import jakarta.websocket.*;
+import jakarta.websocket.server.ServerEndpoint;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+
+@ServerEndpoint("/ws")
+@Component
+public class WebSocketServer {
+    /**
+     * ServerEndpoint注解
+     * 主要是将目前的类定义成一个websocket服务器端,
+     * 注解的值将被用于监听用户连接的终端访问URL地址,客户端可以通过这个URL来连接到WebSocket服务器端
+     **/
+    // 与某个客户端的连接会话，需要通过它来给客户端发送数据
+    private Session session;
+
+
+    /**
+     * 建立WebSocket连接
+     *
+     * @param session
+     */
+    @OnOpen
+    public void onOpen(Session session) {
+
+        // 建立连接
+        this.session = session;
+    }
+
+    /**
+     * 发生错误
+     *
+     * @param throwable e
+     */
+    @OnError
+    public void onError(Throwable throwable) {
+        throwable.printStackTrace();
+    }
+
+    /**
+     * 连接关闭
+     */
+    @OnClose
+    public void onClose() {
+    }
+
+    /**
+     * 接收客户端消息
+     *
+     * @param message 接收的消息
+     */
+    @OnMessage
+    public void onMessage(String message) throws IOException {
+        System.out.println(message);
+        String result;
+        try {
+            Map<String, Object> map = new DataProcessService().process((Map<String, Object>) DataFormatUtil.toMap(message));
+            result = DataFormatUtil.toString(map);
+        } catch (Exception e) {
+            result = DataFormatUtil.toString(UniReturnUtil.fail(e));
+        }
+
+        session.getBasicRemote().sendText(result);
+
+    }
+
+}

src/main/java/com/scbfkj/uni/config/WebSocketConfig.java

@@ -1,28 +1,14 @@
 package com.scbfkj.uni.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry config) {
-
-//        对应 @SendTo 比如@SendTo("/topic/greeting")
-        config.enableSimpleBroker("/topic");
-//        对应 @MessageMapping 比如@MessageMapping("/hello") 会自动添加前缀路径形成的完整路径为/app/hello
-        config.setApplicationDestinationPrefixes("/app");
-    }
-
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-//        建立连接的url
-        registry.addEndpoint("/gs-guide-websocket").setAllowedOriginPatterns("*");
+public class WebSocketConfig {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
     }
 
 }

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

@@ -199,10 +199,46 @@ public final class DataFormatUtil {
         return xmlMapper.get();
     }
 
-    public static String xml2json(String xml) throws JsonProcessingException {
+    public static String xmltojson(String xml) throws JsonProcessingException {
         Object json = getXmlMapper().readValue(xml, Object.class);
 
         String jsonStr = getObjectMapper().writeValueAsString(json);
         return jsonStr;
     }
+
+    public static List<Map<String, List<List<String>>>> typeBtoMap(List<String> datas) {
+        return datas.stream().map(it -> {
+            Map<String, List<List<String>>> data = new HashMap<>();
+            String[] split = it.split("[.|(\\r)?\\n]");
+            for (String s : split) {
+                String[] cells = s.split("/");
+                String cell = cells[0];
+                if (cell.length() != 1) {
+                    continue;
+                }
+                List<String> ds = new ArrayList<>(Arrays.asList(cells).subList(1, cells.length));
+                if (data.containsKey(cell)) {
+                    data.get(cell).add(ds);
+                } else {
+                    data.put(cell, new ArrayList<>() {{
+                        add(ds);
+                    }});
+                }
+            }
+            if (it.contains("BSM") && it.contains("ENDBSM")) {
+                data.put("type", new ArrayList<>() {{
+                    add(new ArrayList<>() {{
+                        add("BSM");
+                    }});
+                }});
+            } else if (it.contains("BPM") && it.contains("ENDBPM")) {
+                data.put("type", new ArrayList<>() {{
+                    add(new ArrayList<>() {{
+                        add("BPM");
+                    }});
+                }});
+            }
+            return data;
+        }).toList();
+    }
 }

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

@@ -0,0 +1,38 @@
+package com.scbfkj.uni.library;
+
+import com.scbfkj.uni.process.DataBase;
+import com.scbfkj.uni.process.Email;
+import com.scbfkj.uni.system.Config;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+public class EmailUtil {
+
+    private static final DataBase DATA_BASE = new DataBase();
+
+
+    public Map<String, Object> sendEmailByDataSource(String dataSourceId, String to, String subject, String content) throws Exception {
+
+
+        if(Objects.isNull(to)){
+            return UniReturnUtil.fail("邮箱不能为空");
+        }
+
+        Optional<Map<String, Object>> datasourceOpt = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId).stream().findFirst();
+
+        if (datasourceOpt.isEmpty()) {
+            return UniReturnUtil.fail("数据源没有找到");
+        }
+        Map<String, Object> dataSource = datasourceOpt.get();
+        Map<?, ?> props = DataFormatUtil.toMap(dataSource.get("host"));
+        String emailUsername = DataFormatUtil.toString(dataSource.get("username"));
+        String emailPassword = DataFormatUtil.toString(dataSource.get("password"));
+
+
+        Email.sendEmail(props, emailUsername, emailPassword, to, subject, content);
+        return UniReturnUtil.success("success");
+    }
+
+}

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

@@ -1,4 +1,48 @@
 package com.scbfkj.uni.library;
 
+import org.apache.poi.ss.usermodel.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class FileUtil {
+
+    public static Map<String, List<List<String>>> readExcelToMap(File file) throws IOException {
+        Map<String, List<List<String>>> dataMap = new HashMap<>();
+
+        try (FileInputStream fis = new FileInputStream(file);
+             Workbook workbook = WorkbookFactory.create(fis)) {
+            for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
+                Sheet sheet = workbook.getSheetAt(i);
+
+                List<List<String>> sheetData = new ArrayList<>();
+                for (int i2 = 0; i2 <= sheet.getLastRowNum(); i2++) {
+                    List<String> rowData = new ArrayList<>();
+                    Row row = sheet.getRow(i2);
+                    if (row == null) {
+
+                        sheetData.add(rowData);
+                        continue;
+                    }
+                    for (int i1 = 0; i1 < row.getLastCellNum(); i1++) {
+                        Cell cell = row.getCell(i1);
+                        if (cell == null) {
+                            rowData.add(null);
+                            continue;
+                        }
+                        rowData.add(cell.getStringCellValue());
+                    }
+                    sheetData.add(rowData);
+                }
+
+                dataMap.put(sheet.getSheetName(), sheetData);
+            }
+        }
+        return dataMap;
+    }
 }

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

@@ -0,0 +1,141 @@
+package com.scbfkj.uni.library;
+
+import com.scbfkj.uni.process.DataBase;
+import com.scbfkj.uni.process.Email;
+import com.scbfkj.uni.system.Config;
+
+import java.util.*;
+
+public class UserUtil {
+
+
+    private static final DataBase DATA_BASE = new DataBase();
+
+    public static Map<String, Object> forgetPassword(String dataSourceId, String username, String email, String encryptType) throws Exception {
+
+        Optional<Map<String, Object>> userOpt = DATA_BASE.query(Config.getSecurityConnectionStr(), "select * from userinfo  where account = ? and email=?", username, email).stream().findFirst();
+
+        if (userOpt.isEmpty()) {
+            return UniReturnUtil.fail("账号或邮件不正确");
+        }
+        String encryptPassword;
+        String newPassword = UUID.randomUUID().toString().substring(0, 15);
+        newPassword = newPassword.substring(0, 5) + "$" + newPassword.substring(5, 10) + "@!" + newPassword.substring(10).toUpperCase();
+
+        switch (encryptType.toLowerCase()) {
+            case "md5" -> {
+                encryptPassword = DataEncryptionUtil.signatureMD5(newPassword);
+            }
+            case "rsa" -> {
+                encryptPassword = DataEncryptionUtil.encryptRSAByPublicKey(newPassword);
+            }
+            default -> {
+                return UniReturnUtil.fail("不支持的加密类型");
+            }
+        }
+
+
+        Optional<Map<String, Object>> datasourceOpt = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId).stream().findFirst();
+
+        if (datasourceOpt.isEmpty()) {
+            return UniReturnUtil.fail("数据源没有找到");
+        }
+        Map<String, Object> dataSource = datasourceOpt.get();
+        Map<?, ?> props = DataFormatUtil.toMap(dataSource.get("host"));
+        String emailUsername = DataFormatUtil.toString(dataSource.get("username"));
+        String emailPassword = DataFormatUtil.toString(dataSource.get("password"));
+
+        try {
+            Email.sendEmail(props, emailUsername, emailPassword, email, "找回密码", """
+                    %s 您好！
+                        已为您重置为新的临时密码为：
+                            %s
+                        请尽快登录系统修改您的密码。
+                                    """.formatted(username, newPassword));
+            DATA_BASE.update(Config.getSecurityConnectionStr(), "update userinfo set userpassword = ? where account =?", encryptPassword, username);
+            return UniReturnUtil.success("发送邮件成功");
+        } catch (Exception e) {
+            return UniReturnUtil.fail("发送邮件失败:" + UniReturnUtil.getMessage(e));
+        }
+    }
+
+//
+//    public static Map<String, Object> forgetPasswordUpdateDataSourceId(String dataSourceId, Map<String, String> data, String encryptType, String tableName, String updateDataSourceId, String updateColumn) throws Exception {
+//        List<String> columns = data.keySet().stream().toList();
+//        String V1 = data.get(columns.get(0));
+//        String V2 = data.get(columns.get(1));
+//        Optional<Map<String, Object>> userOpt = DATA_BASE.query(Config.getSecurityConnectionStr(), "select * from %s  where %s = ? and %s=?".formatted(tableName, columns.get(0), columns.get(1)), V1, V2).stream().findFirst();
+//
+//        if (userOpt.isEmpty()) {
+//            return UniReturnUtil.fail("账号或邮件不正确");
+//        }
+//
+//        String username;
+//        String email;
+//
+//
+//
+//        String encryptPassword;
+//        String newPassword = UUID.randomUUID().toString().substring(0, 15);
+//        newPassword = newPassword.substring(0, 5) + "$" + newPassword.substring(5, 10) + "@!" + newPassword.substring(10).toUpperCase();
+//
+//        switch (encryptType.toLowerCase()) {
+//            case "md5" -> {
+//                encryptPassword = DataEncryptionUtil.signatureMD5(newPassword);
+//            }
+//            case "rsa" -> {
+//                encryptPassword = DataEncryptionUtil.encryptRSAByPublicKey(newPassword);
+//            }
+//            default -> {
+//                return UniReturnUtil.fail("不支持的加密类型");
+//            }
+//        }
+//
+//
+//        Optional<Map<String, Object>> datasourceOpt = DATA_BASE.query(Config.getCenterConnectionStr(), "select * from datasource where datasourceid=?", dataSourceId).stream().findFirst();
+//
+//        if (datasourceOpt.isEmpty()) {
+//            return UniReturnUtil.fail("数据源没有找到");
+//        }
+//        Map<String, Object> dataSource = datasourceOpt.get();
+//        Map<?, ?> props = DataFormatUtil.toMap(dataSource.get("host"));
+//        String emailUsername = DataFormatUtil.toString(dataSource.get("username"));
+//        String emailPassword = DataFormatUtil.toString(dataSource.get("password"));
+//
+////        todo
+//        try {
+//            Email.sendEmail(props, emailUsername, emailPassword, email, "找回密码", """
+//                    %s 您好！
+//                        已为您重置为新的临时密码为：
+//                            %s
+//                        请尽快登录系统修改您的密码。
+//                                    """.formatted(username, newPassword));
+//            DATA_BASE.update(queryConnectionStr(updateDataSourceId), "update %s set %s = ? where %s =?".formatted(tableName,columns[]), encryptPassword, username);
+//            return UniReturnUtil.success("发送邮件成功");
+//        } catch (Exception e) {
+//            return UniReturnUtil.fail("发送邮件失败:" + UniReturnUtil.getMessage(e));
+//        }
+//    }
+//
+//    public static String queryConnectionStr(String datasourceId) throws Exception {
+//        List<Map<String, Object>> result = DATA_BASE.query(Config.getCenterConnectionStr(), """
+//                select datasourceid,
+//                       host,
+//                       username,
+//                       password,
+//                       driverclassname
+//                from datasource
+//                where datasourceid = ?""", datasourceId);
+//        if (result.isEmpty()) {
+//            throw new RuntimeException("数据源错误：没有找到数据源");
+//        }
+//        return DataFormatUtil.toString(result.stream().findFirst().map(it -> {
+//            HashMap<String, Object> hashMap = new HashMap<>();
+//            hashMap.put("jdbcUrl", it.get("host"));
+//            hashMap.put("username", it.get("username"));
+//            hashMap.put("password", it.get("password"));
+//            hashMap.put("driverClassName", it.get("driverclassname"));
+//            return hashMap;
+//        }).get());
+//    }
+}

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

@@ -57,10 +57,17 @@ public class DatabaseScriptUtil {
 
     public String getFilterLinesWhereSql(List<Map<String, Object>> filterLines) {
         if (Objects.isNull(filterLines)) filterLines = new ArrayList<>();
-        String filterLineWhereStr = null;
+        String filterLineWhereStr = "";
         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", ""));
+            Object comparator = it.get("comparator").toString().toLowerCase();
+            filterLineWhereStr = " %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 not null ") ? "" :"'"+ it.get("value")+"'",
+                    it.getOrDefault("right", ""),
+                    it.getOrDefault("connector", ""));
         }
         return filterLineWhereStr;
     }
@@ -208,7 +215,7 @@ public class DatabaseScriptUtil {
                 whereStr += list.stream().map(it -> "%s = ?".formatted(it.getKey())).collect(Collectors.joining(" and "));
                 dbFilter.addAll(list.stream().map(Map.Entry::getValue).toList());
             }
-            whereStr = " %s and  %s".formatted(whereStr.trim().isEmpty() ? " 1=1 " : whereStr, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr);
+            whereStr = " %s and  %s".formatted(whereStr.trim().isEmpty() ? " 1=1 " : whereStr, filterLineWhereStr.trim().isEmpty() ? " 1=1 " : filterLineWhereStr);
             String sql = expression.replaceAll("《whereStr》", " " + whereStr);
 
             sql = "select %s from (%s) as T".formatted(String.join(",", filterColumns), sql);
@@ -264,9 +271,12 @@ public class DatabaseScriptUtil {
         }
         List<Map<String, Object>> dataContent = DataFormatUtil.toList(args.get("datacontent")).stream().map(it -> ((Map<String, Object>) it)).toList();
         Object filterColumnsTemp = args.get("filterColumns");
-        List<String> filterColumns = null;
+        List<String> filterColumns;
         if (Objects.nonNull(filterColumnsTemp))
             filterColumns = DataFormatUtil.toList(filterColumnsTemp).stream().map(it -> it.toString()).toList();
+        else {
+            filterColumns = new ArrayList<>();
+        }
         Object filterLinesTemp = args.get("filterLines");
         List<Map<String, Object>> filterLines = null;
         if (Objects.nonNull(filterLinesTemp))
@@ -275,8 +285,6 @@ public class DatabaseScriptUtil {
 
         String expression = table;
 
-        if (Objects.isNull(filterColumns)) filterColumns = new ArrayList<>();
-
         String filterLineWhereStr = getFilterLinesWhereSql(filterLines);
 
         String connectionStr = datasourceId;
@@ -285,11 +293,21 @@ public class DatabaseScriptUtil {
         }
         List<String> valueNames = null;
         List<String> filterNames = null;
+        List<String> allColumns = DATABASE.getColumnsByTableName(connectionStr, expression);
+        if(filterColumns.size()==1 && !"*".equals(filterColumns.get(0))) {
+            List<String> filterColumns2 = new ArrayList<>();
+            for (String allColumn : allColumns) {
+                if (filterColumns.contains(allColumn)) {
+                    filterColumns2.add(allColumn);
+                }
+            }
+                filterColumns = filterColumns2;
 
+        }
 
 //            查询
         if (Objects.equals("0", event)) {
-            List<String> allColumns = DATABASE.getColumnsByTableName(connectionStr, expression);
+
 
             if (filterColumns.isEmpty()) {
 //                列权限为空直接返回空数据
@@ -313,23 +331,23 @@ public class DatabaseScriptUtil {
             if (map.containsKey("column") && map.containsKey("comparator")) {
 
                 ArrayList<Object> objects = new ArrayList<>();
-                for (Map<String, Object> it : dataContent) {
-                    filter = it.getOrDefault("filter", it);
-                    if (filter instanceof ArrayNode f) {
-                        map = ((Map<?, ?>) f.get(0));
-                    } else if (filter instanceof List<?> f) {
-                        map = ((Map<?, ?>) f.get(0));
-
-                    } else if (filter instanceof Map<?, ?> f) {
-                        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", ""));
-                    if (!Objects.equals(comparator, " is null ")) {
-                        objects.add(map.get("value"));
-                    }
-                }
-                expression = "select %s from %s where %s and %s".formatted(String.join(",", allColumns), expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr, whereStr.trim().isEmpty() ? " 1=? " : whereStr);
+//                for (Object it :  DataFormatUtil.toList(filter)) {
+////                    filter = it.getOrDefault("filter", it);
+//                    if (it instanceof Map<?, ?> it) {
+//                        map = it;
+//                    }
+//                    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", ""));
+//                    if (!Objects.equals(comparator, " is null ")) {
+//                        objects.add(map.get("value"));
+//                    }
+//                }
+                whereStr = getFilterLinesWhereSql((List<Map<String, Object>>) filter);
+                expression = "select %s from %s where %s and %s".formatted(
+                        String.join(",", allColumns),
+                        expression,
+                        Objects.isNull(filterLineWhereStr) || filterLineWhereStr.trim().isEmpty() ? " 1=1 " : filterLineWhereStr,
+                        whereStr.trim().isEmpty() ? " 1=? " : whereStr);
                 if (whereStr.trim().isEmpty()) {
                     values.add(new Object[]{1});
                 } else {
@@ -338,7 +356,7 @@ public class DatabaseScriptUtil {
             } else {
                 filterNames = map.keySet().stream().toList();
 
-                expression = "select %s from %s where   %s  %s".formatted(String.join(",", allColumns), expression, Objects.isNull(filterLineWhereStr) ? " 1=1 " : filterLineWhereStr,
+                expression = "select %s from %s where   %s  %s".formatted(String.join(",", allColumns), expression, filterLineWhereStr.trim().isEmpty() ? " 1=1 " : filterLineWhereStr,
                         filterNames.isEmpty() ?
                                 "" : (" and " +
                                       filterNames.stream().map("%s = ?"::formatted).collect(Collectors.joining(" and "))));
@@ -348,10 +366,10 @@ public class DatabaseScriptUtil {
                     values.add(filterNames.stream().map(o1::get).toArray());
                 }
             }
-            expression = "select %s from (%s) as T".formatted(String.join(",", filterColumns), expression);
             if (pageable != null) {
                 expression = "%s limit %d offset %d ".formatted(expression, pageable.pageSize, pageable.page * pageable.pageSize);
             }
+            expression = "select %s from (%s) as T".formatted(String.join(",", filterColumns), expression);
             List<Map<String, Object>> result = DATABASE.queryBatch(connectionStr, expression, values);
 
 //            查询关联项
@@ -448,7 +466,13 @@ public class DatabaseScriptUtil {
             return UniReturnUtil.success(data);
         } else {
 //                新增
-            List<String> allColumns = DATABASE.getColumnsByTableName(connectionStr, expression);
+            if(filterColumns.size()==1 && !"*".equals(filterColumns.get(0))) {
+                for (String filterColumn : filterColumns) {
+                    if (!allColumns.contains(filterColumn)) {
+                        allColumns.remove(filterColumn);
+                    }
+                }
+            }
             if (Objects.equals("1", event)) {
                 Map<String, Object> value = dataContent.get(0);
                 Object valueObj = value.getOrDefault("value", value);
@@ -471,7 +495,7 @@ public class DatabaseScriptUtil {
                 Map<String, Object> filter = ((Map<String, Object>) map.get("filter"));
                 filterNames = filter.keySet().stream().filter(allColumns::contains).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 ")), filterLineWhereStr.trim().isEmpty() ? " 1=1 " : filterLineWhereStr);
 //                    删除
             } else if (Objects.equals("3", event)) {
 
@@ -488,7 +512,7 @@ public class DatabaseScriptUtil {
                     map = f;
                 }
                 filterNames = map.keySet().stream().filter(allColumns::contains).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 ")), filterLineWhereStr.trim().isEmpty() ? " 1=1 " : filterLineWhereStr);
             } else if (Objects.equals("7", event)) {
 //                    先删除
                 args.put("event", "3");

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

@@ -27,7 +27,7 @@ public class HttpScriptUtil {
             }
                 connection.put("method",data.get("method"));
 
-        return new Web().execWebApi(connection.get("headers"), connection.getOrDefault("method", "post").toString(), connection.get("body"), DataFormatUtil.toString(connection));
+        return new Web().execWebApi(connection.get("headers"), connection.getOrDefault("method", "post").toString(), connection.get("body"), DataFormatUtil.toString(connection.get("url")));
     }
     public static Map<String, Object> exec(Object header, String method, Object defaultBody, String url) throws Exception {
         return new Web().execWebApi(header, method, defaultBody, url);

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

@@ -0,0 +1,82 @@
+package com.scbfkj.uni.process;
+
+
+
+import javax.mail.*;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.Map;
+import java.util.Properties;
+
+public class Email {
+
+    public static void sendEmail(Map properties, String username, String password, String to, String subject, String body) throws MessagingException {
+        // 设置发件人邮箱和密码
+
+
+        // 设置邮件服务器属性
+        Properties props = new Properties();
+        props.putAll(properties);
+//        props.put("mail.smtp.auth", "true");
+//        props.put("mail.smtp.starttls.enable", "true");
+//        props.put("mail.smtp.host", "smtp.gmail.com");
+//        props.put("mail.smtp.port", "587");
+
+        // 创建会话
+        Session session = Session.getInstance(props, new Authenticator() {
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+                return new PasswordAuthentication(username, password);
+            }
+        });
+
+            // 创建邮件消息
+            Message message = new MimeMessage(session);
+            message.setFrom(new InternetAddress(username));
+            message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(to));
+            message.setSubject(subject);
+            message.setText(body);
+
+            // 发送邮件
+            Transport.send(message);
+
+            System.out.println("邮件发送成功");
+
+
+    }
+//    public static void sendEmailByDataSourceId(String dataSourceId, String to, String subject, String body) throws MessagingException {
+//        // 设置发件人邮箱和密码
+//
+//
+//        // 设置邮件服务器属性
+//        Properties props = new Properties();
+//        props.putAll(properties);
+////        props.put("mail.smtp.auth", "true");
+////        props.put("mail.smtp.starttls.enable", "true");
+////        props.put("mail.smtp.host", "smtp.gmail.com");
+////        props.put("mail.smtp.port", "587");
+//
+//        // 创建会话
+//        Session session = Session.getInstance(props, new Authenticator() {
+//            @Override
+//            protected PasswordAuthentication getPasswordAuthentication() {
+//                return new PasswordAuthentication(username, password);
+//            }
+//        });
+//
+//            // 创建邮件消息
+//            Message message = new MimeMessage(session);
+//            message.setFrom(new InternetAddress(username));
+//            message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(to));
+//            message.setSubject(subject);
+//            message.setText(body);
+//
+//            // 发送邮件
+//            Transport.send(message);
+//
+//            System.out.println("邮件发送成功");
+//
+//
+//    }
+}

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

@@ -84,12 +84,12 @@ public class Web {
     private Map<String, Object> sendWebApiRequest(Object defaultBody) {
         try {
             HttpEntity<Object> request = new HttpEntity<>(defaultBody, webApiHeader);
-            String responseEntity = null;
+            Object responseEntity = null;
             switch (webapiMethod) {
-                case "get" -> responseEntity = restTemplate.getForObject(webapiURL, String.class, request);
+                case "get" -> responseEntity = restTemplate.getForObject(webapiURL, Object.class, request);
                 case "put" -> restTemplate.put(webapiURL, request);
                 case "delete" -> restTemplate.delete(webapiURL, request);
-                default -> responseEntity = restTemplate.postForObject(webapiURL, request, String.class);
+                default -> responseEntity = restTemplate.postForObject(webapiURL, request, Object.class);
             }
             if (responseEntity == null && (webapiMethod.equals("put") || webapiMethod.equals("delete"))) {
                 return UniReturnUtil.success(null);

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

@@ -291,36 +291,44 @@ public class DataProcessService {
         } finally {
 
 //                    不管成功还是失败都记录日志
-            Object enablelog = serviceInfo.get("enablelog");
-            if (Config.isDebug() || Objects.nonNull(serviceInfo) && Objects.equals("1", Objects.nonNull(enablelog) ? enablelog.toString() : null)) {
-                String finalMessage = message;
-                LocalDateTime finalStartDateTime = startDateTime;
-                String finalServiceId = serviceId;
-                String finalLifecycleid = lifecycleid;
+            if (serviceInfo != null) {
+                Object enablelog = serviceInfo.get("enablelog");
+                if (Config.isDebug() || Objects.nonNull(serviceInfo) && Objects.equals("1", Objects.nonNull(enablelog) ? enablelog.toString() : null)) {
+                    String finalMessage = message;
+                    LocalDateTime finalStartDateTime = startDateTime;
+                    String finalServiceId = serviceId;
+                    String finalLifecycleid = lifecycleid;
 //                使用线程不阻塞
-                executor.execute(() -> {
-                    LoggerService.LogType target = LoggerService.LogType.SERVICE;
-                    if (Objects.nonNull(finalMessage)) {
-                        target = LoggerService.LogType.SERVICE_ERR;
-                    }
-                    HashMap<String, Object> logData = new HashMap<>();
-                    logData.put("begintime", finalStartDateTime);
-                    LocalDateTime dateTime = LocalDateTime.now();
-                    logData.put("endtime", dateTime);
-                    logData.put("serviceid", finalServiceId);
-                    String string = DataFormatUtil.toString(resource);
-                    if (Config.isDebug()) {
-                        System.out.println("resources:" + string);
-                    }
-                    logData.put("inputdata", string);
-                    logData.put("prepesource", DataFormatUtil.toString(preResource));
-                    logData.put("returnmessage", finalMessage);
-                    logData.put("lifecycleid", finalLifecycleid);
-                    LoggerService.log(target, logData);
-                });
+                    executor.execute(() -> {
+                        LoggerService.LogType target = LoggerService.LogType.SERVICE;
+                        if (Objects.nonNull(finalMessage)) {
+                            target = LoggerService.LogType.SERVICE_ERR;
+                        }
+                        HashMap<String, Object> logData = new HashMap<>();
+                        logData.put("begintime", finalStartDateTime);
+                        LocalDateTime dateTime = LocalDateTime.now();
+                        logData.put("endtime", dateTime);
+                        logData.put("serviceid", finalServiceId);
+                        String string = DataFormatUtil.toString(resource);
+                        if (Config.isDebug()) {
+                            System.out.println("resources:" + string);
+                        }
+                        logData.put("inputdata", string);
+                        logData.put("prepesource", DataFormatUtil.toString(preResource));
+                        logData.put("returnmessage", finalMessage);
+                        logData.put("lifecycleid", finalLifecycleid);
+                        try {
+                            LoggerService.log(target, logData);
+                        } catch (Exception exception) {
+                            if (Config.isDebug()) {
+                                exception.printStackTrace();
+                            }
+                        }
+                    });
 
-            }
+                }
 //                使用线程不阻塞
+            }
             String finalServiceId1 = serviceId;
             executor.execute(() -> {
                 try {

src/main/resources/application-socket.yml

@@ -0,0 +1,15 @@
+app:
+  container:
+    code: socket
+  debug: false
+  security:
+    encrypt: false
+    enable: true
+  inner:
+    ssl:
+      enable: false
+db:
+  center:
+    config: '{"jdbcUrl":"jdbc:mysql://120.26.64.82:3306/systemset3","username":"root","password":"123@bigdata","driverClassName":"com.mysql.cj.jdbc.Driver"}'
+  security:
+    config: '{"jdbcUrl":"jdbc:mysql://120.26.64.82:3306/uniauth","username":"root","password":"123@bigdata","driverClassName":"com.mysql.cj.jdbc.Driver"}'