From bedd0a1cef215538df64470df6b8d4a022189136 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 八月 2024 14:05:16 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/common/SendService.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/common/SendService.java b/smartor/src/main/java/com/smartor/common/SendService.java
index 12e0f3b..4a40d8b 100644
--- a/smartor/src/main/java/com/smartor/common/SendService.java
+++ b/smartor/src/main/java/com/smartor/common/SendService.java
@@ -1,11 +1,15 @@
 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;
@@ -36,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()) {
@@ -46,23 +53,25 @@
             case ("3"):
 
             case ("4"):
-//                BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
-//                baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
-//                baseSmsRequest.setTemplateCode("SMS_461860582");
-//                SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
-
-                //涓嬮潰鐨勭煭淇″彂閫侊紝浠呮祴璇�
-                BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
-                baseSmsRequest.setPhoneNumber("19157806063");
-                baseSmsRequest.setTemplateCode("SMS_279456451");
-                baseSmsRequest.setTemplateParam("{'code':'58965'}");
-                SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
-                log.error(sendSmsResponseBody.message);
-                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());

--
Gitblit v1.9.3