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 7102c875..767e3aa4 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 @@ -36,7 +36,7 @@ public class XhpcSmsController extends BaseController { @GetMapping(value = "/getList") public TableDataInfo getList(Integer status, String phone){ startPage(); - List> list = xhpcSmsService.getList(); + List> list = xhpcSmsService.getList(status, phone); return getDataTable(list); } 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 aa21ea19..2fe05bde 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 @@ -15,5 +15,5 @@ public interface XhpcSmsMapper { int addXhpcSms(XhpcSms xhpcSms); - List> getList(); + List> getList(@Param("status") Integer 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 1d271be7..dba33d87 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 @@ -19,5 +19,5 @@ public interface IXhpcSmsService { */ AjaxResult getLogonPhoneCode(String phone); - List> getList(); + List> 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 71e1e07d..6fbf24cd 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 @@ -94,12 +94,12 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService{ } @Override - public List> getList() { - return xhpcSmsMapper.getList(); + public List> getList(Integer status, String phone) { + + return xhpcSmsMapper.getList(status,phone); } - - private static HashMap assembleSmsReq(String phone,String content) { + private static HashMap assembleSmsReq(String phone, String content) { HashMap params = new HashMap<>(); params.put("account", ACCOUNT); params.put("password", PASSWD); 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 d284a1b7..c703459c 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml @@ -95,8 +95,17 @@