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 513f4485..7102c875 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 @@ -2,6 +2,7 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.general.service.IXhpcSmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -9,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + /** * @author yuyang * @date 2021/8/1 23:42 @@ -29,10 +33,11 @@ public class XhpcSmsController extends BaseController { return xhpcSmsService.getLogonPhoneCode(phone); } - @GetMapping(value = "/list") - public AjaxResult list(Integer status,String phone){ - - return xhpcSmsService.getList(status, phone); + @GetMapping(value = "/getList") + public TableDataInfo getList(Integer status, String phone){ + startPage(); + List> list = xhpcSmsService.getList(); + 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 41ef75aa..aa21ea19 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 @@ -14,5 +14,6 @@ public interface XhpcSmsMapper { int addXhpcSms(XhpcSms xhpcSms); - List> getList(@Param("status") int status,@Param("phone")String phone); + + List> getList(); } 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 37a34266..1d271be7 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 @@ -2,6 +2,9 @@ package com.xhpc.general.service; import com.xhpc.common.core.web.domain.AjaxResult; +import java.util.List; +import java.util.Map; + /** * @author yuyang * @date 2021/7/30 18:45 @@ -16,5 +19,5 @@ public interface IXhpcSmsService { */ AjaxResult getLogonPhoneCode(String phone); - AjaxResult getList(Integer status,String phone); + List> getList(); } 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 242518ff..71e1e07d 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 @@ -93,6 +93,12 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService{ } + @Override + public List> getList() { + return xhpcSmsMapper.getList(); + } + + private static HashMap assembleSmsReq(String phone,String content) { HashMap params = new HashMap<>(); params.put("account", ACCOUNT); @@ -127,14 +133,5 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService{ } - @Override - public AjaxResult getList(Integer status, String phone) { -// List> 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 bbcd73fd..d284a1b7 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml @@ -8,7 +8,6 @@ - @@ -94,20 +93,10 @@ -