From c01d278ca57650e57c235f96ab448292653db024 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 02 七月 2025 09:50:21 +0800
Subject: [PATCH] 自动同步增加配置字段
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 532cb41..b1cf8b7 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
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.db.DataSourceConfig;
import com.ltkj.db.DataSourceContextHolder;
@@ -73,7 +74,9 @@
public void init() {
DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
// 鑾峰彇鎵�鏈夐渶瑕佸悓姝ユ棩蹇楃殑鐢ㄦ埛鍒楄〃
- List<DictHosp> hospList = dictHospService.list();
+ LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
+ List<DictHosp> hospList = dictHospService.list(wrapper);
hospList.forEach(this::createTask); // 涓烘瘡涓敤鎴峰垱寤轰换鍔�
// 瀹氭椂妫�鏌ユ槸鍚︽湁鏂扮殑鐢ㄦ埛闇�瑕佹坊鍔犱换鍔�
schedulePeriodicTaskCheck();
@@ -127,7 +130,7 @@
log.info("浠诲姟寮�濮嬫墽琛屾椂闂� -> {}", dateTimeFormat.format(new Date()));
long start = System.currentTimeMillis();
// 鏌ヨ浠诲姟鏁版嵁
- log.info("寮�濮嬫墽琛屽悓姝� 鎵ц鏁伴噺->{}", 0);
+ log.info("寮�濮嬫墽琛屽悓姝� 鎵ц闄㈠尯->{}", dictHosp.getCode());
List<String> jy = orderService.getDingShiTongBuJianYanTjNum();
List<String> jc = orderService.getDingShiTongBuJianChaTjNum();
@@ -159,7 +162,9 @@
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
@@ -215,7 +220,9 @@
// 妫�鏌ュ苟娣诲姞鏂扮殑鐢ㄦ埛浠诲姟
public void checkAndAddNewTasks() {
// 鑾峰彇鎵�鏈夐渶瑕佸悓姝ユ棩蹇楃殑鐢ㄦ埛鍒楄〃
- List<DictHosp> hospList = dictHospService.list();
+ LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
+ List<DictHosp> hospList = dictHospService.list(wrapper);
hospList.forEach(this::createTask);
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
@@ -293,13 +300,15 @@
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
+ log.info("鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:"+jcsqdList);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
- DynamicDataSourceContextHolder.clearDataSourceType();
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
--
Gitblit v1.8.0