From aa98dc5f2e5fb3ffed6a2d4e52070ea1518db1b4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 14:56:06 +0800
Subject: [PATCH] 调整切库日志打印
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 b1cf8b7..b7b9e00 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
@@ -95,15 +95,17 @@
// 灏嗚鐢ㄦ埛ID娣诲姞鍒板凡璋冨害浠诲姟闆嗗悎涓�
scheduledTasks.add(dictHosp.getCode());
// 鍒涘缓瀹氭椂浠诲姟锛屼换鍔″皢鍦�15鍒嗛挓鍚庢墽琛�
- taskScheduler.schedule(() -> {
+/* taskScheduler.schedule(() -> {
try {
- // 鎵ц浠诲姟鐨勮秴鏃舵帶鍒�
- taskScheduler.schedule(() -> {
- executeTask(dictHosp);
- }, Instant.now());
+
} catch (Exception e) {
log.error("鍒涘缓浠诲姟鏃跺彂鐢熷紓甯革細{}", e.getMessage());
}
+ }, Instant.now().plus(15, ChronoUnit.MINUTES));*/
+ log.info("浠诲姟鍒涘缓鎴愬姛 ->{}",dictHosp.getCode());
+ // 鎵ц浠诲姟鐨勮秴鏃舵帶鍒�
+ taskScheduler.schedule(() -> {
+ executeTask(dictHosp);
}, Instant.now().plus(15, ChronoUnit.MINUTES));
}
@@ -127,7 +129,7 @@
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
if (!panduandangqianshijian) {
if (lock) {
- log.info("浠诲姟寮�濮嬫墽琛屾椂闂� -> {}", dateTimeFormat.format(new Date()));
+ log.info("{}浠诲姟寮�濮嬫墽琛屾椂闂� -> {}",dictHosp.getCode(), dateTimeFormat.format(new Date()));
long start = System.currentTimeMillis();
// 鏌ヨ浠诲姟鏁版嵁
log.info("寮�濮嬫墽琛屽悓姝� 鎵ц闄㈠尯->{}", dictHosp.getCode());
@@ -137,7 +139,7 @@
if (null != jy && !jy.isEmpty()) {
- log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
+ log.info("{}鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}{}",dictHosp.getCode(), jy.size(),JSONUtil.toJsonStr(jy));
for (String s : jy) {
extractedjianyan(s,dictHosp.getCode());
}
@@ -145,7 +147,7 @@
if (null != jc && !jc.isEmpty()) {
- log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
+ log.info("{}鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}{}",dictHosp.getCode(), jc.size(),JSONUtil.toJsonStr(jc));
for (String s : jc) {
extractedjiancha(s,dictHosp.getCode());
}
@@ -153,7 +155,7 @@
Map<String, Object> map = new HashMap<>();
testMapper.tjplUpdateDetatilByVi(map);
Integer object = (Integer) map.get("total");
- log.info("鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}", object);
+ log.info("{}鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}",dictHosp.getCode(), object);
if (null != object && object.equals(1)) {
if (null != jc && !jc.isEmpty()) {
for (String s : jc) {
@@ -186,7 +188,7 @@
}
}
long end = System.currentTimeMillis();
- log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
+ log.info("{}鍚屾缁撴潫 鑰楁椂锛歿}绉�",dictHosp.getCode(), (end - start) / 1000);
}else {
log.info("鎵ц瀛樺偍杩囩▼鍑哄弬澶辫触");
}
@@ -219,10 +221,12 @@
// 妫�鏌ュ苟娣诲姞鏂扮殑鐢ㄦ埛浠诲姟
public void checkAndAddNewTasks() {
+ DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
// 鑾峰彇鎵�鏈夐渶瑕佸悓姝ユ棩蹇楃殑鐢ㄦ埛鍒楄〃
LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
List<DictHosp> hospList = dictHospService.list(wrapper);
+ log.info("妫�鏌ュ苟娣诲姞闇�瑕佸悓姝ョ殑鍖婚櫌鍒楄〃:{}", JSONUtil.toJsonStr(hospList));
hospList.forEach(this::createTask);
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
@@ -300,7 +304,7 @@
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
- log.info("鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:"+jcsqdList);
+ log.info("{}鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:{}",hospId,JSONUtil.toJsonStr(jcsqdList));
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
@@ -308,7 +312,7 @@
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
// DynamicDataSourceContextHolder.clearDataSourceType();
- log.info("鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
+ log.info("{}鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:{}",hospId,JSONUtil.toJsonStr(jcbgdList));
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
--
Gitblit v1.8.0