From 8fe7805b75fceef28f00fb0124901031a287429c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 07 五月 2026 16:46:10 +0800
Subject: [PATCH] 【市一】remark 统一调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 44 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 c1a3a6d..115081f 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,8 +1,15 @@
package com.ruoyi.web.controller.common;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.dx.MessageSend;
+import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sms.smsUtils;
+import com.smartor.common.MtSubmitSmUtil;
import com.smartor.domain.ServiceOutPath;
import com.smartor.domain.smsVO;
import com.smartor.mapper.UtilsMapper;
@@ -19,7 +26,11 @@
import org.springframework.web.bind.annotation.RestController;
import java.io.UnsupportedEncodingException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
@RestController
@Api(description = "鐭ヤ俊鎺ュ彛")
@@ -28,6 +39,9 @@
public class SmsController {
@Value("${xhsmsPath}")
private String xhsmsPath;
+
+ @Autowired
+ private MtSubmitSmUtil mtSubmitSmUtil;
@Value("${xhsmsAccount}")
private String xhsmsAccount;
@@ -47,8 +61,8 @@
@Autowired
private IServiceOutPathService iServiceOutPathService;
- @Autowired
- private UtilsMapper utilsMapper;
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* @param
@@ -57,9 +71,10 @@
@ApiOperation("鐭俊鍙戦��")
@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
@@ -67,31 +82,56 @@
@ApiOperation("鐭俊鍙戦��")
@PostMapping("/send")
public AjaxResult sendAsk(@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 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 = "";
+ if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ 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());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+ String url = ip + ":" + req_path + "/wt?p=" + format;
+ content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+ }
- String url = ip + ":" + req_path + "/wt?p=" + format;
+ if (ObjectUtils.isNotEmpty(vo.getContent())) content = vo.getContent();
- String content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
- if (ObjectUtils.isNotEmpty(vo.getContent()))
- content = vo.getContent();
-// else
-// sendChat(vo);
- String sendMsg = "";
+ String sendMsg = "false";
try {
- sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
+ if (active.equals("hzszlyy")) {
+ sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
+ } else if (active.equals("nhfy")) {
+ Map<String, Object> smsResult = mtSubmitSmUtil.submitSm(vo.getPhone(), content);
+ if (smsResult != null && smsResult.get("result") != null && smsResult.get("result").toString().equals("0")) {
+ sendMsg = "true";
+ }
+ } else if (active.equals("sltd")) {
+ String data = MessageSend.sendMsg(content, "6", vo.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ if (StringUtils.isNotEmpty(data)) {
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode root = mapper.readTree(data);
+ String status = root.get("result").get(0).get("status").asText();
+ if (status.equals("00000")) {
+ sendMsg = "true";
+ }
+ }
+ } else if (active.equals("xh")) {
+ Map<String, String> req = new HashMap<>();
+ req.put("phone", vo.getPhone());
+ req.put("content", vo.getContent());
+ sendMsg = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
+ } else if (active.equals("ls")) {
+ //涓芥按13瀹跺尰闄紝鏈夌偣涓嶆柟渚匡紝鏈夌┖鍐嶆帴
+ return AjaxResult.error("璇ョ煭淇″姛鑳借繕鏈紑閫�");
+ }
log.info(sendMsg);
} catch (Exception ex) {
log.error(ex.getMessage());
@@ -106,25 +146,25 @@
@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 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 url = ip + ":" + req_path + "/wt?p=" + format;
-
-
- String sendMsg = smsUtils.sendChat(url,vo.getPhone(),vo.getIdCard());
+ String sendMsg = "";
+ if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ 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());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+ String url = ip + ":" + req_path + "/wt?p=" + format;
+ sendMsg = smsUtils.sendChat(url, vo.getPhone(), vo.getIdCard());
+ }
return AjaxResult.success(sendMsg);
}
}
--
Gitblit v1.9.3