From 6f1e752bf00b584c8a17569578fa8e54cdb71b60 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 27 十月 2025 13:34:59 +0800
Subject: [PATCH] 处理选项不显示的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 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..c1a3a6d 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
@@ -1,16 +1,11 @@
package com.ruoyi.web.controller.common;
-import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
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;
import com.smartor.domain.ServiceOutPath;
import com.smartor.domain.smsVO;
+import com.smartor.mapper.UtilsMapper;
import com.smartor.service.IServiceOutPathService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,14 +13,12 @@
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;
@RestController
@@ -54,6 +47,8 @@
@Autowired
private IServiceOutPathService iServiceOutPathService;
+ @Autowired
+ private UtilsMapper utilsMapper;
/**
* @param
@@ -76,31 +71,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 +109,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 + "¶m2=" + patid
- + "¶m3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=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