From df652deb2560a566db7ecce602c903f19d6d0b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 14 Mar 2023 16:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20bug=E3=80=91page=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=89=A9=E5=B1=95?= =?UTF-8?q?service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/${entityName}Controller.javai | 7 +-- .../service/I${entityName}Service.javai | 30 +++++++++---- .../impl/${entityName}ServiceImpl.javai | 45 ++++++++++++++----- 3 files changed, 55 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index e86b0b45..b7ac9af9 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -5,12 +5,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -58,9 +55,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<>(pageNo, pageSize); - IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); + IPage<${entityName}> pageList = ${entityName?uncap_first}Service.queryPage(${entityName?uncap_first}, pageNo, pageSize, req); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 8ce85431..1e428f00 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -3,6 +3,7 @@ package ${bussiPackage}.${entityPackage}.service; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** @@ -13,6 +14,26 @@ import java.util.List; */ public interface I${entityName}Service extends IService<${entityName}> { + /** + * 列表查询 + * + * @param ${entityName?uncap_first} + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage<${entityName}> queryPage(${entityName} ${entityName?uncap_first}, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param ${entityName?uncap_first} + * @param req + * @return + */ + List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req); + /** * 保存 * @@ -52,13 +73,4 @@ public interface I${entityName}Service extends IService<${entityName}> { * @return */ ${entityName} queryById(String id); - - /** - * 列表查询 - * - * @param ${entityName?uncap_first} - * @param req - * @return - */ - List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 55bd2fc1..b1e31eb3 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -1,5 +1,6 @@ package ${bussiPackage}.${entityPackage}.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; @@ -11,6 +12,8 @@ import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** @@ -23,6 +26,36 @@ import javax.servlet.http.HttpServletRequest; @Transactional(rollbackFor = JeroBootException.class) public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service { + + /** + * 分页查询 + * + * @param ${entityName?uncap_first} + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage<${entityName}> queryPage(${entityName} ${entityName?uncap_first}, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + Page<${entityName}> page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param ${entityName?uncap_first} + * @param req + * @return + */ + @Override + public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap())); + } + /** * 保存 * @@ -82,16 +115,4 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ public ${entityName} queryById(String id) { return getById(id); } - - /** - * 列表查询 - * - * @param ${entityName?uncap_first} - * @param req - * @return - */ - @Override - public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap())); - } }