From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index d419716..b7c8ec7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -1,5 +1,9 @@
package com.ruoyi.web.controller.smartor.tools;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -7,6 +11,8 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.sms.smsUtils;
+import com.smartor.common.MtSubmitSmUtil;
import com.smartor.domain.BaseSmsRequest;
import com.smartor.domain.BaseSmsaccount;
import com.smartor.domain.BatchBaseSmsRequest;
@@ -16,11 +22,13 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
/**
* 鐭俊璐﹀彿Controller
@@ -35,11 +43,27 @@
@Autowired
private IBaseSmsaccountService baseSmsaccountService;
+ @Value("${xhsmsPath}")
+ private String xhsmsPath;
+
+ @Value("${xhsmsAccount}")
+ private String xhsmsAccount;
+
+ @Value("${xhsmsPwd}")
+ private String xhsmsPwd;
+
+ @Value("${spring.profiles.active}")
+ private String active;
+
+ @Autowired
+ private MtSubmitSmUtil mtSubmitSmUtil;
+
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -82,6 +106,7 @@
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:edit')")
@Log(title = "鐭俊璐﹀彿", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseSmsaccount baseSmsaccount) {
return toAjax(baseSmsaccountService.updateBaseSmsaccount(baseSmsaccount));
@@ -105,10 +130,26 @@
@PostMapping("/sendMsg")
@RepeatSubmit
public AjaxResult sendMsg(@RequestBody BaseSmsRequest baseSmsRequest) {
- if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
- return error();
+ String sendMsg = "";
+ if (active.equals("hzszlyy")) {
+ try {
+ JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
+ String content = jsTemp.getString("name");
+ sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
+ } catch (Exception ex) {
+ return AjaxResult.error(ex.getMessage());
+ }
+ return AjaxResult.success(sendMsg);
+ } else if (active.equals("nhfy")) {
+ Map<String, Object> smsResult = mtSubmitSmUtil.submitSm(baseSmsRequest.getPhoneNumber(), baseSmsRequest.getTemplateCode());
+ return AjaxResult.success(smsResult.get("result"));
+
+ } else {
+ if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
+ return error();
+ }
+ return success(baseSmsaccountService.sendMsg(baseSmsRequest));
}
- return success(baseSmsaccountService.sendMsg(baseSmsRequest));
}
/**
--
Gitblit v1.9.3