From 0afac42fb2e9d6e5291304dd0044ce3042b45d2b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:09:14 +0800
Subject: [PATCH] 短信模块提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 126 +++++++++++++----------------------------
1 files changed, 41 insertions(+), 85 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 fbbb261..f11f6b6 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,19 +1,17 @@
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.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.dx.MessageSend;
-import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
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.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.smartor.domain.*;
-import com.smartor.mapper.UtilsMapper;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskService;
import io.swagger.annotations.Api;
@@ -28,35 +26,28 @@
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;
+/**
+ * 鐭ヤ俊鎺ュ彛锛堝澶栫煭淇� / 寰俊鍏紬鍙峰彂閫佸叆鍙ｏ級銆�
+ * <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;
@@ -76,14 +67,16 @@
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,8 +92,7 @@
}
/**
- * @param
- * @return
+ * 鐭俊鍙戦��
*/
@ApiOperation("鐭俊鍙戦��")
@PostMapping("/send")
@@ -137,55 +129,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());
@@ -194,8 +145,7 @@
}
/**
- * @param
- * @return
+ * 寰俊鍙戦��
*/
@ApiOperation("寰俊鍙戦��")
@PostMapping("/sendChat")
@@ -223,14 +173,20 @@
serviceOutPath.setOrgid(vo.getOrgid());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;
- sendMsg = smsUtils.sendChat(url, vo.getPhone(), vo.getIdCard());
+ //涓庡師瀹炵幇涓�鑷达細璇ユ帴鍙ｅ浐瀹氳蛋甯備竴鍏紬鍙�
+ 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);
}
/**
- * @param
- * @return
+ * 鐢熸垚澶栭摼
*/
@ApiOperation("鐢熸垚澶栭摼")
@PostMapping("/getUrl")
--
Gitblit v1.9.3