From 723d38375c45d24737bfef6f33a9686254abf99b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 17 十月 2024 13:42:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/common/SendService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/common/SendService.java b/smartor/src/main/java/com/smartor/common/SendService.java
index 23ca618..4a40d8b 100644
--- a/smartor/src/main/java/com/smartor/common/SendService.java
+++ b/smartor/src/main/java/com/smartor/common/SendService.java
@@ -1,13 +1,18 @@
package com.smartor.common;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.utils.http.HttpUtils;
import com.smartor.domain.*;
import com.smartor.mapper.PatWildcardMapper;
import com.smartor.service.DingTalkService;
+import com.smartor.service.ISmsParamService;
import com.smartor.service.WeChatService;
import com.smartor.service.impl.BaseSmsaccountServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,10 +20,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
* 鍙戦�佹湇鍔″伐鍏风被
*/
+@Slf4j
@Component
public class SendService {
@Autowired
@@ -33,6 +40,9 @@
@Autowired
private WeChatService weChatService;
+ @Autowired
+ ISmsParamService iSmsParamService;
+
public Boolean sendMsg(SendMagParam sendMagParam) {
// 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤
switch (sendMagParam.getType()) {
@@ -43,19 +53,29 @@
case ("3"):
case ("4"):
- BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
- baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
- baseSmsRequest.setTemplateCode("SMS_461860582");
- SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
- if (sendSmsResponseBody.getCode().equals("OK")) {
+ //鐭俊
+ int i = iSmsParamService.sendSmsInfo(sendMagParam.getUrl(), sendMagParam.getPhone());
+ if (i == 1) {
return true;
}
+
return false;
case ("5"):
+ //鍏紬鍙�
+// String params = "service=smarthos.yygh.ApiService.push&idcard=" + sendMagParam.getIdcard() + "&url=" + sendMagParam.getUrl() + "&keyword1=null&keyword2=null&keyword3=null&keyword4=null";
+// String result = HttpUtils.sendPost("/api", params);
+// JSONObject jsonObject = JSONObject.parseObject(result);
+// String code = (String) jsonObject.get("code");
+// if (!code.equals(0)) {
+// log.error("寰俊鍏紬鍙锋秷鎭彂閫佸け璐ヤ簡锛歿}", sendMagParam);
+// return false;
+// }
+// return true;
+
WeChatSendVo weChatSendVo = new WeChatSendVo();
weChatSendVo.setUrl(sendMagParam.getUrl());
weChatSendVo.setTemplateId(sendMagParam.getTmpCode());
- ObjectMapper objectMapper=new ObjectMapper();
+ ObjectMapper objectMapper = new ObjectMapper();
Map map = null;
try {
map = objectMapper.readValue(sendMagParam.getContent(), Map.class);
@@ -63,6 +83,7 @@
e.printStackTrace();
}
weChatSendVo.setContent(map);
+ weChatSendVo.setOpenid(sendMagParam.getOpenid());
Boolean aBoolean1 = weChatService.sendMessageToFollowers(weChatSendVo);
return aBoolean1;
case ("6"):
--
Gitblit v1.9.3