From 07ace5ef7c3ddf0deb66249aae6468e96b4ae646 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 10 二月 2025 09:25:42 +0800
Subject: [PATCH] 20250210

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 f337c90..e3f677a 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
@@ -4,10 +4,7 @@
 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 +34,7 @@
  */
 @Slf4j
 @Component
-//@Profile("!dev")
+@Profile("!dev & !prod & !test")
 public class DefaultScheduled {
 
 
@@ -59,6 +56,8 @@
     private TjAsyncService asyncService;
     @Autowired
     private TjJcycxmService jcycxmService;
+    @Autowired
+    private AwsService awsService;
 
 
     private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -131,10 +130,11 @@
                                     if(null !=list && !list.isEmpty()){
                                         for (LtkjExamJcsqd jcsqd : list) {
                                             if(jcsqd.getJgbx().contains("銆�")){
-                                                String[] split = jcsqd.getJgbx().split("銆�");
+                                                String[] split = jcsqd.getJgzt().split("銆�");
                                                 for (String jg : split) {
                                                     if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
-                                                            && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈鏄庢樉")){
+                                                            && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅")
+                                                            && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
                                                         TjJcycxm jcycxm=new TjJcycxm();
                                                         jcycxm.setTjh(s);
                                                         jcycxm.setYqid(yqbm);
@@ -187,7 +187,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());
@@ -197,6 +207,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);
                     }
                 }

--
Gitblit v1.8.0