From 5588342e2777ee57e17f6d2fa069443a7ce6b9fa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 13 三月 2025 10:26:16 +0800
Subject: [PATCH] zjh20250313
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 7a41f2b..d400079 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
@@ -114,16 +114,17 @@
// 鎵ц鏃ュ織鍚屾浠诲姟鐨勬柟娉�
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()));
@@ -232,9 +233,22 @@
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);
+ }
+ }
+ }
+
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -244,8 +258,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);
}
}
--
Gitblit v1.8.0