From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 09:12:49 +0800
Subject: [PATCH] 2025-07-03

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 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 8f666a2..f3fdf6d 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,12 +1,15 @@
 package com.ltkj.web.config.timer;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
 import com.ltkj.hosp.domain.TjJcycxm;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
 import com.ltkj.hosp.mapper.TestMapper;
 import com.ltkj.hosp.service.*;
 import com.ltkj.hosp.sqlDomain.*;
 import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.controller.system.TjXdPictureController;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +38,7 @@
  */
 @Slf4j
 @Component
-@Profile("!dev & !prod & !test")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
 public class DefaultScheduled {
 
 
@@ -59,6 +62,10 @@
     private TjJcycxmService jcycxmService;
     @Autowired
     private AwsService awsService;
+    @Resource
+    private TjXdtgmdjgService xdtgmdjgService;
+    @Resource
+    private TjXdPictureController pictureController;
 
 
     private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -88,7 +95,8 @@
     private void exec() {
         String dsqkssj = configService.selectConfigByKey("dsqkssj");
         String dsqjssj = configService.selectConfigByKey("dsqjssj");
-        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+//        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+        String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
         boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
         log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
         log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian);
@@ -109,7 +117,7 @@
                         if (null != jy && !jy.isEmpty()) {
                             log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
                             for (String s : jy) {
-                                extractedjianyan(s);
+                                extractedjianyan(s,dqyyyqbm);
                             }
                         }
 
@@ -117,7 +125,15 @@
                         if (null != jc && !jc.isEmpty()) {
                             log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
                             for (String s : jc) {
-                                extractedjiancha(s);
+                                extractedjiancha(s,dqyyyqbm);
+//                                LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+//                                wq.eq(TjXdtgmdjg::getTjh,s);
+//                                List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
+//                                if(null !=list && !list.isEmpty()){
+//                                    for (TjXdtgmdjg xdtgmdjg : list) {
+//                                        pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+//                                    }
+//                                }
                             }
                         }
                         Map<String, Object> map = new HashMap<>();
@@ -132,14 +148,14 @@
                                     if(null !=list && !list.isEmpty()){
                                         for (LtkjExamJcsqd jcsqd : list) {
                                             if(StringUtil.isNotBlank(jcsqd.getJgzt())){
-                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
                                                 for (String jg : split) {
                                                     if(StringUtil.isNotBlank(jg) && !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);
+                                                        jcycxm.setYqid(dqyyyqbm);
                                                         String[] split1 = jcsqd.getJcxmid().split(";");
                                                         jcycxm.setProId(split1[0]);
                                                         jcycxm.setProName(jcsqd.getJcxmmc());
@@ -188,7 +204,7 @@
         return time.isAfter(LocalTime.of(Integer.parseInt(kssj), 0)) && time.isBefore(LocalTime.of(Integer.parseInt(jssj), 0));
     }
 
-    private void extractedjianyan(String s) {
+    private void extractedjianyan(String s,String dqyyyqbm) {
         try {
             List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
             if(null !=awsList && !awsList.isEmpty()){
@@ -198,9 +214,22 @@
                 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 !=wssq && !wssq.isEmpty()){
+                for (LtkjHysqd hysqd : wssq) {
+                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+                    if (null != jybgid) {
+                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+                    }
+                    if (ltkjHysqdService.save(hysqd)) {
+                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+                        ltkjHybgdService.saveBatch(wsbg);
+                    }
+                }
+            }
+
+            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
             if (null != hysqdList && !hysqdList.isEmpty()) {
                 for (LtkjHysqd hysqd : hysqdList) {
                     LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -210,8 +239,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);
+//                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+//                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
                         ltkjHybgdService.saveBatch(hybgdList);
                     }
                 }
@@ -226,10 +255,10 @@
     }
 
 
-    private void extractedjiancha(String s) {
+    private void extractedjiancha(String s,String dqyyyqbm) {
 
         try {
-            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm);
             if (null != jcsqdList && !jcsqdList.isEmpty()) {
                 DynamicDataSourceContextHolder.clearDataSourceType();
                 jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);

--
Gitblit v1.8.0