From 6b73ef6f82fa10747c29bdec04cb43d0f7e91598 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 05 三月 2025 16:43:55 +0800
Subject: [PATCH] zjh20250305

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 e3f677a..8f666a2 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,5 +1,6 @@
 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;
@@ -89,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();
@@ -129,11 +131,11 @@
                                     List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
                                     if(null !=list && !list.isEmpty()){
                                         for (LtkjExamJcsqd jcsqd : list) {
-                                            if(jcsqd.getJgbx().contains("銆�")){
-                                                String[] split = jcsqd.getJgzt().split("銆�");
+                                            if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+                                                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("鏈")
                                                             && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
                                                         TjJcycxm jcycxm=new TjJcycxm();
                                                         jcycxm.setTjh(s);
@@ -172,7 +174,8 @@
             } catch (Exception e) {
                 scheduleNextTask(Long.parseLong(dsrwsjjg));
                 log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�");
-                e.printStackTrace();
+                log.error(String.valueOf(e));
+//                e.printStackTrace();
             } finally {
                 reentrantLock.unlock();
             }
@@ -216,8 +219,10 @@
             }
         } catch (Exception e) {
             log.info("鍚屾妫�楠屾暟鎹け璐�");
-            throw new RuntimeException(e);
+//            throw new RuntimeException(e);
+            log.error(String.valueOf(e));
         }
+
     }
 
 
@@ -237,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