From 90fa38641a0f8e14bd065911da4ec8316914ca14 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 07 三月 2025 18:02:50 +0800
Subject: [PATCH] 2025-03-07

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index 26c5ff5..75ac273 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -29,6 +29,7 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -62,7 +63,7 @@
     @Autowired
     private DataSourceConfig dataSourceConfig;
 
-    private final ReentrantLock reentrantLock = new ReentrantLock();
+    private final Map<String, ReentrantLock> lockMap = new ConcurrentHashMap<>();
 
     // 鐢ㄦ潵璺熻釜宸茶皟搴︿换鍔$殑鐢ㄦ埛ID闆嗗悎锛岄伩鍏嶉噸澶嶆坊鍔犱换鍔�
     private final Set<String> scheduledTasks = new HashSet<>();
@@ -85,6 +86,8 @@
 
     // 鍒涘缓瀹氭椂浠诲姟鐨勬柟娉曪紝鐢ㄦ埛ID涓嶅瓨鍦ㄤ换鍔℃椂鎵嶄細娣诲姞
     public void createTask(DictHosp dictHosp) {
+        log.info("杩涘叆鍒涘缓浠诲姟鏂规硶 ->{}",dictHosp.getCode());
+        log.info("宸叉湁浠诲姟闆嗗悎 ->{}", scheduledTasks);
         // 濡傛灉浠诲姟宸茬粡瀛樺湪锛屽垯涓嶉噸澶嶆坊鍔�
         if (scheduledTasks.contains(dictHosp.getCode())) {
             return;
@@ -104,18 +107,24 @@
         }, Instant.now().plus(15, ChronoUnit.MINUTES));
     }
 
+    private ReentrantLock getLock(String id) {
+        return lockMap.computeIfAbsent(id, k -> new ReentrantLock());
+    }
+
     // 鎵ц鏃ュ織鍚屾浠诲姟鐨勬柟娉�
     public void executeTask(DictHosp dictHosp) {
         // 鑾峰彇閿侊紝纭繚鍚屼竴鏃堕棿鍙湁涓�涓换鍔℃墽琛�
-        log.info("{}鎵ц缁撴灉鍚屾", dictHosp.getCode());
-        dataSourceConfig.addDataSource(dictHosp.getDbname());
-        DataSourceContextHolder.setDataSourceKey(dictHosp.getDbname());
-        String dsqkssj = configService.selectConfigByKey("dsqkssj");
-        String dsqjssj = configService.selectConfigByKey("dsqjssj");
-        boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
-
+        log.info("{}鎵ц缁撴灉鍚屾鍔犻攣鍓�",JSONUtil.toJsonStr(dictHosp));
+        ReentrantLock reentrantLock = getLock(dictHosp.getCode());
         boolean lock = reentrantLock.tryLock();
         try {
+            log.info("{}鎵ц缁撴灉鍚屾鍔犻攣鍚�",JSONUtil.toJsonStr(dictHosp));
+            log.info("{}鎵ц缁撴灉鍚屾", dictHosp.getCode());
+            dataSourceConfig.addDataSource(dictHosp.getDbname());
+            DataSourceContextHolder.setDataSourceKey(dictHosp.getDbname());
+            String dsqkssj = configService.selectConfigByKey("dsqkssj");
+            String dsqjssj = configService.selectConfigByKey("dsqjssj");
+            boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
             if (!panduandangqianshijian) {
                 if (lock) {
                     log.info("浠诲姟寮�濮嬫墽琛屾椂闂� -> {}", dateTimeFormat.format(new Date()));
@@ -187,13 +196,11 @@
             log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�");
             log.error(String.valueOf(e),e.getMessage());
         } finally {
-            if (reentrantLock.isLocked()) {
-                scheduledTasks.remove(dictHosp.getCode());
-                reentrantLock.unlock();
-            }
-            DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
-            DataSourceContextHolder.clear();
-
+            reentrantLock.unlock();
+            scheduledTasks.remove(dictHosp.getCode());
+//            DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
+//            DataSourceContextHolder.clear();
+            log.info("浠诲姟{}宸查噴鏀鹃攣",dictHosp.getCode());
         }
     }
 

--
Gitblit v1.8.0