From 86a669f3f6d304cebe399f5a867027f2f3cceb13 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 25 Apr 2023 15:21:45 +0800
Subject: [PATCH] 动态发送短信接口调整

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
index d28a4f1..ab170a7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
@@ -3,16 +3,20 @@
 import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
 import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
 import cn.gistack.sm.sms.entity.SmsRecord;
+import cn.gistack.sm.sms.entity.SmsRequest;
 import cn.gistack.sm.sms.service.ISmsRecordService;
 import cn.gistack.sm.sms.util.SmsUtils;
 import cn.gistack.system.user.entity.User;
 import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -58,12 +62,13 @@
 			request.setTemplateId(templateId);
 			// 发送操作
 			String sendMsg = SmsUtils.sendMsg(request);
+			JSONObject jsonObject = JSON.parseObject(sendMsg);
 			// 记录发送记录操作
 			saveSendRecord(request, sendMsg);
 			// 保存验证码到 redis
 			saveCodeForRedis(request.getUserNumber(), randNumber);
 			// 返回发送信息
-			return R.data(sendMsg);
+			return R.data(jsonObject);
 		}
 		// 返回发送信息
 		return R.fail(400,"该手机号不存在!");
@@ -78,7 +83,7 @@
 		// 校验手机号码正确性
 		if (validator(userNumber)){
 			// 校验该账户是否已注册,通过手机号查询用户是否存在,tenantId 暂时写死,未登陆情况 tenantId 获取不到
-			R<List<User>> list = userClient.userInfoByPhone("000000", userNumber);
+			R<List<User>> list = userClient.userInfoByPhoneOrAccount("000000", userNumber);
 			if (list.getData().size()>0){
 				return true;
 			}
@@ -126,8 +131,23 @@
 		smsRecordService.save(smsRecord);
 	}
 
-	@PostMapping("/test1")
-	public R test1(@RequestBody DynSMSSendRequest request){
-		return R.data(SmsUtils.dynSendMethod(request));
+	/**
+	 * 发送邮件提醒
+	 * @param request
+	 * @return
+	 */
+	@PostMapping("/sendEmailMsg")
+	public R sendEmailMsg(@RequestBody SmsRequest request){
+		// 处理数据(可能是多个手机号情况)
+		List<String> list = Arrays.asList(request.getPhone().split(","));
+		// 遍历
+		for (String phone : list) {
+			DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
+			dynSMSSendRequest.setTemplateId("2431012165350");
+			dynSMSSendRequest.setDynData(new String[][]{{"手机号码","标题"},{phone,request.getContent()}});
+			// 发送邮件短信
+			SmsUtils.dynSendMethod(dynSMSSendRequest);
+		}
+		return R.status(true);
 	}
 }

--
Gitblit v1.9.3