From 2a9583fd376451ca77a0400af7f3a02d1b80e7f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 18:04:34 +0800
Subject: [PATCH] 2025-06-24
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 105 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 33 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 b1a9a57..a96d7a8 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
@@ -1,6 +1,6 @@
package com.ltkj.web.config.timer;
-import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.db.DataSourceConfig;
@@ -14,8 +14,6 @@
import com.ltkj.system.service.ISysConfigService;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.TaskScheduler;
@@ -29,7 +27,7 @@
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
@Slf4j
@@ -62,7 +60,7 @@
@Autowired
private DataSourceConfig dataSourceConfig;
- private final ReentrantLock reentrantLock = new ReentrantLock();
+ private final Map<String, ReentrantLock> lockMap = new ConcurrentHashMap<>();
// 鐢ㄦ潵璺熻釜宸茶皟搴︿换鍔＄殑鐢ㄦ埛ID闆嗗悎锛岄伩鍏嶉噸澶嶆坊鍔犱换鍔�
private final Set<String> scheduledTasks = new HashSet<>();
@@ -85,6 +83,8 @@
// 鍒涘缓瀹氭椂浠诲姟鐨勬柟娉曪紝鐢ㄦ埛ID涓嶅瓨鍦ㄤ换鍔℃椂鎵嶄細娣诲姞
public void createTask(DictHosp dictHosp) {
+ log.info("杩涘叆鍒涘缓浠诲姟鏂规硶 ->{}",dictHosp.getCode());
+ log.info("宸叉湁浠诲姟闆嗗悎 ->{}", scheduledTasks);
// 濡傛灉浠诲姟宸茬粡瀛樺湪锛屽垯涓嶉噸澶嶆坊鍔�
if (scheduledTasks.contains(dictHosp.getCode())) {
return;
@@ -104,24 +104,30 @@
}, Instant.now().plus(15, ChronoUnit.MINUTES));
}
+ private ReentrantLock getLock(String id) {
+ return lockMap.computeIfAbsent(id, k -> new ReentrantLock());
+ }
+
// 鎵ц鏃ュ織鍚屾浠诲姟鐨勬柟娉�
public void executeTask(DictHosp dictHosp) {
// 鑾峰彇閿侊紝纭繚鍚屼竴鏃堕棿鍙湁涓�涓换鍔℃墽琛�
- log.info("{}鎵ц缁撴灉鍚屾", dictHosp.getCode());
- dataSourceConfig.addDataSource(dictHosp.getDbname());
- DataSourceContextHolder.setDataSourceKey(dictHosp.getDbname());
- String dsqkssj = configService.selectConfigByKey("dsqkssj");
- String dsqjssj = configService.selectConfigByKey("dsqjssj");
- boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
-
+ log.info("{}鎵ц缁撴灉鍚屾鍔犻攣鍓�",JSONUtil.toJsonStr(dictHosp));
+ ReentrantLock reentrantLock = getLock(dictHosp.getCode());
boolean lock = reentrantLock.tryLock();
try {
+ log.info("{}鎵ц缁撴灉鍚屾鍔犻攣鍚�",JSONUtil.toJsonStr(dictHosp));
+ log.info("{}鎵ц缁撴灉鍚屾", dictHosp.getCode());
+ dataSourceConfig.addDataSource(dictHosp.getDbname());
+ DataSourceContextHolder.setDataSourceKey(dictHosp.getDbname());
+ String dsqkssj = configService.selectConfigByKey("dsqkssj");
+ String dsqjssj = configService.selectConfigByKey("dsqjssj");
+ boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
if (!panduandangqianshijian) {
if (lock) {
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();
@@ -130,7 +136,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,dictHosp.getCode());
}
}
@@ -138,7 +144,7 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ extractedjiancha(s,dictHosp.getCode());
}
}
Map<String, Object> map = new HashMap<>();
@@ -152,8 +158,10 @@
List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
- if(jcsqd.getJgzt().contains("銆�") || jcsqd.getJgzt().contains("锛�") || jcsqd.getJgzt().contains(";")){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+ 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("鏈")
@@ -187,13 +195,11 @@
log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�");
log.error(String.valueOf(e),e.getMessage());
} finally {
- if (reentrantLock.isLocked()) {
- scheduledTasks.remove(dictHosp.getCode());
- reentrantLock.unlock();
- }
- DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
- DataSourceContextHolder.clear();
-
+ reentrantLock.unlock();
+ scheduledTasks.remove(dictHosp.getCode());
+// DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
+// DataSourceContextHolder.clear();
+ log.info("浠诲姟{}宸查噴鏀鹃攣",dictHosp.getCode());
}
}
@@ -216,7 +222,7 @@
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String hospId) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -226,9 +232,40 @@
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);
+ }
+ }
+ }
+
+ String isWsByView = configService.selectConfigByKey("is_ws_by_view");
+ if (StrUtil.isNotBlank(isWsByView) && isWsByView.equals("Y")){
+ List<LtkjHysqd> sqd = testMapper.getWsHySqdByView(s);
+ if (sqd != null && !sqd.isEmpty()){
+ for (LtkjHysqd hysqd : sqd) {
+ 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.getWsHyBgdByView(hysqd.getTmh());
+ ltkjHybgdService.saveBatch(wsbg);
+ }
+ }
+ }
+ }
+
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hospId);
if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -238,8 +275,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);
}
}
@@ -254,17 +291,19 @@
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String hospId) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ 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);
- DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
--
Gitblit v1.8.0