diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java index 0d60bf76..4c2bb0a8 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java @@ -32,7 +32,7 @@ import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMappi import top.charles7c.continew.starter.extension.crud.enums.Api; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; +import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; import top.charles7c.continew.starter.extension.crud.model.resp.R; import java.util.List; @@ -64,10 +64,9 @@ public abstract class BaseController, L, D, Q, @Operation(summary = "分页查询列表", description = "分页查询列表") @ResponseBody @GetMapping - public R> page(Q query, @Validated PageQuery pageQuery) { + public R> page(Q query, @Validated PageQuery pageQuery) { this.checkPermission(Api.LIST); - PageDataResp pageData = baseService.page(query, pageQuery); - return R.ok(pageData); + return R.ok(baseService.page(query, pageQuery)); } /** @@ -82,8 +81,7 @@ public abstract class BaseController, L, D, Q, @GetMapping("/tree") public R>> tree(Q query, SortQuery sortQuery) { this.checkPermission(Api.LIST); - List> list = baseService.tree(query, sortQuery, false); - return R.ok(list); + return R.ok(baseService.tree(query, sortQuery, false)); } /** @@ -98,8 +96,7 @@ public abstract class BaseController, L, D, Q, @GetMapping("/list") public R> list(Q query, SortQuery sortQuery) { this.checkPermission(Api.LIST); - List list = baseService.list(query, sortQuery); - return R.ok(list); + return R.ok(baseService.list(query, sortQuery)); } /** @@ -114,8 +111,7 @@ public abstract class BaseController, L, D, Q, @GetMapping("/{id}") public R get(@PathVariable Long id) { this.checkPermission(Api.LIST); - D detail = baseService.get(id); - return R.ok(detail); + return R.ok(baseService.get(id)); } /** @@ -129,8 +125,7 @@ public abstract class BaseController, L, D, Q, @PostMapping public R add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody C req) { this.checkPermission(Api.ADD); - Long id = baseService.add(req); - return R.ok("新增成功", id); + return R.ok("新增成功", baseService.add(req)); } /** diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseService.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseService.java index cf17de47..9319abdd 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseService.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseService.java @@ -20,7 +20,7 @@ import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; +import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; @@ -43,7 +43,7 @@ public interface BaseService { * @param pageQuery 分页查询条件 * @return 分页列表信息 */ - PageDataResp page(Q query, PageQuery pageQuery); + PageResp page(Q query, PageQuery pageQuery); /** * 查询树列表 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java index 5bf7c15c..b9c46d0b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java @@ -41,7 +41,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper; import top.charles7c.continew.starter.extension.crud.annotation.TreeField; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; +import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; import top.charles7c.continew.starter.extension.crud.util.TreeUtils; import top.charles7c.continew.starter.file.excel.util.ExcelUtils; @@ -78,12 +78,12 @@ public abstract class BaseServiceImpl, T extends BaseDO, } @Override - public PageDataResp page(Q query, PageQuery pageQuery) { + public PageResp page(Q query, PageQuery pageQuery) { QueryWrapper queryWrapper = QueryHelper.build(query); IPage page = baseMapper.selectPage(pageQuery.toPage(), queryWrapper); - PageDataResp pageDataResp = PageDataResp.build(page, listClass); - pageDataResp.getList().forEach(this::fill); - return pageDataResp; + PageResp pageResp = PageResp.build(page, listClass); + pageResp.getList().forEach(this::fill); + return pageResp; } @Override diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageDataResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java similarity index 69% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageDataResp.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java index 88cf2f10..7e30fdd8 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageDataResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java @@ -36,7 +36,7 @@ import java.util.List; */ @Data @Schema(description = "分页信息") -public class PageDataResp implements Serializable { +public class PageResp implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -62,14 +62,14 @@ public class PageDataResp implements Serializable { * @param 目标列表数据类型 * @return 分页信息 */ - public static PageDataResp build(IPage page, Class targetClass) { + public static PageResp build(IPage page, Class targetClass) { if (null == page) { return empty(); } - PageDataResp pageDataResp = new PageDataResp<>(); - pageDataResp.setList(BeanUtil.copyToList(page.getRecords(), targetClass)); - pageDataResp.setTotal(page.getTotal()); - return pageDataResp; + PageResp pageResp = new PageResp<>(); + pageResp.setList(BeanUtil.copyToList(page.getRecords(), targetClass)); + pageResp.setTotal(page.getTotal()); + return pageResp; } /** @@ -79,14 +79,14 @@ public class PageDataResp implements Serializable { * @param 列表数据类型 * @return 分页信息 */ - public static PageDataResp build(IPage page) { + public static PageResp build(IPage page) { if (null == page) { return empty(); } - PageDataResp pageDataResp = new PageDataResp<>(); - pageDataResp.setList(page.getRecords()); - pageDataResp.setTotal(page.getTotal()); - return pageDataResp; + PageResp pageResp = new PageResp<>(); + pageResp.setList(page.getRecords()); + pageResp.setTotal(page.getTotal()); + return pageResp; } /** @@ -98,23 +98,23 @@ public class PageDataResp implements Serializable { * @param 列表数据类型 * @return 分页信息 */ - public static PageDataResp build(int page, int size, List list) { + public static PageResp build(int page, int size, List list) { if (CollUtil.isEmpty(list)) { return empty(); } - PageDataResp pageDataResp = new PageDataResp<>(); - pageDataResp.setTotal(list.size()); + PageResp pageResp = new PageResp<>(); + pageResp.setTotal(list.size()); // 对列表数据进行分页 int fromIndex = (page - 1) * size; int toIndex = page * size + size; if (fromIndex > list.size()) { - pageDataResp.setList(new ArrayList<>(0)); + pageResp.setList(new ArrayList<>(0)); } else if (toIndex >= list.size()) { - pageDataResp.setList(list.subList(fromIndex, list.size())); + pageResp.setList(list.subList(fromIndex, list.size())); } else { - pageDataResp.setList(list.subList(fromIndex, toIndex)); + pageResp.setList(list.subList(fromIndex, toIndex)); } - return pageDataResp; + return pageResp; } /** @@ -123,9 +123,9 @@ public class PageDataResp implements Serializable { * @param 列表数据类型 * @return 分页信息 */ - private static PageDataResp empty() { - PageDataResp pageDataResp = new PageDataResp<>(); - pageDataResp.setList(new ArrayList<>(0)); - return pageDataResp; + private static PageResp empty() { + PageResp pageResp = new PageResp<>(); + pageResp.setList(new ArrayList<>(0)); + return pageResp; } }