From 648d9e1c1f6bebffafe581d3b8f7a5606cbb6dd4 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 9 Jun 2022 18:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/system/SystemDeptController.java | 2 +- .../com/hxkj/admin/service/ISystemDeptService.java | 2 +- .../com/hxkj/admin/service/impl/AlbumServiceImpl.java | 6 +++--- .../hxkj/admin/service/impl/ArticleServiceImpl.java | 2 +- .../admin/service/impl/SystemAdminServiceImpl.java | 2 +- .../admin/service/impl/SystemDeptServiceImpl.java | 2 +- .../hxkj/admin/service/impl/SystemLogServerImpl.java | 2 +- .../hxkj/admin/service/impl/SystemPostService.java | 6 +++--- .../admin/service/impl/SystemRoleServiceImpl.java | 6 +++--- .../main/java/com/hxkj/common/core/PageResult.java | 11 +++++------ 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java index aceff116..85e9162a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java @@ -43,7 +43,7 @@ public class SystemDeptController { */ @GetMapping("/list") public Object list(@RequestParam Map params) { - JSONArray list = iSystemDeptService.lists(params); + JSONArray list = iSystemDeptService.list(params); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java index a391c671..f0291401 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java @@ -27,7 +27,7 @@ public interface ISystemDeptService { * @param params 搜索参数 * @return JSONArray */ - JSONArray lists(Map params); + JSONArray list(Map params); /** * 部门详情 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java index 7d1c9029..c3acf31f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java @@ -73,7 +73,7 @@ public class AlbumServiceImpl implements IAlbumService { IPage iPage = albumMapper.selectPage(new Page<>(page, limit), queryWrapper); - List albumVoArrayList = new ArrayList<>(); + List list = new ArrayList<>(); for (Album album : iPage.getRecords()) { AlbumVo vo = new AlbumVo(); BeanUtils.copyProperties(album, vo); @@ -82,10 +82,10 @@ public class AlbumServiceImpl implements IAlbumService { vo.setSize(ToolsUtil.storageUnit(album.getSize())); vo.setCreateTime(TimeUtil.timestampToDate(album.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(album.getUpdateTime())); - albumVoArrayList.add(vo); + list.add(vo); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), albumVoArrayList); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java index 9110a6c2..f95d9022 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java @@ -76,7 +76,7 @@ public class ArticleServiceImpl implements IArticleService { vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords()); + return PageResult.iPageHandle(iPage); } /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java index 3205e435..11071690 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java @@ -107,7 +107,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService { vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime())); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords()); + return PageResult.iPageHandle(iPage); } /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java index 41fe990d..f4c1ced7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java @@ -64,7 +64,7 @@ public class SystemDeptServiceImpl implements ISystemDeptService { * @return JSONArray */ @Override - public JSONArray lists(Map params) { + public JSONArray list(Map params) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_delete", 0); queryWrapper.orderByAsc(Arrays.asList("sort", "id")); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java index ca575306..e4fc3a3d 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java @@ -77,7 +77,7 @@ public class SystemLogServerImpl implements ISystemLogServer { vo.setError(StringUtil.isNull(vo.getError()) ? "" : vo.getError()); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords()); + return PageResult.iPageHandle(iPage); } /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java index 4a8494f9..b9770414 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java @@ -85,17 +85,17 @@ public class SystemPostService implements ISystemPostService { IPage iPage = systemPostMapper.selectPage(new Page<>(page, limit), queryWrapper); - List adminVoArrayList = new ArrayList<>(); + List list = new ArrayList<>(); for (SystemPost systemPost : iPage.getRecords()) { SystemPostVo vo = new SystemPostVo(); BeanUtils.copyProperties(systemPost, vo); vo.setCreateTime(TimeUtil.timestampToDate(systemPost.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(systemPost.getUpdateTime())); - adminVoArrayList.add(vo); + list.add(vo); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), adminVoArrayList); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java index 85d4c23d..08e981a3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java @@ -59,7 +59,7 @@ public class SystemRoleServiceImpl implements ISystemRoleService { IPage iPage = systemRoleMapper.selectPage(new Page<>(page, limit), queryWrapper); - List roleVoArrayList = new ArrayList<>(); + List list = new ArrayList<>(); for (SystemRole systemRole : iPage.getRecords()) { SystemRoleVo vo = new SystemRoleVo(); BeanUtils.copyProperties(systemRole, vo); @@ -72,10 +72,10 @@ public class SystemRoleServiceImpl implements ISystemRoleService { vo.setMember(member); vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime())); - roleVoArrayList.add(vo); + list.add(vo); } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), roleVoArrayList); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** diff --git a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java index 626eded8..5b08dbd7 100644 --- a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java +++ b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageInfo; import lombok.Data; -import java.util.HashMap; import java.util.List; @Data @@ -24,7 +23,7 @@ public class PageResult { * @return PageList */ public static PageResult pageHelper(List list) { - PageResult pageResult = new PageResult(); + PageResult pageResult = new PageResult<>(); PageInfo pageInfo = new PageInfo<>(list); pageResult.setCount(pageInfo.getTotal()); pageResult.setPageNo(pageInfo.getPageNum()); @@ -41,7 +40,7 @@ public class PageResult { * @return PageList */ public static PageResult iPageHandle(IPage iPage) { - PageResult pageResult = new PageResult(); + PageResult pageResult = new PageResult<>(); pageResult.setCount(iPage.getTotal()); pageResult.setPageNo((int) iPage.getCurrent()); pageResult.setPageSize((int) iPage.getSize()); @@ -56,12 +55,12 @@ public class PageResult { * @param 实体类型 * @return PageList */ - public static PageResult iPageHandle(Long total, Long pageNo, Long size, List lists) { - PageResult pageResult = new PageResult(); + public static PageResult iPageHandle(Long total, Long pageNo, Long size, List list) { + PageResult pageResult = new PageResult<>(); pageResult.setCount(total); pageResult.setPageNo(Math.toIntExact(pageNo)); pageResult.setPageSize(Math.toIntExact(size)); - pageResult.setLists(lists); + pageResult.setLists(list); return pageResult; }