From a6970e4a8917ecc32292073f468bc28a7e3a71a7 Mon Sep 17 00:00:00 2001 From: LionCity <18026623439@163.com> Date: Mon, 31 Aug 2020 11:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=8C=E6=98=AFdoc=E6=96=87=E6=A1=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=87=E6=A1=A3=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/generator/admin/ControllerP.ftl | 4 +- .../template/generator/admin/ServiceImplP.ftl | 9 ++--- .../template/generator/admin/ServiceP.ftl | 6 +-- .../java/co/yixiang/domain/PageResult.java | 37 +++++++++++++++++++ .../yixiang/dozer/service/EJBGenerator.java | 7 ++++ .../co/yixiang/dozer/service/IGenerator.java | 8 ++++ 6 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 yshop-common/src/main/java/co/yixiang/domain/PageResult.java diff --git a/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl b/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl index ef11f71b..1856191a 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl +++ b/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; import java.io.IOException; import javax.servlet.http.HttpServletResponse; - +import co.yixiang.domain.PageResult; /** * @author ${author} * @date ${date} @@ -51,7 +51,7 @@ public class ${className}Controller { @Log("查询${apiAlias}") @ApiOperation("查询${apiAlias}") @PreAuthorize("@el.check('admin','${changeClassName}:list')") - public ResponseEntity get${className}s(${className}QueryCriteria criteria, Pageable pageable){ + public ResponseEntity> get${className}s(${className}QueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK); } diff --git a/yshop-admin/src/main/resources/template/generator/admin/ServiceImplP.ftl b/yshop-admin/src/main/resources/template/generator/admin/ServiceImplP.ftl index 82eb800a..0d21e77f 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/ServiceImplP.ftl +++ b/yshop-admin/src/main/resources/template/generator/admin/ServiceImplP.ftl @@ -52,7 +52,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.LinkedHashMap; - +import co.yixiang.base.PageResult; /** * @author ${author} * @date ${date} @@ -67,13 +67,10 @@ public class ${className}ServiceImpl extends BaseServiceImpl<${className}Mapper, @Override //@Cacheable - public Map queryAll(${className}QueryCriteria criteria, Pageable pageable) { + public PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable) { getPage(pageable); PageInfo<${className}> page = new PageInfo<>(queryAll(criteria)); - Map map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), ${className}Dto.class)); - map.put("totalElements", page.getTotal()); - return map; + return generator.convertPageInfo(page,${className}VO.class); } diff --git a/yshop-admin/src/main/resources/template/generator/admin/ServiceP.ftl b/yshop-admin/src/main/resources/template/generator/admin/ServiceP.ftl index 24c5c81c..20fb4a54 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/ServiceP.ftl +++ b/yshop-admin/src/main/resources/template/generator/admin/ServiceP.ftl @@ -16,20 +16,20 @@ import java.util.Map; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; - +import co.yixiang.base.PageResult; /** * @author ${author} * @date ${date} */ public interface ${className}Service extends BaseService<${className}>{ -/** + /** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 * @return Map */ - Map queryAll(${className}QueryCriteria criteria, Pageable pageable); + PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 diff --git a/yshop-common/src/main/java/co/yixiang/domain/PageResult.java b/yshop-common/src/main/java/co/yixiang/domain/PageResult.java new file mode 100644 index 00000000..4e36c7ac --- /dev/null +++ b/yshop-common/src/main/java/co/yixiang/domain/PageResult.java @@ -0,0 +1,37 @@ +package co.yixiang.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * @author ：LionCity + * @date ：Created in 2020-08-04 16:55 + * @description：分页参数返回 + * @modified By： + * @version: V1.0 + */ +@Data +@Accessors(chain = true) +@Builder +public class PageResult implements Serializable { + + + @ApiModelProperty("总数量") + private long totalElements; + + @ApiModelProperty("内容") + private List content; + + public PageResult(long totalElements, List content) { + this.totalElements = totalElements; + this.content = content; + } + + public PageResult() { + } +} diff --git a/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java b/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java index 65b81a65..d313c9cf 100644 --- a/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java +++ b/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java @@ -6,6 +6,8 @@ package co.yixiang.dozer.service; import co.yixiang.common.web.vo.Paging; +import co.yixiang.domain.PageResult; +import com.github.pagehelper.PageInfo; import org.dozer.Mapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -65,4 +67,9 @@ public class EJBGenerator implements IGenerator { } return arr; } + + @Override + public PageResult convertPageInfo(PageInfo s, Class clz) { + return new PageResult(s.getTotal(), convert(s.getList(), clz)); + } } diff --git a/yshop-common/src/main/java/co/yixiang/dozer/service/IGenerator.java b/yshop-common/src/main/java/co/yixiang/dozer/service/IGenerator.java index 90984955..b78b880c 100644 --- a/yshop-common/src/main/java/co/yixiang/dozer/service/IGenerator.java +++ b/yshop-common/src/main/java/co/yixiang/dozer/service/IGenerator.java @@ -6,6 +6,8 @@ package co.yixiang.dozer.service; import co.yixiang.common.web.vo.Paging; +import co.yixiang.domain.PageResult; +import com.github.pagehelper.PageInfo; import java.util.List; import java.util.Set; @@ -80,4 +82,10 @@ public interface IGenerator { * @Time 2018年5月9日 下午3:54:57 */ T[] convert(S[] s, Class clz); + + /** + * 分页信息转换 + * @return {@link PageResult} + */ + PageResult convertPageInfo(PageInfo s, Class clz); }