From 599beddc80e7e50b2099bacdbf7df2d89df00ef2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:42:31 +0800
Subject: [PATCH] fix: 完成时状态与超时判断区分任务组
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 273 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 180 insertions(+), 93 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
index 06e31b7..9c42669 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -1,23 +1,26 @@
package com.ruoyi.web.controller.common;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.AddOrgId;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.dx.MessageSend;
-import com.ruoyi.common.utils.HttpUtil;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.RSAPublicKeyExample;
+import com.ruoyi.common.utils.ShortCode;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sms.smsUtils;
-import com.smartor.common.MtSubmitSmUtil;
-import com.smartor.common.ShiyiSmsUtil;
-import com.smartor.domain.ServiceOutPath;
-import com.smartor.domain.ShiyiSmsRequest;
-import com.smartor.domain.ShiyiSmsResponse;
-import com.smartor.domain.smsVO;
-import com.smartor.mapper.UtilsMapper;
-import com.smartor.service.IServiceOutPathService;
+import com.ruoyi.common.utils.sms.SmsUtils;
+import com.ruoyi.message.SendResult;
+import com.ruoyi.message.sms.SmsSendRequest;
+import com.ruoyi.message.sms.SmsSenderFactory;
+import com.ruoyi.message.sms.provider.shiyi.ShiyiSmsRequest;
+import com.ruoyi.message.sms.provider.shiyi.ShiyiSmsResponse;
+import com.ruoyi.message.sms.provider.shiyi.ShiyiSmsUtil;
+import com.ruoyi.message.wechat.WechatSendRequest;
+import com.ruoyi.message.wechat.WechatSenderFactory;
+import com.ruoyi.system.service.ISysConfigService;
+import com.smartor.domain.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -30,35 +33,32 @@
import org.springframework.web.bind.annotation.RestController;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import com.ruoyi.task.domain.ServiceSubtask;
+import com.ruoyi.task.domain.ServiceOutPath;
+import com.ruoyi.task.service.IServiceOutPathService;
+import com.ruoyi.task.service.IServiceSubtaskService;
+/**
+ * 鐭ヤ俊鎺ュ彛锛堝澶栫煭淇� / 寰俊鍏紬鍙峰彂閫佸叆鍙ｏ級銆�
+ * <p>
+ * 璇存槑锛氱煭淇′笌鍏紬鍙风殑绔欑偣宸紓锛堟姤鏂囨牸寮忋�佺鍚嶃�乼oken銆佽繑鍥炲垽瀹氾級宸插叏閮ㄦ敹鍙ｅ埌
+ * {@code ruoyi-message} 妯″潡锛屾湰绫诲彧璐熻矗鍙傛暟缁勮涓庢寜 {@code active} 璺敱銆�
+ */
@RestController
@Api(description = "鐭ヤ俊鎺ュ彛")
@RequestMapping("/sms")
@Slf4j
public class SmsController {
- @Value("${xhsmsPath}")
- private String xhsmsPath;
@Autowired
- private MtSubmitSmUtil mtSubmitSmUtil;
+ private SmsSenderFactory smsSenderFactory;
+
+ @Autowired
+ private WechatSenderFactory wechatSenderFactory;
@Autowired
private ShiyiSmsUtil shiyiSmsUtil;
-
- @Value("${xhsmsAccount}")
- private String xhsmsAccount;
-
- @Value("${xhsmsPwd}")
- private String xhsmsPwd;
- // 铏氭嫙鎺ュ叆鐮�
- @Value("${xhsmsjrm}")
- private String xhsmsjrm;
@Value("${localIP}")
private String ip;
@@ -71,19 +71,25 @@
@Autowired
private IServiceOutPathService iServiceOutPathService;
+ @Autowired
+ private IServiceSubtaskService iServiceSubtaskService;
+ @Autowired
+ private ISysConfigService configService;
@Value("${spring.profiles.active}")
private String active;
/**
- * @param
- * @return
+ * 鐭俊鍙戦�侊紙娴嬭瘯锛�
*/
@ApiOperation("鐭俊鍙戦��")
@PostMapping("/sendTest")
public AjaxResult send(@RequestBody smsVO vo) {
- String sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), vo.getContent());
- return AjaxResult.success(sendMsg);
+ //涓庡師瀹炵幇涓�鑷达細娴嬭瘯鎺ュ彛鍥哄畾璧板競涓�锛坰msUtils.sendSms锛屽惔灞辩鍚嶏級
+ SmsSendRequest request = SmsSendRequest.of(vo.getPhone(), vo.getContent());
+ request.setCampus("2");
+ SendResult sendResult = smsSenderFactory.send("hzszlyy", request);
+ return AjaxResult.success(sendResult.getRawResponse());
}
@ApiOperation("甯備竴HIS鐭俊XML娴嬭瘯")
@@ -99,20 +105,25 @@
}
/**
- * @param
- * @return
+ * 鐭俊鍙戦��
*/
@ApiOperation("鐭俊鍙戦��")
@PostMapping("/send")
public AjaxResult sendAsk(@RequestBody smsVO vo) throws UnsupportedEncodingException {
String content = "";
+ if (StringUtils.isNotEmpty(vo.getSubId())) {
+ ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
+ if (serviceSubtask.getSendstate() == 4L) content = "璇ヤ换鍔′笉鎵ц";
+ return AjaxResult.error(content);
+ }
+
if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
Integer radix = iServiceOutPathService.selectAutoId();
- String format = String.format("%03X", radix);
+ String format = ShortCode.encode(radix.longValue());
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
@@ -121,7 +132,7 @@
serviceOutPath.setRadix(format);
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(vo.getOrgid());
- String url = ip + ":" + req_path + "/wt?p=" + format;
+ String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;
content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
serviceOutPath.setUrl(url);
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
@@ -131,55 +142,14 @@
String sendMsg = "false";
try {
- if (active.equals("hzszlyy")) {
- sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
- } else if (active.equals("nhfy")) {
- Map<String, Object> smsResult = mtSubmitSmUtil.submitSm(vo.getPhone(), content);
- if (smsResult != null && smsResult.get("result") != null && smsResult.get("result").toString().equals("0")) {
- sendMsg = "true";
- }
- } else if (active.equals("sltd")) {
- String data = MessageSend.sendMsg(content, "6", vo.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- if (StringUtils.isNotEmpty(data)) {
- ObjectMapper mapper = new ObjectMapper();
- JsonNode root = mapper.readTree(data);
- String status = root.get("result").get(0).get("status").asText();
- if (status.equals("00000")) {
- sendMsg = "true";
- }
- }
- } else if (active.equals("xh")) {
-// Map<String, String> req = new HashMap<>();
-// req.put("phone", vo.getPhone());
-// req.put("content", vo.getContent());
-// Boolean result = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- Map<String, String> map2 = new HashMap<String, String>();
- map2.put("action", "send");
- map2.put("account", xhsmsAccount);
- map2.put("password", xhsmsPwd);
- map2.put("mobile", vo.getPhone());
- map2.put("content", vo.getContent());
- map2.put("extno", xhsmsjrm);
- map2.put("rt", "json");
- StringBuilder encodedParams = new StringBuilder();
-
- for (Map.Entry<String, String> entry : map2.entrySet()) {
- if (encodedParams.length() > 0) {
- encodedParams.append("&");
- }
- // 瀵归敭鍜屽�艰繘琛孶RL缂栫爜
- String encodedKey = URLEncoder.encode(entry.getKey(), "UTF-8");
- String encodedValue = URLEncoder.encode(entry.getValue(), "UTF-8");
- encodedParams.append(encodedKey).append("=").append(encodedValue);
- }
- Boolean result = HttpUtils.sendPost(xhsmsPath, encodedParams.toString());
- if (result) {
- sendMsg = "true";
- }
- } else if (active.equals("ls")) {
- //涓芥按13瀹跺尰闄紝鏈夌偣涓嶆柟渚匡紝鏈夌┖鍐嶆帴
+ if ("ls".equals(active)) {
+ //涓庡師瀹炵幇涓�鑷达細涓芥按13瀹跺尰闄㈢殑鐭俊鍔熻兘鏍囪涓烘湭寮�閫�
return AjaxResult.error("璇ョ煭淇″姛鑳借繕鏈紑閫�");
}
+ SmsSendRequest request = SmsSendRequest.of(vo.getPhone(), content, vo.getOrgid());
+ //甯備竴鍖哄垎婀栨花/鍚村北绛惧悕锛屾鎺ュ彛鏃犻櫌鍖轰俊鎭紝涓庡師瀹炵幇涓�鑷达紙闈炴箹婊ㄥ嵆鍚村北锛�
+ SendResult sendResult = smsSenderFactory.send(active, request);
+ sendMsg = sendResult.asLegacyFlag();
log.info(sendMsg);
} catch (Exception ex) {
log.error(ex.getMessage());
@@ -188,20 +158,24 @@
}
/**
- * @param
- * @return
+ * 寰俊鍙戦��
*/
@ApiOperation("寰俊鍙戦��")
@PostMapping("/sendChat")
- public AjaxResult sendChat(@RequestBody smsVO vo) throws UnsupportedEncodingException {
+ public AjaxResult sendChat(@RequestBody smsVO vo) {
String sendMsg = "";
+ if (StringUtils.isNotEmpty(vo.getSubId())) {
+ ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
+ if (serviceSubtask.getSendstate() == 4L) sendMsg = "璇ヤ换鍔′笉鎵ц";
+ return AjaxResult.error(sendMsg);
+ }
if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
Integer radix = iServiceOutPathService.selectAutoId();
- String format = String.format("%03X", radix);
+ String format = ShortCode.encode(radix.longValue());
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
@@ -211,11 +185,124 @@
serviceOutPath.setCreateTime(new Date());
serviceOutPath.setOrgid(vo.getOrgid());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String url = ip + ":" + req_path + "/wt?p=" + format;
- sendMsg = smsUtils.sendChat(url, vo.getPhone(), vo.getIdCard());
+ String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;
+ //涓庡師瀹炵幇涓�鑷达細璇ユ帴鍙ｅ浐瀹氳蛋甯備竴鍏紬鍙�
+ WechatSendRequest request = new WechatSendRequest();
+ request.setIdCard(vo.getIdCard());
+ request.setPhone(vo.getPhone());
+ request.setUrl(url);
+ request.setOrgid(vo.getOrgid());
+ SendResult sendResult = wechatSenderFactory.send("hzszlyy", request);
+ sendMsg = sendResult.getRawResponse();
}
return AjaxResult.success(sendMsg);
}
+ /**
+ * 鐢熸垚澶栭摼
+ */
+ @ApiOperation("鐢熸垚澶栭摼")
+ @PostMapping("/getUrl")
+ public AjaxResult getUrl(@RequestBody smsVO vo) throws UnsupportedEncodingException {
+ String content = "";
+ if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
+ String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
+ Integer radix = iServiceOutPathService.selectAutoId();
+ String format = ShortCode.encode(radix.longValue());
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
+ serviceOutPath.setParam1(taskId);
+ serviceOutPath.setParam2(patid);
+ serviceOutPath.setParam3(vo.getTaskName());
+ serviceOutPath.setParam6(subId);
+ serviceOutPath.setRadix(format);
+ serviceOutPath.setCreateTime(new Date());
+ serviceOutPath.setOrgid(vo.getOrgid());
+ String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;
+// content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+ content = url;
+ serviceOutPath.setUrl(url);
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+ }
+ if (StringUtils.isNotEmpty(vo.getSubId())) {
+ ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
+ if (serviceSubtask.getSendstate() == 4L) content = "璇ヤ换鍔′笉鎵ц";
+ }
+
+ return AjaxResult.success(content);
+ }
+
+ /**
+ * @param
+ * @return
+ */
+ @ApiOperation("鐭俊鍙戦��")
+ @AddOrgId
+ @PostMapping("/sendYunMasSms")
+ public AjaxResult sendYunMasSms(@RequestBody smsVO vo) throws Exception {
+ String yunMasConfigJson = configService.selectConfigByKey("ls.msg.yunmas", vo.getOrgid());
+ SmsUtils.YunMasConfig yunMasConfig = SmsUtils.YunMasConfig.of(yunMasConfigJson);
+ SmsUtils.SmsResult smsResult = SmsUtils.sendYunMasSms(yunMasConfig, vo.getPhone(), vo.getContent());
+ return AjaxResult.success(smsResult);
+ }
+
+ /**
+ * 涓芥按濡囧辜 寰俊娑堟伅鍙戦��
+ * <p>
+ * 澶栭儴绯荤粺浼犲叆鎮ｈ�呬俊鎭拰閫氱煡鍐呭锛岀敱鏈郴缁熺粺涓�鑾峰彇 token銆佽В鏋愭ā鏉垮苟璋冪敤涓芥按寰俊 sendMessage 鎺ュ彛銆�
+ *
+ * @param request 寰俊娑堟伅璇锋眰
+ * @return 鍙戦�佺粨鏋�
+ */
+ @Anonymous
+ @ApiOperation(value = "涓芥按濡囧辜 寰俊娑堟伅鍙戦��", notes = "渚涗附姘村競濡囧辜淇濆仴闄㈠閮ㄨ皟鐢�")
+ @Log(title = "涓芥按濡囧辜寰俊娑堟伅鍙戦��", businessType = BusinessType.OTHER)
+ @PostMapping("/sendChatFuyou")
+ public AjaxResult sendChatFuyou(@RequestBody LishuiFuyouWxChatRequest request) {
+ if (request == null) {
+ return AjaxResult.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ }
+ try {
+ SmsUtils.LsWxConfig config = SmsUtils.LsWxConfig.defaultLishui();
+
+ SmsUtils.LsWxMessage message = new SmsUtils.LsWxMessage();
+ message.setId(request.getTemplateId());
+ message.setPatientId(request.getPatientId());
+ message.setPatientName(request.getPatientName());
+ message.setIdCard(request.getIdCard());
+ message.setMobile(request.getMobile());
+ message.setMedCardNo(request.getMedCardNo());
+ message.setTitleName(request.getTitleName());
+ message.setContent(request.getContent());
+ message.setUrl(request.getUrl());
+
+ log.info("銆愪附姘村骞煎井淇°�戞敹鍒板閮ㄨ皟鐢紝鎵嬫満鍙凤細{}锛屾ā鏉縄D锛歿}",
+ request.getMobile(), request.getTemplateId());
+ String resp = SmsUtils.sendChatLs(config, message);
+ log.info("銆愪附姘村骞煎井淇°�戝閮ㄨ皟鐢ㄧ粨鏋滐細{}", resp);
+
+ JSONObject result;
+ try {
+ result = JSON.parseObject(resp);
+ } catch (Exception e) {
+ log.error("銆愪附姘村骞煎井淇°�戠涓夋柟鍝嶅簲涓嶆槸鍚堟硶JSON锛歿}", resp, e);
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細绗笁鏂瑰搷搴斿紓甯�", resp);
+ }
+ if (result == null) {
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細绗笁鏂瑰搷搴斾负绌�", resp);
+ }
+ if (result.getIntValue("code") != 0) {
+ String msg = result.getString("msg");
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細"
+ + (StringUtils.isEmpty(msg) ? "绗笁鏂规帴鍙ｈ繑鍥炲け璐�" : msg), result);
+ }
+ return AjaxResult.success("鍙戦�佹垚鍔�", result);
+ } catch (Exception e) {
+ log.error("銆愪附姘村骞煎井淇°�戝閮ㄨ皟鐢ㄥ紓甯革紝鎵嬫満鍙凤細{}", request.getMobile(), e);
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸紓甯革細" + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3