From 900f358751f7974d610a0210a0ae914cfeddf765 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 五月 2025 13:46:05 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 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 68edc8f..cb8b274 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,12 +10,15 @@
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;
+import com.ruoyi.common.utils.OkHttpExample;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.ServiceTaskMapper;
@@ -280,7 +283,7 @@
/**
- * 闀挎湡浠诲姟鎵ц锛堢數璇濓級
+ * 闀挎湡浠诲姟鎵ц
*/
public void longTaskSend() {
//鑾峰彇浠诲姟淇℃伅
@@ -305,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) {
@@ -340,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());
@@ -357,7 +361,7 @@
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
continue;
}
@@ -390,7 +394,8 @@
// redisCache.setCacheListLeft("cache-0", list);
redisCache.setCacheListLeftAndDistinct("cache-0", list);
}
- } else if (descByCode.equals("澶氬獟浣�")) {
+ }
+ else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
} else if (descByCode.equals("绾歌川")) {
//绾歌川
@@ -437,7 +442,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) {
@@ -452,7 +458,7 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark(patArchive.getNotrequiredreason());
serviceSubtask.setSendstate(4L);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
continue;
}
@@ -482,22 +488,24 @@
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
} else if (visitHosp == 2) {
//涓芥按鐨勭煭淇″彂閫佹柟寮�
- String address = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
- if (StringUtils.isEmpty(address)) {
+ Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
+ String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
+ if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
ServiceSubtask ss = new ServiceSubtask();
ss.setResult("error");
ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
- String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()));
+ log.error("---------涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
+ String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
log.error("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
ObjectMapper objectMapper = new ObjectMapper();
Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
- String code = textParam.get("code").toString();
+ String code = textParam.get("Code").toString();
if (code.equals("0")) {
isSuccess = "true";
}
@@ -531,19 +539,20 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark("绯荤粺閿欒");
serviceSubtask.setSendstate(5L);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtask.setGuid(guid);
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
}
}
}
- } 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 {
@@ -554,7 +563,7 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark(patArchive.getNotrequiredreason());
serviceSubtask.setSendstate(4L);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
continue;
}
@@ -571,7 +580,7 @@
ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -582,7 +591,7 @@
ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -606,6 +615,7 @@
if ((Boolean) map.get("succ") == true) {
serviceSubtask.setResult("success");
} else {
+ log.error("serviceSubtask1231313鐨勫�间负锛歿}", serviceSubtask);
serviceSubtask.setResult("error");
serviceSubtask.setSendstate(5L);
serviceSubtask.setRemark(map.get("msg").toString());
@@ -617,7 +627,7 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark("绯荤粺閿欒");
serviceSubtask.setSendstate(5L);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtask.setGuid(guid);
iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
}
@@ -842,7 +852,7 @@
return key;
}
- private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap) {
+ private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap, String token) {
Map<String, Object> map = new LinkedHashMap<>();
Map<String, Object> YeWuXX = new LinkedHashMap<>();
@@ -854,11 +864,17 @@
YeWuXX.put("DuanXinXX", DuanXinXX);
map.put("XiaoXiTou", headerMap);
- map.put("DuanXinXX", DuanXinXX);
+ map.put("YeWuXX", YeWuXX);
String body = new Gson().toJson(map);
- String result = HttpUtils.sendPost(address, body);
+// String result = HttpUtils.sendPost(address, body);
+ String result = null;
+ try {
+ result = OkHttpExample.sendPostRequest(address, body, token);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
log.error("--------result鐨勫�间负锛歿}-----", result);
JSONObject jsonObject = JSONObject.parseObject(result);
--
Gitblit v1.9.3