From 068d9d8bcb34311a2faced2926abde1b34434eec Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Tue, 30 Nov 2021 14:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=98=BF=E9=87=8C=E4=BA=91?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=9C=8D=E5=8A=A1=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/general/controller/XhpcSmsController.java    |  5 +----
 .../java/com/xhpc/general/mapper/XhpcSmsMapper.java   |  2 +-
 .../com/xhpc/general/service/XhpcSmsServiceImpl.java  | 11 +++++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
index 948e30fe..5b902214 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
@@ -75,12 +75,9 @@ public class XhpcSmsController extends BaseController {
         xhpcSmsService.sendNotice(phone, signatureName, templateId, paramMap);
     }
 
-
     @GetMapping(value = "/getAliyunShortMessageInfo")
     public AjaxResult getAliyunShortMessageInfo() {
-
         Object messageInfo = xhpcSmsService.getAliyunShortMessageInfo();
-        return AjaxResult.success();
+        return AjaxResult.success(messageInfo);
     }
-
 }
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
index 3cfc434b..f427cb9a 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
@@ -37,7 +37,7 @@ public interface XhpcSmsMapper {
     Long querySumOfSuccessMessage();
 
     /**
-     * 查询发送的短信的总记录数
+     * 查询所有发送的短信的总记录数（包括异常，失败）
      *
      * @return 返回发送过的短信的总记录数
      * @author WH
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
index 3466f71c..3747f628 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
@@ -166,8 +166,15 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService {
 
    @Override
    public Object getAliyunShortMessageInfo() {
-      //todo
-      return null;
+
+      Long successMessage = xhpcSmsMapper.querySumOfSuccessMessage();
+      Long failMessage = xhpcSmsMapper.querySumOfFailMessage();
+      Long sumOfMessage = successMessage + failMessage;
+      Map<String, Long> messageInfoMap = new HashMap<>();
+      messageInfoMap.put("successMessage", successMessage);
+      messageInfoMap.put("failMessage", failMessage);
+      messageInfoMap.put("sumOfMessage", sumOfMessage);
+      return messageInfoMap;
    }
 
    public static void main(String[] args) {