From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index 6d1c214..88568db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -14,6 +14,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.FileInputStream;
@@ -202,7 +203,7 @@
         }
     }
 
-    @Transactional
+//    @Transactional
     public AjaxResult getHISDataNew(String type, Map<String, Object> params){
         LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
@@ -264,10 +265,11 @@
         } catch (SQLException e) {
             e.printStackTrace();
             return AjaxResult.error();
-        }
-        try {
-            connection.close();
-        } catch (SQLException ignored) {
+        }finally {
+            try {
+                connection.close();
+            } catch (SQLException ignored) {
+            }
         }
         return AjaxResult.success();
     }
@@ -373,6 +375,7 @@
      * @param jsonObject
      * @throws SQLException
      */
+    @Transactional
     private void insertDataNew(Connection connection, JSONObject jsonObject,HisApiConfig hisApiConfig,String paramsJson) throws SQLException {
         List<String> primaryKesList = Arrays.stream(hisApiConfig.getPrimaryKeys().split(",")).map(String::toLowerCase).collect(Collectors.toList());
         StringBuilder deleteSqlBuilder = new StringBuilder();
@@ -407,9 +410,9 @@
         }
         deleteSqlBuilder.delete(deleteSqlBuilder.length() - 5, deleteSqlBuilder.length());
         Statement statement = connection.prepareStatement(deleteSqlBuilder.toString());
-//        log.info("鎵ц鍒犻櫎 ->{}",deleteSqlBuilder.toString());
+        log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鍒犻櫎 ->{}",deleteSqlBuilder.toString());
         int i = statement.executeUpdate(deleteSqlBuilder.toString());
-//        log.info("鍒犻櫎鏉℃暟 ->{}",i);
+        log.info("HIS鏁版嵁淇濆瓨绫� 鍒犻櫎鏉℃暟 ->{}",i);
         statement.close();
         insertSqlBuilder.append("insert_time, ");
         insertSqlBuilder.append("request_params, ");
@@ -436,8 +439,23 @@
         insertSqlBuilder.append(") values (").append(valueBuilder).append(")");
 //        log.info("鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
         // 鎻掑叆鏁版嵁
+//        boolean execute = statement.execute(insertSqlBuilder.toString());
+//        for (int j = 0; j < 10; j++) {
+//            statement = connection.createStatement();
+//            log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
+//            boolean execute = statement.execute(insertSqlBuilder.toString());
+//            log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆鐘舵�� ->{},娆℃暟->{}",execute,(j+1));
+//            statement.close();
+//            if (execute)
+//                break;
+//        }
         statement = connection.createStatement();
-        statement.execute(insertSqlBuilder.toString());
+        log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆 ->{}",insertSqlBuilder.toString());
+        boolean execute = statement.execute(insertSqlBuilder.toString());
+        if (!execute){
+            int updateCount = statement.getUpdateCount();
+            log.info("HIS鏁版嵁淇濆瓨绫� 鎵ц鎻掑叆鎴愬姛 褰卞搷琛屾暟->{}",updateCount);
+        }
         statement.close();
     }
 

--
Gitblit v1.8.0