From c16bc12a7d40066769ee19ef0b213ff6889fc31c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 13 二月 2025 18:40:56 +0800
Subject: [PATCH] zjh20250213

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 0761070..4d0a7f7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -1,13 +1,11 @@
 package com.ltkj.web.config.timer;
 
+import cn.hutool.core.date.DateUtil;
 import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
 import com.ltkj.hosp.domain.TjJcycxm;
 import com.ltkj.hosp.mapper.TestMapper;
 import com.ltkj.hosp.service.*;
-import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
-import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
-import com.ltkj.hosp.sqlDomain.LtkjHybgd;
-import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import com.ltkj.hosp.sqlDomain.*;
 import com.ltkj.system.service.ISysConfigService;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +35,7 @@
  */
 @Slf4j
 @Component
-@Profile("!dev")
+@Profile("!dev & !prod & !test")
 public class DefaultScheduled {
 
 
@@ -59,6 +57,8 @@
     private TjAsyncService asyncService;
     @Autowired
     private TjJcycxmService jcycxmService;
+    @Autowired
+    private AwsService awsService;
 
 
     private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -90,6 +90,7 @@
         String dsqjssj = configService.selectConfigByKey("dsqjssj");
         String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
         boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
+        log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
         log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian);
             String dsrwsjjg = configService.selectConfigByKey("dsrwsjjg");
             boolean lock = reentrantLock.tryLock();
@@ -173,7 +174,8 @@
             } catch (Exception e) {
                 scheduleNextTask(Long.parseLong(dsrwsjjg));
                 log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�");
-                e.printStackTrace();
+                log.error(String.valueOf(e));
+//                e.printStackTrace();
             } finally {
                 reentrantLock.unlock();
             }
@@ -188,7 +190,17 @@
 
     private void extractedjianyan(String s) {
         try {
+            List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
+            if(null !=awsList && !awsList.isEmpty()){
+                log.info(awsList.toString());
+                testMapper.delWsxmjg(s);
+                log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
+                awsService.saveBatch(awsList);
+                log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
+            }
             List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+            List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
+            if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
             if (null != hysqdList && !hysqdList.isEmpty()) {
                 for (LtkjHysqd hysqd : hysqdList) {
                     LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -198,6 +210,8 @@
                     }
                     if (ltkjHysqdService.save(hysqd)) {
                         List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
+                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
                         ltkjHybgdService.saveBatch(hybgdList);
                     }
                 }
@@ -205,8 +219,10 @@
             }
         } catch (Exception e) {
             log.info("鍚屾妫�楠屾暟鎹け璐�");
-            throw new RuntimeException(e);
+//            throw new RuntimeException(e);
+            log.error(String.valueOf(e));
         }
+
     }
 
 
@@ -226,7 +242,8 @@
             }
         } catch (Exception e) {
             log.info("鍚屾妫�鏌ユ暟鎹け璐�");
-            throw new RuntimeException(e);
+//            throw new RuntimeException(e);
+            log.error(String.valueOf(e));
         }
     }
 }

--
Gitblit v1.8.0