From c62e26954e41360fc6a2efc874815aa84f8b0073 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 五月 2025 14:45:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 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 7f6a671..dec2f0a 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
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.VisitSendStateEnum;
import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HttpUtil;
@@ -282,7 +283,7 @@
/**
- * 闀挎湡浠诲姟鎵ц锛堢數璇濓級
+ * 闀挎湡浠诲姟鎵ц
*/
public void longTaskSend() {
//鑾峰彇浠诲姟淇℃伅
@@ -307,23 +308,15 @@
* @return
*/
public boolean isDateToday(Date date) {
- //濡傛灉缁欑殑鏃ユ湡灏忎簬褰撳墠鏃ユ湡锛屼篃鐩存帴鍙戦��
- LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
- if (localDateTime.isBefore(LocalDateTime.now())) {
- return true;
+ if (date == null) {
+ return false;
}
- // 鑾峰彇褰撳墠鏃ユ湡
- Calendar calendarNow = Calendar.getInstance();
- int todayYear = calendarNow.get(Calendar.YEAR);
- int todayMonth = calendarNow.get(Calendar.MONTH);
- int todayDay = calendarNow.get(Calendar.DAY_OF_MONTH);
-
- // 鍒涘缓涓�涓� Calendar 瀹炰緥鐢ㄤ簬妫�鏌ョ殑鏃ユ湡
- Calendar calendarToCheck = Calendar.getInstance();
- calendarToCheck.setTime(date);
-
- // 姣旇緝骞淬�佹湀鍜屾棩
- return (calendarToCheck.get(Calendar.YEAR) == todayYear && calendarToCheck.get(Calendar.MONTH) == todayMonth && calendarToCheck.get(Calendar.DAY_OF_MONTH) == todayDay);
+ // 灏� Date 杞负 LocalDate
+ LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ // 鑾峰彇浠婂ぉ鐨� LocalDate
+ LocalDate today = LocalDate.now();
+ // 濡傛灉鏃ユ湡鏃╀簬鎴栫瓑浜庝粖澶╋紝杩斿洖 true
+ return !localDate.isAfter(today);
}
public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
@@ -342,6 +335,15 @@
ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
ivrTaskcall.setSendstate(2L);
List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+ //涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
+ List<ServiceSubtask> subtaskList2 = new ArrayList<>();
+ if (visitHosp == 2) {
+ for (ServiceSubtask serviceSubtask : subtaskList) {
+ Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+ if (b) subtaskList2.add(serviceSubtask);
+ }
+ subtaskList = subtaskList2;
+ }
// 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
@@ -439,7 +441,8 @@
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
}
- } else if (descByCode.equals("鐭俊")) {
+ }
+ else if (descByCode.equals("鐭俊")) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
@@ -541,13 +544,14 @@
}
}
}
- } else if (descByCode.equals("鍏紬鍙�")) {
+ }
+ else if (descByCode.equals("鍏紬鍙�")) {
log.error("鍏紬鍙疯繘鏉ヤ簡鍚楋紵{}", descByCode);
//鍏紬鍙�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
+ // log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
if (dateToday) {
try {
@@ -610,7 +614,7 @@
if ((Boolean) map.get("succ") == true) {
serviceSubtask.setResult("success");
} else {
- log.error("serviceSubtask1231313鐨勫�间负锛歿}",serviceSubtask);
+ log.error("serviceSubtask1231313鐨勫�间负锛歿}", serviceSubtask);
serviceSubtask.setResult("error");
serviceSubtask.setSendstate(5L);
serviceSubtask.setRemark(map.get("msg").toString());
--
Gitblit v1.9.3