新增数据返回主键id 测试event 7

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

@@ -23,6 +23,7 @@ public class DatabaseScriptUtil {
         if (Objects.isNull(event) || !StringUtils.hasText(event.toString())) {
             throw new RuntimeException("执行编号不能为空");
         }
+        event = event.toString();
         expression = expression.replaceAll("\\s*(\\r)?\\n\\s*", " ").trim();
         boolean isTableName = !expression.contains(" ");
 

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

@@ -117,28 +117,60 @@ public class DataBase {
 
     public static int[] updateBatch(String connectionStr, String sql, List<Object[]> argsList) throws Exception {
         HikariPool dataSourcePool = getDataSourcePool(connectionStr);
-        try (Connection connection = dataSourcePool.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(sql)
-        ) {
-            int[] result;
-            int index = 0;
-            try {
-                while (argsList.size() > index) {
-                    Object[] args = argsList.get(index);
-                    for (int i = 0; i < args.length; i++) {
-                        preparedStatement.setObject(i + 1, args[i]);
+        if (sql.trim().startsWith("insert")) {
+            try (Connection connection = dataSourcePool.getConnection();
+                 PreparedStatement preparedStatement = connection.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS)
+            ) {
+                List<Integer> result = new ArrayList();
+                int index = 0;
+                try {
+                    while (argsList.size() > index) {
+                        Object[] args = argsList.get(index);
+                        for (int i = 0; i < args.length; i++) {
+                            preparedStatement.setObject(i + 1, args[i]);
+                        }
+                        preparedStatement.addBatch();
+                        index++;
+                    }
+                    preparedStatement.executeBatch();
+                    connection.commit();
+                    ResultSet rs = preparedStatement.getGeneratedKeys();
+                    if (rs.next()) {
+                        result.add(rs.getInt(1));
+                    }
+                    int[] ids = new int[result.size()];
+                    for (int i = 0; i < result.size(); i++) {
+                        ids[i] = result.get(i);
                     }
-                    preparedStatement.addBatch();
-                    index++;
+                    return ids;
+                } catch (SQLException e) {
+                    connection.rollback();
+                    throw e;
+                }
+            }
+        } else {
+            try (Connection connection = dataSourcePool.getConnection();
+                 PreparedStatement preparedStatement = connection.prepareStatement(sql)
+            ) {
+                int[] result;
+                int index = 0;
+                try {
+                    while (argsList.size() > index) {
+                        Object[] args = argsList.get(index);
+                        for (int i = 0; i < args.length; i++) {
+                            preparedStatement.setObject(i + 1, args[i]);
+                        }
+                        preparedStatement.addBatch();
+                        index++;
+                    }
+                    result = preparedStatement.executeBatch();
+                    connection.commit();
+                    return result;
+                } catch (SQLException e) {
+                    connection.rollback();
+                    throw e;
                 }
-                result = preparedStatement.executeBatch();
-                connection.commit();
-            } catch (SQLException e) {
-                connection.rollback();
-                throw e;
             }
-
-            return result;
         }
     }
 
@@ -206,6 +238,25 @@ public class DataBase {
         }
     }
 
+    public static int insertReturnKeys(String connectionStr, String sql, Object... args) throws Exception {
+        HikariPool dataSourcePool = getDataSourcePool(connectionStr);
+        try (Connection connection = dataSourcePool.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS)
+        ) {
+            for (int i = 0; i < args.length; i++) {
+                preparedStatement.setObject(i + 1, args[i]);
+            }
+            preparedStatement.execute();
+            connection.commit();
+            ResultSet rs = preparedStatement.getGeneratedKeys();
+            int id = -1;
+            if (rs.next()) {
+                id = rs.getInt(1);
+            }
+            return id;
+        }
+    }
+
     public static HikariPool getDataSourcePool(String connectionStr) throws Exception {
         if (dataSourcePools.containsKey(connectionStr)) {
             return dataSourcePools.get(connectionStr);

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

@@ -283,6 +283,9 @@ public class DataProcessService {
             return UniReturnUtil.success(((Map<?, ?>) resource.get(resource.size() - 1).get("result")).get("returnData"));
         } catch (Exception e) {
             message = e.getMessage();
+            if (Config.isDebug()) {
+                e.printStackTrace();
+            }
             return UniReturnUtil.fail(e);
         } finally {