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

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java |   62 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 11 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 8c3a964..5c0afd1 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
@@ -5,6 +5,7 @@
 import com.ruoyi.common.utils.RSAPublicKeyExample;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.sms.smsUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.smartor.domain.HtmlContentVO;
@@ -15,6 +16,9 @@
 import com.smartor.service.IServiceOutPathService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+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;
@@ -30,6 +34,7 @@
 @RestController
 @Api(description = "鐭ヤ俊鎺ュ彛")
 @RequestMapping("/sms")
+@Slf4j
 public class SmsController {
     @Value("${xhsmsPath}")
     private String xhsmsPath;
@@ -61,18 +66,17 @@
      * @return
      */
     @ApiOperation("鐭俊鍙戦��")
-    @PostMapping("/send")
+    @PostMapping("/sendTest")
     public AjaxResult send(@RequestBody smsVO vo) {
-        String sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), vo.getContent());
+        String sendMsg=smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,vo.getPhone(),vo.getContent());
         return AjaxResult.success(sendMsg);
     }
-
     /**
      * @param
      * @return
      */
     @ApiOperation("鐭俊鍙戦��")
-    @PostMapping("/sendAsk")
+    @PostMapping("/send")
     public AjaxResult sendAsk(@RequestBody smsVO vo) throws UnsupportedEncodingException {
         RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
         String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
@@ -84,11 +88,13 @@
         serviceOutPath.setParam3(vo.getTaskName());
         serviceOutPath.setParam6(subId);
         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 format = String.format("%03X", serviceOutPath.getId());
-        serviceOutPath.setRadix(format);
-        serviceOutPath.setUpdateTime(new Date());
-        iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+
         String url = ip + ":" + req_path + "/wt?p=" + format;
         ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(Long.valueOf(taskId));
         //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
@@ -96,12 +102,46 @@
             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);
+            log.info(sendMsg);
+        }catch (Exception ex){
+            log.error(ex.getMessage());
+        }
+        return AjaxResult.success(sendMsg);
+    }
 
-        //String url = = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
+    /**
+     * @param
+     * @return
+     */
+    @ApiOperation("寰俊鍙戦��")
+    @PostMapping("/sendChat")
+    public AjaxResult sendChat(@RequestBody smsVO vo) throws UnsupportedEncodingException {
+        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 content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+        String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
 
-        String sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
+        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());
+        }
         return AjaxResult.success(sendMsg);
     }
 }

--
Gitblit v1.9.3