From 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 05 十一月 2025 11:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 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 c611180..0d9072d 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
@@ -5,9 +5,9 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.dx.MessageSend;
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.utils.HttpUtil;
import com.ruoyi.common.utils.OkHttpExample;
@@ -40,7 +40,6 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
import static cn.hutool.core.convert.Convert.toHex;
@@ -112,9 +111,6 @@
@Value("${req_path}")
private String req_path;
-
- @Value("${visitHosp}")
- private Integer visitHosp;
@Autowired
private ServiceTaskMapper serviceTaskMapper;
@@ -340,7 +336,7 @@
//鍑洪櫌琛�
iPatMedInhospService.dealOutHospInfo();
//闂ㄨ瘖琛�
- if (visitHosp != 1) {
+ if (active.equals("xh")) {
iPatMedOuthospService.dealOutpatientInfo();
}
}
@@ -589,12 +585,12 @@
}
}
String isSuccess = null;
- if (visitHosp == 1) {
+ if (active.equals("xh")) {
Map<String, String> req = new HashMap<>();
req.put("phone", sendMagParam.getPhone());
req.put("content", sendMagParam.getContent());
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
+ } else if (active.equals("ls")) {
String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
@@ -612,14 +608,14 @@
if (code.equals("0")) {
isSuccess = "true";
}
- } else if (visitHosp == 4) {
+ } else if (active.equals("sltd")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
String code = data.get("code").toString();
if (StringUtils.isNotEmpty(code) && code.equals("00000")) {
isSuccess = "true";
}
- } else if (visitHosp == 3) {//甯備竴鍖婚櫌
+ } else if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
String content = sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��", "");
String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
//杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
@@ -680,10 +676,8 @@
return;
}
String wxCode = "";
- if (visitHosp == 3) {//甯備竴鍖婚櫌
- String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh()
- + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&phone=" + patArchive.getTelcode()
- + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+ 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);
} else {
wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
--
Gitblit v1.9.3