From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 5a8093a..5c0afd1 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
@@ -10,11 +10,14 @@
import com.ruoyi.framework.config.ServerConfig;
import com.smartor.domain.HtmlContentVO;
import com.smartor.domain.ServiceOutPath;
+import com.smartor.domain.ServiceTask;
import com.smartor.domain.smsVO;
+import com.smartor.mapper.ServiceTaskMapper;
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.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -54,6 +57,9 @@
@Autowired
private IServiceOutPathService iServiceOutPathService;
+ @Autowired
+ private ServiceTaskMapper serviceTaskMapper;
+
/**
* @param
@@ -89,7 +95,12 @@
}
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String url=ip + ":" + req_path + "/wt?p=" + format;
+ String url = ip + ":" + req_path + "/wt?p=" + format;
+ ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(Long.valueOf(taskId));
+ //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
+ if (serviceTask.getType().equals("1")) {
+ url = ip + ":" + req_path + "/sf?p=" + format;
+ }
String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
if(ObjectUtils.isNotEmpty(vo.getContent()))
--
Gitblit v1.9.3