From 586a386b2d779e94002c8099ff62271b0e684d88 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 06 五月 2026 11:35:19 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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 eb55162..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,9 +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;
@@ -20,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 = "鐭ヤ俊鎺ュ彛")
@@ -29,6 +39,9 @@
public class SmsController {
@Value("${xhsmsPath}")
private String xhsmsPath;
+
+ @Autowired
+ private MtSubmitSmUtil mtSubmitSmUtil;
@Value("${xhsmsAccount}")
private String xhsmsAccount;
@@ -48,8 +61,8 @@
@Autowired
private IServiceOutPathService iServiceOutPathService;
- @Autowired
- private UtilsMapper utilsMapper;
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* @param
@@ -91,9 +104,34 @@
if (ObjectUtils.isNotEmpty(vo.getContent())) content = vo.getContent();
- 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());
--
Gitblit v1.9.3