From 208e21020ae701dbf660ecb59045344be0f27ea6 Mon Sep 17 00:00:00 2001
From: little-cat-sweet <2116400472@qq.com>
Date: Wed, 4 Aug 2021 11:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90sms=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XhpcAgreementController.java    |  4 ----
 .../general/controller/XhpcSmsController.java  |  6 ++++++
 .../com/xhpc/general/mapper/XhpcSmsMapper.java |  6 ++++++
 .../xhpc/general/service/IXhpcSmsService.java  |  2 ++
 .../general/service/XhpcSmsServiceImpl.java    | 15 ++++++++++++---
 .../main/resources/mapper/XhpcSmsMapper.xml    | 18 ++++++++++++++++++
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java
index b0ad5137..a2756b26 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java
@@ -8,9 +8,6 @@ import com.xhpc.general.service.IXhpcAgreementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 协议管理controller
  * program: ruoyi
@@ -60,5 +57,4 @@ public class XhpcAgreementController extends BaseController {
         return AjaxResult.success(iXhpcAgreementService.selectContent(type));
     }
 
-
 }
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 c311c022..513f4485 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
@@ -29,4 +29,10 @@ public class XhpcSmsController extends BaseController {
         return xhpcSmsService.getLogonPhoneCode(phone);
     }
 
+    @GetMapping(value = "/list")
+    public AjaxResult list(Integer status,String phone){
+
+        return xhpcSmsService.getList(status, phone);
+    }
+
 }
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 d84bb77d..41ef75aa 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
@@ -1,6 +1,10 @@
 package com.xhpc.general.mapper;
 
 import com.xhpc.general.domain.XhpcSms;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author yuyang
@@ -9,4 +13,6 @@ import com.xhpc.general.domain.XhpcSms;
 public interface XhpcSmsMapper {
 
     int addXhpcSms(XhpcSms xhpcSms);
+
+    List<Map<String,Object>> getList(@Param("status") int status,@Param("phone")String phone);
 }
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
index a17ac312..37a34266 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
@@ -15,4 +15,6 @@ public interface IXhpcSmsService {
      * @return
      */
     AjaxResult getLogonPhoneCode(String phone);
+
+    AjaxResult getList(Integer status,String phone);
 }
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 55a3b264..242518ff 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
@@ -10,9 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -128,4 +126,15 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService{
       }
 
    }
+
+   @Override
+   public AjaxResult getList(Integer status, String phone) {
+//      List<Map<String,Object>> map=xhpcSmsMapper.getList(status,phone);
+//      System.out.println();
+//      System.out.println();
+//      System.out.println(map.toString());
+//      System.out.println();
+//      System.out.println();
+      return AjaxResult.success(xhpcSmsMapper.getList(status,phone));
+   }
 }
diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
index 08d1a8fd..bbcd73fd 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
+++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
@@ -8,6 +8,7 @@
         <result property="smsId" column="sms_id"/>
         <result property="phone" column="phone"/>
         <result property="code" column="code"/>
+
         <result property="templateId" column="template_id"/>
         <result property="accessKey" column="access_key"/>
         <result property="secretKey" column="secret_key"/>
@@ -92,4 +93,21 @@
             </if>
         </trim>
     </insert>
+
+
+    <select id="getList" resultType="map">
+        select
+            phone,
+            content,
+            status,
+            create_time
+        from xhpc_sms
+        where del_flag=0
+        <if test="null!=status">
+            and status=#{status}
+        </if>
+        <if test="null!=phone and ''!=phone">
+            and phone like concat('%',#{phone},'%')
+        </if>
+    </select>
 </mapper>