From ebf10ccf6217dfeebad750b4f4bb9ef4d9af68b0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 02 Jun 2023 16:14:52 +0800
Subject: [PATCH] 新增告警模块，告警相关（告警信息，短信相关）代码从 sm 模块抽离
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java | 85 +++++++-----------------------------------
1 files changed, 15 insertions(+), 70 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 c078fe1..b414803 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
@@ -1,10 +1,9 @@
package cn.gistack.sm.sms.controller;
-import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
+import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
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.alerts.sms.feign.ISmsRecordClient;
import cn.gistack.sm.sms.util.SmsUtils;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
@@ -15,8 +14,6 @@
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;
@@ -33,16 +30,11 @@
@AllArgsConstructor
public class SmsController {
- private final ISmsRecordService smsRecordService;
-
private final BladeRedis bladeRedis;
private final IUserClient userClient;
- @GetMapping("/test")
- public void setRedis(){
- saveCodeForRedis("super_admin","123456");
- }
+ private final ISmsRecordClient smsRecordClient;
/**
* 发送登录验证码
@@ -51,7 +43,7 @@
* @return
*/
@PostMapping("/sendCode")
- public R test(@RequestBody SMSSendRequest request){
+ public R sendCode(@RequestBody SMSSendRequest request){
// 手机号码校验
if(validatePhone(request.getUserNumber())) {
//设置模板相关信息
@@ -61,12 +53,19 @@
request.setMessageContent(content);
request.setTemplateId(templateId);
// 发送操作
- String sendMsg = SmsUtils.sendMsg(request);
+ ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
+ String sendMsg =JSON.toJSONString(resultComResult);
JSONObject jsonObject = JSON.parseObject(sendMsg);
- // 记录发送记录操作
- saveSendRecord(request, sendMsg);
// 保存验证码到 redis
saveCodeForRedis(request.getUserNumber(), randNumber);
+ // 记录发送记录操作
+ smsRecordClient.saveSmsRecord(
+ request.getUserNumber(),
+ request.getMessageContent(),
+ request.getTemplateId(),
+ resultComResult.getCode(),
+ resultComResult.getMsg(),
+ 1);
// 返回发送信息
return R.data(jsonObject);
}
@@ -117,59 +116,5 @@
*/
private void saveCodeForRedis(String userNumber, String randNumber) {
bladeRedis.setEx(PHONE_KEY + userNumber,randNumber,5*60L);
- }
-
- /**
- * 发送记录保存
- * @param request 发送信息
- * @param sendMsg 响应数据
- */
- private void saveSendRecord(SMSSendRequest request, String sendMsg) {
- SmsRecord smsRecord = new SmsRecord();
- smsRecord.setPhone(request.getUserNumber());
- smsRecord.setContent(request.getMessageContent());
- smsRecord.setTemplateId(request.getTemplateId());
- smsRecord.setResContent(sendMsg);
- //插入记录
- smsRecordService.save(smsRecord);
- }
-
- /**
- * 发送邮件提醒
- * @param smsRequest
- * @return
- */
- @PostMapping("/sendEmailMsg")
- public R sendEmailMsg(@RequestBody SmsRequest smsRequest){
- // 处理数据(可能是多个手机号情况)
- List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
- // 遍历
- for (String phone : list) {
- DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId("2431012165350");
- dynSMSSendRequest.setDynData(new String[][]{{"手机号码", "标题"}, {phone, smsRequest.getContent()}});
- // 手机号校验
- if(validator(phone)) {
- // 发送邮件短信
- String dynSendMsg = SmsUtils.dynSendMethod(dynSMSSendRequest);
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setUserNumber(phone);
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(request, dynSendMsg);
- }else {
- // 手机号有误记录
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setUserNumber(phone);
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(request, "手机号错误未发送...");
- }
- }
- return R.status(true);
}
}
--
Gitblit v1.9.3