From e00ef99886b9ab84f39c81432f8c7640e93026f9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 二月 2025 15:54:30 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 25925f2..30d1d81 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -48,6 +48,7 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 瀹氭椂浠诲姟璋冨害娴嬭瘯
@@ -68,6 +69,9 @@
@Autowired
private IPatMedInhospService iPatMedInhospService;
+
+ @Autowired
+ private IPatMedOperationService iPatMedOperationService;
@Autowired
private IServiceSubtaskService iServiceSubtaskService;
@@ -237,6 +241,14 @@
iPatMedInhospService.dealOutHospInfo();
}
+
+ /**
+ * 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
+ */
+ public void dealOperationInfo() {
+ iPatMedOperationService.dealOperationInfo();
+ }
+
/**
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
*/
@@ -308,7 +320,11 @@
ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
ivrTaskcall.setSendstate(2L);
- List<ServiceSubtask> selectServiceSubtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+ List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+
+ // 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
+ List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
+
if (descByCode.equals("鐢佃瘽")) {
String value = "";
List<String> list = new ArrayList<>();
@@ -344,7 +360,8 @@
}
//灏嗚鎵ц鐨勬斁鍒扮紦瀛樹腑
if (list.size() > 0) {
- redisCache.setCacheListLeft("cache-0", list);
+// redisCache.setCacheListLeft("cache-0", list);
+ redisCache.setCacheListLeftAndDistinct("cache-0", list);
}
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
@@ -352,8 +369,30 @@
//绾歌川
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
//寰俊灏忕▼搴�
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- log.error("寰俊灏忕▼搴忔湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
+ if (ivrTask1.getPatCycle() == 1) {
+ //璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ //杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸
+ List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
+ aa:
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ for (ServiceSubtask ss : serviceSubtaskListFilter) {
+ if (ss.getSfzh().equals(serviceSubtask.getSfzh())) {
+ continue aa;
+ }
+ }
+ serviceSubtaskListFilter.add(serviceSubtask);
+ }
+ for (ServiceSubtask serviceSubtask : serviceSubtaskListFilter) {
+ //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
+ serviceSubtask.setSendstate(3L);
+ serviceSubtask.setId(null);
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
}
} else if (descByCode.equals("鐭俊")) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
--
Gitblit v1.9.3