From 4de8d67936432e72cec894026d7195a2ae6ff211 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 15 Jan 2024 16:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messagecenter/api/message/MessageFeign.java |  5 +++++
 .../api/message/MessageFeignFallback.java       |  7 +++++++
 .../messagecenter/api/message/PushSmsDto.java   | 17 +++++++++++++++++
 .../messagecenter/biz/message/MessageRest.java  |  7 +++++++
 .../biz/message/MessageService.java             | 15 +++++++++++++++
 5 files changed, 51 insertions(+)
 create mode 100644 message-center-api/src/main/java/com/yxt/messagecenter/api/message/PushSmsDto.java

diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java
index 79c80d6..424bc8b 100644
--- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java
@@ -136,4 +136,9 @@ public interface MessageFeign {
     @ApiOperation("消息推送测试")
     @PostMapping("/pushTest")
     ResultBean pushTest(@RequestParam("userSid") String userSid);
+
+    @ApiOperation("发送短信通知")
+    @PostMapping("/pushSms")
+    ResultBean pushSms(@RequestBody PushSmsDto dto);
+
 }
\ No newline at end of file
diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java
index c158026..0ad2f08 100644
--- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java
@@ -115,4 +115,11 @@ public class MessageFeignFallback implements MessageFeign {
     public ResultBean pushTest(String userSid) {
         return null;
     }
+
+    @Override
+    public ResultBean pushSms(PushSmsDto dto) {
+        return null;
+    }
+
+
 }
\ No newline at end of file
diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/PushSmsDto.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/PushSmsDto.java
new file mode 100644
index 0000000..8d42e9a
--- /dev/null
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/PushSmsDto.java
@@ -0,0 +1,17 @@
+package com.yxt.messagecenter.api.message;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/15 15:47
+ */
+@Data
+public class PushSmsDto {
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("短信内容")
+    private String msg;
+}
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java
index 3ef31f7..255e62d 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java
@@ -196,4 +196,11 @@ public class MessageRest implements MessageFeign {
     public ResultBean pushTest(String userSid) {
         return messageService.pushTest(userSid);
     }
+
+    @Override
+    public ResultBean pushSms(PushSmsDto dto) {
+        return messageService.pushSms(dto);
+    }
+
+
 }
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
index 57bc2e5..d25f37f 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
@@ -1249,4 +1249,19 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         }
         return rb.success();
     }
+
+    public ResultBean pushSms(PushSmsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //标题、内容、消息类别key、消息类别名称、
+        YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
+        factoryBean.setResources(new ClassPathResource("application.yml"));
+        Properties properties = factoryBean.getObject();
+        if ("pro".equals(properties.get("spring.profiles.active"))) {
+            String res = MsgWs.SendWaitWorkMsg(dto.getMobile(), dto.getMsg());
+            System.out.println("审批发送短信：" + res);
+            return rb.success().setData(res);
+        }
+      //  String res = MsgWs.SendWaitWorkMsg(dto.getMobile(), dto.getMsg());
+        return rb.success();
+    }
 }
\ No newline at end of file