From 1d76f1864c507b99b153d63d53d7bb7f32c89ec3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 24 十二月 2025 14:40:54 +0800
Subject: [PATCH] 【市一】 语音电话发送调整 随访时间为空的空指针异常
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 451eb72..31ed5a4 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
@@ -628,6 +628,8 @@
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
log.info("銆恠fHandlle銆戝鐞嗙煭淇￠暱鏈熶换鍔★紝鎮ｈ�匢D锛歿}", serviceSubtask.getPatid());
boolean dateToday = isDateToday(serviceSubtask.getVisitTime());
+ //璁板綍褰撳墠鏃堕棿 濡傛灉澶辫触璁板綍褰撳墠鏃堕棿
+ LocalDateTime now = LocalDateTime.now();
if (dateToday) {
try {
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
@@ -696,7 +698,7 @@
log.info("-----------map鐨勫�间负锛歿}", msgInfo);
String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(), msgInfo.get("tokenUrl"));
if (ObjectUtils.isNotEmpty(msgInfo) && StringUtils.isEmpty(msgInfo.get("address"))) {
- setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�", "5");
+ setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�, 鏃堕棿:" + now , "5");
return;
}
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫侊紝鍦板潃锛歿}锛屽弬鏁帮細{}锛屾満鏋処D锛歿}", msgInfo.get("address"), sendMagParam, serviceSubtask.getOrgid());
@@ -744,13 +746,13 @@
setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佹垚鍔�", "2");
} else {
serviceSubtask.setResult("error");
- serviceSubtask.setRemark("鐭俊鍙戦�佸け璐�");
- setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
+ serviceSubtask.setRemark("鐭俊鍙戦�佸け璐�" + now);
+ setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�" + now, "5");
}
} catch (Exception e) {
String guid = UUID.randomUUID().toString();
- log.error("銆恠fHandlle銆戦暱鏈熶换鍔＄煭淇″彂閫佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}", e.getMessage(), guid);
- setSuccessPreachForm(serviceSubtask, sendPreachform, "闀挎湡浠诲姟鐭俊鍙戦�佸け璐�:绯荤粺閿欒", "5");
+ log.error("銆恠fHandlle銆戦暱鏈熶换鍔＄煭淇″彂閫佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}, 鏃堕棿: {}", e.getMessage(), guid, now);
+ setSuccessPreachForm(serviceSubtask, sendPreachform, "闀挎湡浠诲姟鐭俊鍙戦�佸け璐�:绯荤粺閿欒, 鏃堕棿: " + now, "5");
}
}
@@ -768,6 +770,8 @@
//鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
+ //甯備竴鍖婚櫌 涓嶆牎楠�
+
if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
setSuccessPreachForm(serviceSubtask, sendPreachform, "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�", "4");
return;
@@ -778,9 +782,26 @@
return;
}
String wxCode = "";
- if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
- String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&phone=" + patArchive.getTelcode() + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
- HttpUtils.sendGet(urlTemp);
+ //甯備竴鍖婚櫌
+ if (active.equals("hzszlyy")) {
+ //澶勭悊涓枃涔辩爜闂
+ /**String title = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��", StandardCharsets.UTF_8.toString());
+ String content = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��", StandardCharsets.UTF_8.toString());
+ String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8.toString());
+ String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() +
+ "&title=" + title +
+ "&content=" + content +
+ "&phone=" + patArchive.getTelcode() +
+ "&url=" + encodedUrl +
+ "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+// HttpUtils.sendGet(urlTemp);
+ String sendMsg = "";
+ sendMsg = HttpUtils.sendPost(urlTemp);
+ log.info(sendMsg); **/
+
+ wxCode = smsUtils.sendChat(url, patArchive.getTelcode(), serviceSubtask.getSfzh());
+ log.info(wxCode);
+
} else {
wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
}
--
Gitblit v1.9.3