From ee0947452d02e0165e7e4fccf889b9bad7d65db8 Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 7 Mar 2024 13:32:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5total=E6=95=B0=E6=8D=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servicepackage/ServicePackageController.java | 16 ++++++++++++++-- .../textmessage/TextMessageController.java | 16 ++++++++++++++-- .../wechattemplate/WechatTemplateController.java | 16 ++++++++++++++-- .../textmessage/impl/TextMessageServiceImpl.java | 2 ++ .../impl/WechatTemplateServiceImpl.java | 1 + .../wechattemplate/WechatTemplateMapper.xml | 2 +- 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java index a61d84f4..94dae338 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java @@ -1,9 +1,12 @@ package com.xinelu.manage.controller.servicepackage; import com.xinelu.common.annotation.Log; +import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.PageDomain; import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.core.page.TableSupport; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.servicepackage.ServicePackage; @@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.stream.Collectors; /** * 服务包基础信息Controller @@ -39,9 +43,17 @@ public class ServicePackageController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')") @GetMapping("/list") public TableDataInfo list(ServicePackage servicePackage) { - startPage(); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); List list = servicePackageService.selectServicePackageList(servicePackage); - return getDataTable(list); + int num = list.size(); + list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setRows(list); + rspData.setTotal(num); + return rspData; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java index f0ad8812..11acef7c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java @@ -1,9 +1,12 @@ package com.xinelu.manage.controller.textmessage; import com.xinelu.common.annotation.Log; +import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.PageDomain; import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.core.page.TableSupport; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.dto.textmessage.TextMessageDTO; @@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.stream.Collectors; /** * 短信模板信息Controller @@ -40,9 +44,17 @@ public class TextMessageController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:message:list')") @GetMapping("/list") public TableDataInfo list(TextMessageDTO textMessageDTO) { - startPage(); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); List list = textMessageService.selectTextMessageList(textMessageDTO); - return getDataTable(list); + int num = list.size(); + list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setRows(list); + rspData.setTotal(num); + return rspData; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java index f7b7819f..362a3ab1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java @@ -1,9 +1,12 @@ package com.xinelu.manage.controller.wechattemplate; import com.xinelu.common.annotation.Log; +import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.PageDomain; import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.core.page.TableSupport; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO; @@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.stream.Collectors; /** * 微信模板信息Controller @@ -39,9 +43,17 @@ public class WechatTemplateController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:template:list')") @GetMapping("/list") public TableDataInfo list(WechatTemplateDTO wechatTemplateDto) { - startPage(); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); List list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto); - return getDataTable(list); + int num = list.size(); + list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setRows(list); + rspData.setTotal(num); + return rspData; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java index 6f777863..3b1a45ef 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java @@ -3,6 +3,7 @@ package com.xinelu.manage.service.textmessage.impl; import com.xinelu.common.core.domain.entity.SysDictData; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.textmessage.TextMessage; @@ -37,6 +38,7 @@ public class TextMessageServiceImpl implements ITextMessageService { @Resource private SysDictDataMapper sysDictDataMapper; + /** * 查询短信模板信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java index 9d6216ea..c84f5774 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java @@ -3,6 +3,7 @@ package com.xinelu.manage.service.wechattemplate.impl; import com.xinelu.common.core.domain.entity.SysDictData; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.wechattemplate.WechatTemplate; diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml index 1e1dfc7d..99327284 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml @@ -26,7 +26,7 @@ - +