From 9597821e57d4bad1ea4e984241f363be956dda8c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 18:21:33 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 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 c6211ad..04d5dba 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;
@@ -12,6 +13,7 @@
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.controller.system.SysConfigController;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +61,8 @@
private IDictHospService dictHospService;
@Autowired
private DataSourceConfig dataSourceConfig;
+ @Autowired
+ private SysConfigController configController;
private final Map<String, ReentrantLock> lockMap = new ConcurrentHashMap<>();
@@ -73,7 +77,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();
@@ -92,15 +98,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));
}
@@ -124,7 +132,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());
@@ -134,7 +142,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());
}
@@ -142,7 +150,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());
}
@@ -150,7 +158,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) {
@@ -163,7 +171,19 @@
if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ boolean b = configController.apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(dictHosp.getCode());
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
@@ -175,7 +195,7 @@
jcycxm.setCreateTime(new Date());
jcycxm.setJcjg(jg);
jcycxmService.save(jcycxm);
- }
+ }*/
}
}
}
@@ -183,7 +203,7 @@
}
}
long end = System.currentTimeMillis();
- log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
+ log.info("{}鍚屾缁撴潫 鑰楁椂锛歿}绉�",dictHosp.getCode(), (end - start) / 1000);
}else {
log.info("鎵ц瀛樺偍杩囩▼鍑哄弬澶辫触");
}
@@ -216,8 +236,12 @@
// 妫�鏌ュ苟娣诲姞鏂扮殑鐢ㄦ埛浠诲姟
public void checkAndAddNewTasks() {
+ 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);
+ log.info("妫�鏌ュ苟娣诲姞闇�瑕佸悓姝ョ殑鍖婚櫌鍒楄〃:{}", JSONUtil.toJsonStr(hospList));
hospList.forEach(this::createTask);
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
@@ -295,13 +319,15 @@
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
+ log.info("{}鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:{}",hospId,JSONUtil.toJsonStr(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("{}鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:{}",hospId,JSONUtil.toJsonStr(jcbgdList));
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
--
Gitblit v1.8.0