From 0c3f4ea5accd7b8cc667013f0c88abe4a6c1e96e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 15:54:42 +0800
Subject: [PATCH] 【丽水】短信发送

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 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 91ed52e..06e31b7 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
@@ -8,6 +8,7 @@
 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;
@@ -29,6 +30,7 @@
 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;
@@ -54,6 +56,9 @@
 
     @Value("${xhsmsPwd}")
     private String xhsmsPwd;
+    // 铏氭嫙鎺ュ叆鐮�
+    @Value("${xhsmsjrm}")
+    private String xhsmsjrm;
 
     @Value("${localIP}")
     private String ip;
@@ -115,9 +120,11 @@
             serviceOutPath.setParam6(subId);
             serviceOutPath.setRadix(format);
             serviceOutPath.setCreateTime(new Date());
-            iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+            serviceOutPath.setOrgid(vo.getOrgid());
             String url = ip + ":" + req_path + "/wt?p=" + format;
             content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+            serviceOutPath.setUrl(url);
+            iServiceOutPathService.insertServiceOutPath(serviceOutPath);
         }
 
         if (ObjectUtils.isNotEmpty(vo.getContent())) content = vo.getContent();
@@ -142,10 +149,33 @@
                     }
                 }
             } else if (active.equals("xh")) {
-                Map<String, String> req = new HashMap<>();
-                req.put("phone", vo.getPhone());
-                req.put("content", vo.getContent());
-                sendMsg = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
+//                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瀹跺尰闄紝鏈夌偣涓嶆柟渚匡紝鏈夌┖鍐嶆帴
                 return AjaxResult.error("璇ョ煭淇″姛鑳借繕鏈紑閫�");
@@ -179,6 +209,7 @@
             serviceOutPath.setParam6(subId);
             serviceOutPath.setRadix(format);
             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());

--
Gitblit v1.9.3