From 6c2130678c5bf98253ba94a143dff782ffca0f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Thu, 5 Sep 2024 20:29:48 +0800
Subject: [PATCH] =?UTF-8?q?09052029:=E5=AF=B9=E8=BF=99=E4=B8=AA=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=B1=95=E7=A4=BA=E4=BD=BF=E7=94=A8=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=B1=A0=E7=9A=84=E6=96=B9=E6=B3=95=E5=8E=BB=E5=81=9A,?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AC=A1=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/DataValueServiceImpl.java    | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
index b0a2924..42dc5b8 100644
--- a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
+++ b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
@@ -178,9 +178,12 @@ public class DataValueServiceImpl extends ServiceImpl<DataValueMapper, DataValue
 
     private int getTotalRecords(MysqlPool mysqlPool, String tableName) throws SQLException {
         try (Connection conn = mysqlPool.getConn();
-             Statement statement = conn.createStatement();
-             ResultSet resultSet = statement.executeQuery("SELECT COUNT(*) FROM " + tableName)) {
-            if (resultSet.next()) {
+             Statement statement = conn != null ? conn.createStatement() : null;
+             ResultSet resultSet = statement != null ? statement.executeQuery("SELECT COUNT(*) FROM " + tableName) : null) {
+            if (conn == null) {
+                throw new SQLException("Failed to get database connection");
+            }
+            if (resultSet != null && resultSet.next()) {
                 return resultSet.getInt(1);
             } else {
                 throw new SQLException("Failed to get total record count");
@@ -192,33 +195,37 @@ public class DataValueServiceImpl extends ServiceImpl<DataValueMapper, DataValue
         List<DataValue> batchResults = new ArrayList<>();
         String query = "SELECT * FROM " + tableName + " LIMIT ? OFFSET ?";
 
-        try (Connection conn = mysqlPool.getConn();
-             PreparedStatement preparedStatement = conn.prepareStatement(query)) {
-            preparedStatement.setInt(1, BATCH_SIZE);
-            preparedStatement.setInt(2, offset);
+        try (Connection conn = mysqlPool.getConn()) {
+            if (conn == null) {
+                throw new SQLException("Failed to get database connection");
+            }
+            try (PreparedStatement preparedStatement = conn.prepareStatement(query)) {
+                preparedStatement.setInt(1, BATCH_SIZE);
+                preparedStatement.setInt(2, offset);
 
-            try (ResultSet resultSet = preparedStatement.executeQuery()) {
-                ResultSetMetaData metaData = resultSet.getMetaData();
-                int columnCount = metaData.getColumnCount();
+                try (ResultSet resultSet = preparedStatement.executeQuery()) {
+                    ResultSetMetaData metaData = resultSet.getMetaData();
+                    int columnCount = metaData.getColumnCount();
 
-                while (resultSet.next()) {
-                    for (int i = 1; i <= columnCount; i++) {
-                        String columnTypeName = metaData.getColumnTypeName(i);
+                    while (resultSet.next()) {
+                        for (int i = 1; i <= columnCount; i++) {
+                            String columnTypeName = metaData.getColumnTypeName(i);
 
-                        DatabaseMetaData metaDataColumns = conn.getMetaData();
-                        ResultSet columns = metaDataColumns.getColumns(null, null, metaData.getTableName(i), metaData.getColumnName(i));
-                        String remarks = null;
-                        while (columns.next()) {
-                            remarks = columns.getString("REMARKS");
+                            DatabaseMetaData metaDataColumns = conn.getMetaData();
+                            ResultSet columns = metaDataColumns.getColumns(null, null, metaData.getTableName(i), metaData.getColumnName(i));
+                            String remarks = null;
+                            while (columns.next()) {
+                                remarks = columns.getString("REMARKS");
+                            }
+
+                            DataValue build = DataValue.builder()
+                                    .key(metaData.getColumnName(i))
+                                    .label(remarks)
+                                    .value(resultSet.getObject(i, DataType.convertType(columnTypeName)))
+                                    .type(DataType.convertTypeString(columnTypeName))
+                                    .build();
+                            batchResults.add(build);
                         }
-
-                        DataValue build = DataValue.builder()
-                                .key(metaData.getColumnName(i))
-                                .label(remarks)
-                                .value(resultSet.getObject(i, DataType.convertType(columnTypeName)))
-                                .type(DataType.convertTypeString(columnTypeName))
-                                .build();
-                        batchResults.add(build);
                     }
                 }
             }