gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 统一列表接口获取分页对象方式

Browse Source
This commit is contained in:
shizhendong
2024-10-23 11:15:56 +08:00
parent b2c5a5aad4
commit b4b3184bbd
9 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/geedge/asw/common/util/T.java
View File

@@ -310,27 +310,6 @@ public class T {
* @author xiaoleilu
*/
public static class PageUtil extends cn.hutool.core.util.PageUtil {
public static final Integer DEFAULT_PAGENO = 1;
public static final Integer DEFAULT_PAGESIZE = 20;
public static Page getPage(Map<String, Object> params) {
// 分页参数
Integer pageNo = T.MapUtil.getInt(params, "current", DEFAULT_PAGENO);
Integer pageSize = T.MapUtil.getInt(params, "size", DEFAULT_PAGESIZE);
if (pageSize == -1) {
pageNo = 0;
pageSize = Integer.MAX_VALUE;
}
Page page = Page.of(pageNo, pageSize);
String orderBy = T.MapUtil.getStr(params, "orderBy");
if (T.StrUtil.isNotEmpty(orderBy)) {
page.addOrder(T.PageUtil.decodeOrderByStr(orderBy));
}
return page;
}
public static OrderItem decodeOrderByStr(String orderBy) {
if (cn.hutool.core.util.StrUtil.isBlank(orderBy)) {
return null;

3
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
View File

@@ -8,6 +8,7 @@ import cn.hutool.log.Log;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.RCode;
import net.geedge.asw.common.util.T;
@@ -88,7 +89,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, Applicat
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(ApplicationEntity.class).getPage(params);
List<ApplicationEntity> packageList = this.getBaseMapper().queryList(page, params);
page.setRecords(packageList);
return page;

3
src/main/java/net/geedge/asw/module/app/service/impl/PackageServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.log.Log;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.Constants;
import net.geedge.asw.common.util.RCode;
@@ -60,7 +61,7 @@ public class PackageServiceImpl extends ServiceImpl<PackageDao, PackageEntity> i
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(PackageEntity.class).getPage(params);
List<PackageEntity> packageList = this.getBaseMapper().queryList(page, params);
page.setRecords(packageList);
return page;

6
src/main/java/net/geedge/asw/module/attribute/service/impl/AttributeServiceImpl.java
View File

@@ -3,8 +3,7 @@ package net.geedge.asw.module.attribute.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.util.T;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.module.attribute.dao.AttributeDao;
import net.geedge.asw.module.attribute.entity.AttributeEntity;
import net.geedge.asw.module.attribute.service.IAttributeService;
@@ -19,8 +18,7 @@ public class AttributeServiceImpl extends ServiceImpl<AttributeDao, AttributeEnt
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(AttributeEntity.class).getPage(params);
List<AttributeEntity> attributeList = this.getBaseMapper().queryList(params);
page.setRecords(attributeList);
return page;

3
src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java
View File

@@ -9,6 +9,7 @@ import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.RCode;
import net.geedge.asw.common.util.T;
import net.geedge.asw.module.attribute.entity.AttributeEntity;
import net.geedge.asw.module.environment.dao.EnvironmentDao;
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
@@ -88,7 +89,7 @@ public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, Environm
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(EnvironmentEntity.class).getPage(params);
List<EnvironmentEntity> packageList = this.getBaseMapper().queryList(page, params);
List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.queryListByUsed();

3
src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.log.Log;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.RCode;
import net.geedge.asw.common.util.T;
import net.geedge.asw.module.app.entity.PackageEntity;
@@ -68,7 +69,7 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(JobEntity.class).getPage(params);
List<JobEntity> jobList = this.getBaseMapper().queryList(page, params);
page.setRecords(jobList);
return page;

3
src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.config.SpringContextUtils;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.RCode;
@@ -115,7 +116,7 @@ public class PcapServiceImpl extends ServiceImpl<PcapDao, PcapEntity> implements
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(PcapEntity.class).getPage(params);
List<PcapEntity> pcapList = this.getBaseMapper().queryList(page, params);
page.setRecords(pcapList);
return page;

4
src/main/java/net/geedge/asw/module/sys/service/impl/SysUserServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.Constants;
import net.geedge.asw.common.util.RCode;
@@ -40,8 +41,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
@Override
public Page<SysUserEntity> queryList(Map params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(SysUserEntity.class).getPage(params);
List<SysUserEntity> jobList = this.getBaseMapper().queryList(page, params);
page.setRecords(jobList);
return page;

3
src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.log.Log;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.Constants;
import net.geedge.asw.common.util.RCode;
@@ -39,7 +40,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceDao, WorkspaceEnt
@Override
public Page queryList(Map<String, Object> params) {
Page page = T.PageUtil.getPage(params);
Page page = new Query(WorkspaceEntity.class).getPage(params);
List<WorkspaceEntity> workspaceEntityList = this.getBaseMapper().queryList(page, params);
page.setRecords(workspaceEntityList);
return page;