From fee8faba99f6e30cab460bbc8571ec2c2a5e17de Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:57:46 +0800
Subject: [PATCH] 新增Orgid

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java |   66 +++++++++++++-------------------
 1 files changed, 27 insertions(+), 39 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 4c0e937..e2cffe8 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
@@ -2,12 +2,9 @@
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.RSAPublicKeyExample;
-import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.sms.smsUtils;
 import com.smartor.domain.ServiceOutPath;
-import com.smartor.domain.ServiceTask;
 import com.smartor.domain.smsVO;
-import com.smartor.mapper.ServiceTaskMapper;
 import com.smartor.service.IServiceOutPathService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,8 +18,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 @RestController
@@ -52,8 +47,7 @@
     private IServiceOutPathService iServiceOutPathService;
 
     @Autowired
-    private ServiceTaskMapper serviceTaskMapper;
-
+    private UtilsMapper utilsMapper;
 
     /**
      * @param
@@ -76,36 +70,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;
-        ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(Long.valueOf(taskId));
-        //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
-        if (serviceTask.getType().equals("1")) {
-            url = ip + ":" + req_path + "/sf?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);
@@ -121,21 +108,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