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/util/SmsUtils.java | 38 ++++++++++++--------------------------
1 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
index 38eb0a8..c35e578 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
@@ -6,44 +6,30 @@
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSAPI;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
-import cn.com.flaginfo.sdk.cmc.api.sms.reply.SMSReplyAPI;
-import cn.com.flaginfo.sdk.cmc.api.sms.reply.SMSReplyDataResult;
-import cn.com.flaginfo.sdk.cmc.api.sms.reply.SMSReplyRequest;
-import cn.com.flaginfo.sdk.cmc.api.sms.replyconfirm.SMSReplyConfirmAPI;
-import cn.com.flaginfo.sdk.cmc.api.sms.replyconfirm.SMSReplyConfirmRequest;
-import cn.com.flaginfo.sdk.cmc.api.sms.report.SMSReportAPI;
-import cn.com.flaginfo.sdk.cmc.api.sms.report.SMSReportRequest;
-import cn.com.flaginfo.sdk.cmc.api.sms.report.SMSReportResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSApi;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.com.flaginfo.sdk.cmc.common.ApiEnum;
-import cn.gistack.sm.sms.constant.SmsConstant;
-import com.alibaba.fastjson.JSON;
-import org.aspectj.lang.annotation.Before;
-import org.springblade.core.redis.cache.BladeRedis;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.gistack.common.constant.SmsConstant;
import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.List;
import java.util.Random;
-import static cn.gistack.common.cache.CacheNames.PHONE_KEY;
-import static cn.gistack.sm.sms.constant.SmsConstant.*;
+import static cn.gistack.common.constant.SmsConstant.*;
+/**
+ * 短信发送工具类
+ * @author zhongrj
+ * @date 2023-05-30
+ */
@Component
public class SmsUtils {
-
- @Autowired
- private BladeRedis bladeRedis;
/**
* 固定内容发送
*/
- public static String sendMsg(SMSSendRequest sendRequest) {
+ public static ComResult<SMSSendDataResult> sendMsg(SMSSendRequest sendRequest) {
ApiConfig apiConfig = new ApiConfig(SpCode, AppKey, AppSecret);
ApiProvider provider = ApiProvider.getInstance(apiConfig);
//请求接口
@@ -53,7 +39,7 @@
sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
ComResult<SMSSendDataResult> request = api.request(sendRequest);
// 返回
- return JSON.toJSONString(request);
+ return request;
}
/**
@@ -73,17 +59,17 @@
/**
* 动态短信内容批量发送
*/
- public static String dynSendMethod(DynSMSSendRequest sendRequest) {
+ public static ComResult<DynSMSSendDataResult> dynSendMethod(DynSMSSendRequest sendRequest) {
ApiConfig apiConfig = new ApiConfig(SpCode, AppKey, AppSecret);
ApiProvider provider = ApiProvider.getInstance(apiConfig);
//请求接口
DynSMSAPI api = (DynSMSAPI) provider.getApi(ApiEnum.SENDDYNSMS);
api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendVarUrl);
//请求参数
-// sendRequest.setDynData(new String[][]{{"手机号码", "编号"}, {"13000000000", "456"}});
sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
ComResult<DynSMSSendDataResult> result = api.request(sendRequest);
- return JSON.toJSONString(result);
+ // 返回
+ return result;
}
/**
--
Gitblit v1.9.3