mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码

This commit is contained in:
TinyAnts 2022-06-09 18:27:25 +08:00
parent e252235655
commit 648d9e1c1f
10 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java
View File

@ -43,7 +43,7 @@ public class SystemDeptController {
*/
@GetMapping("/list")
public Object list(@RequestParam Map<String, String> params) {
JSONArray list = iSystemDeptService.lists(params);
JSONArray list = iSystemDeptService.list(params);
return AjaxResult.success(list);
}

2
server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java
View File

@ -27,7 +27,7 @@ public interface ISystemDeptService {
* @param params 搜索参数
* @return JSONArray
*/
JSONArray lists(Map<String, String> params);
JSONArray list(Map<String, String> params);
/**
* 部门详情

6
server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java
View File

@ -73,7 +73,7 @@ public class AlbumServiceImpl implements IAlbumService {
IPage<Album> iPage = albumMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<AlbumVo> albumVoArrayList = new ArrayList<>();
List<AlbumVo> 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);
}
/**

2
server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java
View File

@ -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);
}
/**

2
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
View File

@ -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);
}
/**

2
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java
View File

@ -64,7 +64,7 @@ public class SystemDeptServiceImpl implements ISystemDeptService {
* @return JSONArray
*/
@Override
public JSONArray lists(Map<String, String> params) {
public JSONArray list(Map<String, String> params) {
QueryWrapper<SystemDept> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByAsc(Arrays.asList("sort", "id"));

2
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java
View File

@ -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);
}
/**

6
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java
View File

@ -85,17 +85,17 @@ public class SystemPostService implements ISystemPostService {
IPage<SystemPost> iPage = systemPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemPostVo> adminVoArrayList = new ArrayList<>();
List<SystemPostVo> 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);
}
/**

6
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java
View File

@ -59,7 +59,7 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
IPage<SystemRole> iPage = systemRoleMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemRoleVo> roleVoArrayList = new ArrayList<>();
List<SystemRoleVo> 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);
}
/**

11
server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
View File

@ -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<T> {
* @return PageList
*/
public static <T> PageResult<T> pageHelper(List<T> list) {
PageResult<T> pageResult = new PageResult<T>();
PageResult<T> pageResult = new PageResult<>();
PageInfo<T> pageInfo = new PageInfo<>(list);
pageResult.setCount(pageInfo.getTotal());
pageResult.setPageNo(pageInfo.getPageNum());
@ -41,7 +40,7 @@ public class PageResult<T> {
* @return PageList
*/
public static <T> PageResult<T> iPageHandle(IPage<T> iPage) {
PageResult<T> pageResult = new PageResult<T>();
PageResult<T> pageResult = new PageResult<>();
pageResult.setCount(iPage.getTotal());
pageResult.setPageNo((int) iPage.getCurrent());
pageResult.setPageSize((int) iPage.getSize());
@ -56,12 +55,12 @@ public class PageResult<T> {
* @param <T> 实体类型
* @return PageList
*/
public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> lists) {
PageResult<T> pageResult = new PageResult<T>();
public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> list) {
PageResult<T> pageResult = new PageResult<>();
pageResult.setCount(total);
pageResult.setPageNo(Math.toIntExact(pageNo));
pageResult.setPageSize(Math.toIntExact(size));
pageResult.setLists(lists);
pageResult.setLists(list);
return pageResult;
}