From 1958e8bad428b94aa457734f7f047fe373eafd83 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:11 +0800
Subject: [PATCH] Merge branch 'smartor_ls_261103' into smartor_ls_merge
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 b55411c..9c42669 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,16 @@
package com.ruoyi.web.controller.common;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.AddOrgId;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.RSAPublicKeyExample;
+import com.ruoyi.common.utils.ShortCode;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sms.SmsUtils;
import com.ruoyi.message.SendResult;
import com.ruoyi.message.sms.SmsSendRequest;
import com.ruoyi.message.sms.SmsSenderFactory;
@@ -11,6 +19,7 @@
import com.ruoyi.message.sms.provider.shiyi.ShiyiSmsUtil;
import com.ruoyi.message.wechat.WechatSendRequest;
import com.ruoyi.message.wechat.WechatSenderFactory;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -64,6 +73,8 @@
private IServiceOutPathService iServiceOutPathService;
@Autowired
private IServiceSubtaskService iServiceSubtaskService;
+ @Autowired
+ private ISysConfigService configService;
@Value("${spring.profiles.active}")
private String active;
@@ -112,7 +123,7 @@
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);
+ String format = ShortCode.encode(radix.longValue());
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
@@ -164,7 +175,7 @@
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);
+ String format = ShortCode.encode(radix.longValue());
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
@@ -200,7 +211,7 @@
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);
+ String format = ShortCode.encode(radix.longValue());
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
@@ -223,4 +234,75 @@
return AjaxResult.success(content);
}
+ /**
+ * @param
+ * @return
+ */
+ @ApiOperation("鐭俊鍙戦��")
+ @AddOrgId
+ @PostMapping("/sendYunMasSms")
+ public AjaxResult sendYunMasSms(@RequestBody smsVO vo) throws Exception {
+ String yunMasConfigJson = configService.selectConfigByKey("ls.msg.yunmas", vo.getOrgid());
+ SmsUtils.YunMasConfig yunMasConfig = SmsUtils.YunMasConfig.of(yunMasConfigJson);
+ SmsUtils.SmsResult smsResult = SmsUtils.sendYunMasSms(yunMasConfig, vo.getPhone(), vo.getContent());
+ return AjaxResult.success(smsResult);
+ }
+
+ /**
+ * 涓芥按濡囧辜 寰俊娑堟伅鍙戦��
+ * <p>
+ * 澶栭儴绯荤粺浼犲叆鎮ｈ�呬俊鎭拰閫氱煡鍐呭锛岀敱鏈郴缁熺粺涓�鑾峰彇 token銆佽В鏋愭ā鏉垮苟璋冪敤涓芥按寰俊 sendMessage 鎺ュ彛銆�
+ *
+ * @param request 寰俊娑堟伅璇锋眰
+ * @return 鍙戦�佺粨鏋�
+ */
+ @Anonymous
+ @ApiOperation(value = "涓芥按濡囧辜 寰俊娑堟伅鍙戦��", notes = "渚涗附姘村競濡囧辜淇濆仴闄㈠閮ㄨ皟鐢�")
+ @Log(title = "涓芥按濡囧辜寰俊娑堟伅鍙戦��", businessType = BusinessType.OTHER)
+ @PostMapping("/sendChatFuyou")
+ public AjaxResult sendChatFuyou(@RequestBody LishuiFuyouWxChatRequest request) {
+ if (request == null) {
+ return AjaxResult.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ }
+ try {
+ SmsUtils.LsWxConfig config = SmsUtils.LsWxConfig.defaultLishui();
+
+ SmsUtils.LsWxMessage message = new SmsUtils.LsWxMessage();
+ message.setId(request.getTemplateId());
+ message.setPatientId(request.getPatientId());
+ message.setPatientName(request.getPatientName());
+ message.setIdCard(request.getIdCard());
+ message.setMobile(request.getMobile());
+ message.setMedCardNo(request.getMedCardNo());
+ message.setTitleName(request.getTitleName());
+ message.setContent(request.getContent());
+ message.setUrl(request.getUrl());
+
+ log.info("銆愪附姘村骞煎井淇°�戞敹鍒板閮ㄨ皟鐢紝鎵嬫満鍙凤細{}锛屾ā鏉縄D锛歿}",
+ request.getMobile(), request.getTemplateId());
+ String resp = SmsUtils.sendChatLs(config, message);
+ log.info("銆愪附姘村骞煎井淇°�戝閮ㄨ皟鐢ㄧ粨鏋滐細{}", resp);
+
+ JSONObject result;
+ try {
+ result = JSON.parseObject(resp);
+ } catch (Exception e) {
+ log.error("銆愪附姘村骞煎井淇°�戠涓夋柟鍝嶅簲涓嶆槸鍚堟硶JSON锛歿}", resp, e);
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細绗笁鏂瑰搷搴斿紓甯�", resp);
+ }
+ if (result == null) {
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細绗笁鏂瑰搷搴斾负绌�", resp);
+ }
+ if (result.getIntValue("code") != 0) {
+ String msg = result.getString("msg");
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸け璐ワ細"
+ + (StringUtils.isEmpty(msg) ? "绗笁鏂规帴鍙ｈ繑鍥炲け璐�" : msg), result);
+ }
+ return AjaxResult.success("鍙戦�佹垚鍔�", result);
+ } catch (Exception e) {
+ log.error("銆愪附姘村骞煎井淇°�戝閮ㄨ皟鐢ㄥ紓甯革紝鎵嬫満鍙凤細{}", request.getMobile(), e);
+ return AjaxResult.error("涓芥按濡囧辜寰俊鍙戦�佸紓甯革細" + e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3