From 0bbbd746e8c39d91ad7b47a4e36e29ab972dc98c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 十月 2026 16:56:54 +0800
Subject: [PATCH] 处理长期任务发送问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index 610eed3..23a2968 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,11 +11,13 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-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.smartor.domain.BaseSmsRequest;
import com.smartor.domain.BaseSmsaccount;
import com.smartor.domain.BatchBaseSmsRequest;
-import com.smartor.domain.TemplateSmsRequest;
+import com.ruoyi.template.domain.TemplateSmsRequest;
import com.smartor.service.IBaseSmsaccountService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
/**
* 鐭俊璐﹀彿Controller
@@ -40,24 +44,21 @@
@Autowired
private IBaseSmsaccountService baseSmsaccountService;
- @Value("${xhsmsPath}")
- private String xhsmsPath;
-
- @Value("${xhsmsAccount}")
- private String xhsmsAccount;
-
- @Value("${xhsmsPwd}")
- private String xhsmsPwd;
-
@Value("${spring.profiles.active}")
private String active;
+
+ /**
+ * 娑堟伅鍙戦�佹柟宸ュ巶锛堢煭淇★級锛屾浛浠ｅ師鏉ョ洿鎺ユ敞鍏� xhsms* 閰嶇疆 + 鍚勭珯鐐瑰垎鏀殑鍐欐硶
+ */
+ @Autowired
+ private SmsSenderFactory smsSenderFactory;
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("list")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -100,8 +101,8 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
-@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
-@PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
return toAjax(baseSmsaccountService.updateBaseSmsaccount(baseSmsaccount));
}
@@ -129,11 +130,20 @@
try {
JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
String content = jsTemp.getString("name");
- sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
+ //鐭俊鍙戦�佸凡鏀跺彛鍒� ruoyi-message 妯″潡锛涘師瀹炵幇璋冪敤鐨勬槸 smsUtils.sendSms锛堝惔灞辩鍚嶏級
+ SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), content);
+ request.setCampus("2");
+ SendResult sendResult = smsSenderFactory.send("hzszlyy", request);
+ sendMsg = sendResult.getRawResponse();
} catch (Exception ex) {
return AjaxResult.error(ex.getMessage());
}
return AjaxResult.success(sendMsg);
+ } else if (active.equals("nhfy")) {
+ SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), baseSmsRequest.getTemplateCode());
+ SendResult sendResult = smsSenderFactory.send("nhfy", request);
+ return AjaxResult.success(sendResult.getCode());
+
} else {
if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
return error();
--
Gitblit v1.9.3