From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 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 5a8093a..2a1b772 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
@@ -18,15 +18,16 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.List;
 
 @RestController
 @Api(description = "鐭ヤ俊鎺ュ彛")
@@ -54,6 +55,8 @@
     @Autowired
     private IServiceOutPathService iServiceOutPathService;
 
+    @Autowired
+    private UtilsMapper utilsMapper;
 
     /**
      * @param
@@ -76,31 +79,29 @@
         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);
         ServiceOutPath serviceOutPath = new ServiceOutPath();
         serviceOutPath.setParam1(taskId);
         serviceOutPath.setParam2(patid);
         serviceOutPath.setParam3(vo.getTaskName());
         serviceOutPath.setParam6(subId);
+        serviceOutPath.setRadix(format);
         serviceOutPath.setCreateTime(new Date());
-        String format ="";
-        if(ObjectUtils.isNotEmpty(vo.getSubId())) {
-            format = String.format("%03X", Integer.parseInt(vo.getSubId()));
-            serviceOutPath.setRadix(format);
-        }
         iServiceOutPathService.insertServiceOutPath(serviceOutPath);
 
-        String url=ip + ":" + req_path + "/wt?p=" + format;
+        String url = ip + ":" + req_path + "/wt?p=" + format;
 
-        String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
-        if(ObjectUtils.isNotEmpty(vo.getContent()))
-            content=vo.getContent();
-        else
-            sendChat(vo);
-        String sendMsg="";
-        try{
-            sendMsg=smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,vo.getPhone(),content);
+        String content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+        if (ObjectUtils.isNotEmpty(vo.getContent()))
+            content = vo.getContent();
+//        else
+//            sendChat(vo);
+        String sendMsg = "";
+        try {
+            sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
             log.info(sendMsg);
-        }catch (Exception ex){
+        } catch (Exception ex) {
             log.error(ex.getMessage());
         }
         return AjaxResult.success(sendMsg);
@@ -116,21 +117,22 @@
         RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
         String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
         String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
-        String url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid
-                + "&param3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
+        String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
+        Integer radix=iServiceOutPathService.selectAutoId();
+        String format = String.format("%03X", radix);
+        ServiceOutPath serviceOutPath = new ServiceOutPath();
+        serviceOutPath.setParam1(taskId);
+        serviceOutPath.setParam2(patid);
+        serviceOutPath.setParam3(vo.getTaskName());
+        serviceOutPath.setParam6(subId);
+        serviceOutPath.setRadix(format);
+        serviceOutPath.setCreateTime(new Date());
+        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
 
-        String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+        String url = ip + ":" + req_path + "/wt?p=" + format;
 
-        String urlTemp="http://192.200.54.14:5003/sfjk/SendMessage?sfzh="+vo.getIdCard()
-                +"&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content="+content+"&phone="+vo.getPhone()
-                +"&url="+url+"&key=ff76f8904f5f32b5ee1739e8ea46e60g";
-        String sendMsg= "";
-        try{
-            sendMsg= HttpUtils.sendGet(urlTemp);
-            log.info(sendMsg);
-        }catch (Exception ex){
-            log.error(ex.getMessage());
-        }
+
+        String sendMsg =  smsUtils.sendChat(url,vo.getPhone(),vo.getIdCard());
         return AjaxResult.success(sendMsg);
     }
 }

--
Gitblit v1.9.3