From b4b3184bbd53ef06352d119e84e4a2f0d7f51ffb Mon Sep 17 00:00:00 2001 From: shizhendong Date: Wed, 23 Oct 2024 11:15:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E5=88=86=E9=A1=B5=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/geedge/asw/common/util/T.java | 21 ------------------- .../service/impl/ApplicationServiceImpl.java | 3 ++- .../app/service/impl/PackageServiceImpl.java | 3 ++- .../service/impl/AttributeServiceImpl.java | 6 ++---- .../service/impl/EnvironmentServiceImpl.java | 3 ++- .../runner/service/impl/JobServiceImpl.java | 3 ++- .../runner/service/impl/PcapServiceImpl.java | 3 ++- .../sys/service/impl/SysUserServiceImpl.java | 4 ++-- .../service/impl/WorkspaceServiceImpl.java | 3 ++- 9 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/main/java/net/geedge/asw/common/util/T.java b/src/main/java/net/geedge/asw/common/util/T.java index 32cdd26..ecdd246 100644 --- a/src/main/java/net/geedge/asw/common/util/T.java +++ b/src/main/java/net/geedge/asw/common/util/T.java @@ -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 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; diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java index 8dd0385..ac55cda 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java @@ -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 params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(ApplicationEntity.class).getPage(params); List packageList = this.getBaseMapper().queryList(page, params); page.setRecords(packageList); return page; diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/PackageServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/PackageServiceImpl.java index 9f862fa..00aa8ac 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/PackageServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/PackageServiceImpl.java @@ -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 i @Override public Page queryList(Map params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(PackageEntity.class).getPage(params); List packageList = this.getBaseMapper().queryList(page, params); page.setRecords(packageList); return page; diff --git a/src/main/java/net/geedge/asw/module/attribute/service/impl/AttributeServiceImpl.java b/src/main/java/net/geedge/asw/module/attribute/service/impl/AttributeServiceImpl.java index 6dd5cad..359b8f4 100644 --- a/src/main/java/net/geedge/asw/module/attribute/service/impl/AttributeServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/attribute/service/impl/AttributeServiceImpl.java @@ -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 params) { - - Page page = T.PageUtil.getPage(params); + Page page = new Query(AttributeEntity.class).getPage(params); List attributeList = this.getBaseMapper().queryList(params); page.setRecords(attributeList); return page; diff --git a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java index ed6f45a..0fd80ca 100644 --- a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java @@ -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 params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(EnvironmentEntity.class).getPage(params); List packageList = this.getBaseMapper().queryList(page, params); List sessionEntityList = environmentSessionService.queryListByUsed(); diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java index 7e4baf2..5fa4425 100644 --- a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java @@ -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 implements IJ @Override public Page queryList(Map params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(JobEntity.class).getPage(params); List jobList = this.getBaseMapper().queryList(page, params); page.setRecords(jobList); return page; diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java index 5484252..154913b 100644 --- a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java @@ -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 implements @Override public Page queryList(Map params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(PcapEntity.class).getPage(params); List pcapList = this.getBaseMapper().queryList(page, params); page.setRecords(pcapList); return page; diff --git a/src/main/java/net/geedge/asw/module/sys/service/impl/SysUserServiceImpl.java b/src/main/java/net/geedge/asw/module/sys/service/impl/SysUserServiceImpl.java index 72f9906..afb0879 100644 --- a/src/main/java/net/geedge/asw/module/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/sys/service/impl/SysUserServiceImpl.java @@ -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 i @Override public Page queryList(Map params) { - - Page page = T.PageUtil.getPage(params); + Page page = new Query(SysUserEntity.class).getPage(params); List jobList = this.getBaseMapper().queryList(page, params); page.setRecords(jobList); return page; diff --git a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java index bd643dd..3625f3b 100644 --- a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java @@ -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 params) { - Page page = T.PageUtil.getPage(params); + Page page = new Query(WorkspaceEntity.class).getPage(params); List workspaceEntityList = this.getBaseMapper().queryList(page, params); page.setRecords(workspaceEntityList); return page;