From 3067ad92965d6b48db42b4cd7a37f2116e52f4c0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 14:44:48 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 14 +++++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java | 6 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 9 +++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java | 2 ++
5 files changed, 31 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 b1cf8b7..b3d9624 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));
}
@@ -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));
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index bd54ce1..265d528 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1943,6 +1943,15 @@
}
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
+
@GetMapping("/csymxmxzqtyybcjk")
@ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
index 6544cd3..c9b7d0a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -26,4 +27,9 @@
@Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
+
+ @Update("update tj_order_ycxm a set" +
+ " a.deleted=0 " +
+ " where a.id=id")
+ int zongjianyishengHuiFuyichangxiangmuanniu(String id);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
index fd64221..2958044 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -19,4 +19,6 @@
List<TjOrderYcxm> selectListByTjh(String tjNumber);
List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
+
+ int zongjianyishengHuiFuyichangxiangmuanniu(String id);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
index 39bd671..41d2420 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -36,4 +36,9 @@
public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
}
+
+ @Override
+ public int zongjianyishengHuiFuyichangxiangmuanniu(String id) {
+ return mapper.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ }
}
--
Gitblit v1.8.0