From 0b9cdc31a4cf076c7267da5b061a1b16ad13499f Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 15 十月 2025 14:52:08 +0800
Subject: [PATCH] 市一短信和微信问卷
---
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 4 +-
ruoyi-admin/src/main/resources/application-druid.yml | 2
smartor/src/main/java/com/smartor/domain/smsVO.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 57 ++++++++++++++++++++++++----
4 files changed, 55 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 57f6730..5a8093a 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;
@@ -13,6 +14,8 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
@@ -28,6 +31,7 @@
@RestController
@Api(description = "鐭ヤ俊鎺ュ彛")
@RequestMapping("/sms")
+@Slf4j
public class SmsController {
@Value("${xhsmsPath}")
private String xhsmsPath;
@@ -56,7 +60,7 @@
* @return
*/
@ApiOperation("鐭俊鍙戦��")
- @PostMapping("/send")
+ @PostMapping("/sendTest")
public AjaxResult send(@RequestBody smsVO vo) {
String sendMsg=smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,vo.getPhone(),vo.getContent());
return AjaxResult.success(sendMsg);
@@ -66,7 +70,7 @@
* @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);
@@ -78,18 +82,55 @@
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;
- //String url = = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ 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);
+ }
+
+ /**
+ * @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 + "¶m2=" + patid
+ + "¶m3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
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);
}
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c1eaa91..599ec65 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -106,7 +106,7 @@
enabled: true
# 鎱QL璁板綍
log-slow-sql: true
- slow-sql-millis: 1000
+ slow-sql-millis: 3000
merge-sql: true
wall:
config:
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
index c8967b7..4c2bc54 100644
--- a/ruoyi-admin/src/main/resources/application-hzszlyy.yml
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -150,10 +150,10 @@
#localIP: 192.168.2.13
#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-req_path: 8093
+req_path: 8092
#localIP: https://wx.lihusmart.com
#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-localIP: http://221.12.19.26
+localIP: http://sf.wehzsy.com
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
diff --git a/smartor/src/main/java/com/smartor/domain/smsVO.java b/smartor/src/main/java/com/smartor/domain/smsVO.java
index ab3aba3..6dcc458 100644
--- a/smartor/src/main/java/com/smartor/domain/smsVO.java
+++ b/smartor/src/main/java/com/smartor/domain/smsVO.java
@@ -25,4 +25,7 @@
@ApiModelProperty(value = "鎮ｈ�匢D")
private String patId;
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ private String idCard;
+
}
--
Gitblit v1.9.3