From 4b4d06232b7e82d1f1f906a004ea5ff0b8dd8976 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 13 Jan 2020 13:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6-=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SmsTemplateController.java | 5 ++-- .../elink/esua/epdc/dao/SmsTemplateDao.java | 10 +++++++ .../esua/epdc/service/SmsTemplateService.java | 7 +++++ .../service/impl/SmsTemplateServiceImpl.java | 13 +++++++++- .../main/resources/mapper/SmsTemplateDao.xml | 26 +++++++++++++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java index 018a06e70..8a8653496 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java @@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.SmsTemplateDTO; import com.elink.esua.epdc.excel.SmsTemplateExcel; import com.elink.esua.epdc.service.SmsTemplateService; @@ -51,7 +51,8 @@ public class SmsTemplateController { @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = smsTemplateService.page(params); + //PageData page = smsTemplateService.page(params); + PageData page = smsTemplateService.getSmsTemplatePage(params); return new Result>().ok(page); } diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java index a0efe0522..febe5d37a 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java @@ -22,6 +22,9 @@ import com.elink.esua.epdc.dto.SmsTemplateDTO; import com.elink.esua.epdc.entity.SmsTemplateEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * * @@ -41,5 +44,12 @@ public interface SmsTemplateDao extends BaseDao { * @since 2020/1/7 16:52 */ SmsTemplateDTO selectOneSmsTemplateInfoByType(String smsTemplateType); + + /** + * 条件查询 + * @param params + * @return + */ + List getPage(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java index 8f92366d8..969140985 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java @@ -45,6 +45,13 @@ public interface SmsTemplateService extends BaseService { */ PageData page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getSmsTemplatePage(Map params); + /** * 默认查询 * diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java index 0a8c94df2..29c2fca2f 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java @@ -32,7 +32,6 @@ import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.entity.SmsLogEntity; import com.elink.esua.epdc.entity.SmsTemplateEntity; import com.elink.esua.epdc.exception.ModuleErrorCode; -import com.elink.esua.epdc.redis.SmsTemplateRedis; import com.elink.esua.epdc.service.SmsLogService; import com.elink.esua.epdc.service.SmsTemplateService; import com.elink.esua.epdc.sms.AbstractSmsService; @@ -68,6 +67,18 @@ public class SmsTemplateServiceImpl extends BaseServiceImpl getSmsTemplatePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml index 62ab1dbf4..e385d436e 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml @@ -7,5 +7,31 @@ SELECT * FROM epdc_sms_template WHERE DEL_FLAG = '0' AND ENABLE_FLAG = '1' AND TEMPLATE_TYPE = #{smsTemplateType} + + \ No newline at end of file