From 6141e4de7719ef4d8b6d6ae8b93646a1c2e0cc1b Mon Sep 17 00:00:00 2001 From: zwjsec Date: Thu, 18 Jul 2024 14:21:46 +0800 Subject: [PATCH] bug fixed --- .../gatewayimpl/ApplicationPackageGatewayImpl.java | 2 +- .../epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java | 3 ++- .../infrastructure/fieldpkg/FieldPkgGatewayImpl.java | 8 +++++--- .../oepkg/gatewalmpl/OEPackageGatewayImpl.java | 6 ++++-- .../rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java index 9805b8a..b0502fa 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java @@ -74,7 +74,7 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway wrapper.select(columns); IPage resPage = appPkgMapper.selectPage(page, wrapper); - long total = resPage.getTotal(); + long total = resPage.getTotal() / condition.getPageSize(); List appDOs = resPage.getRecords(); List menus = ApplicationPackageConverter.toMenu(appDOs); diff --git a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java index bc8f530..6806772 100644 --- a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java @@ -93,7 +93,7 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { IPage resPage = ePKGPkgMapper.selectPage(page, wrapper); List rpmDOs = resPage.getRecords(); List rPMMenus = EPKGPackageConverter.toMenu(rpmDOs); - long total = resPage.getTotal(); + long total = resPage.getTotal() / condition.getPageSize(); Map res = Map.ofEntries( Map.entry("total", total), @@ -233,6 +233,7 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { /** * query pkg num of arch by os. + * * @param os os. * @return pkg nums of arch. */ diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java index 4d99978..e657750 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java @@ -63,12 +63,13 @@ public class FieldPkgGatewayImpl implements FieldPkgGateway { IPage resPage = mapper.selectPage(page, wrapper); List list = resPage.getRecords(); List voList = FieldPkgConverter.toVo(list); + long total = voList.size(); if (condition.getOs() == null && condition.getArch() == null && condition.getCategory() == null) { voList = aggregateList(voList, condition, wrapper); + total = voList.size(); } - long total = voList.size(); return Map.ofEntries( Map.entry("total", total), Map.entry("list", voList)); @@ -76,9 +77,10 @@ public class FieldPkgGatewayImpl implements FieldPkgGateway { /** * aggreate the list. - * @param voList list. + * + * @param voList list. * @param condition condition. - * @param wrapper wrapper. + * @param wrapper wrapper. * @return list. */ public List aggregateList(List voList, FieldPkgSearchCondition condition, diff --git a/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java index 66ef9db..b4d16c1 100644 --- a/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java @@ -95,7 +95,7 @@ public class OEPackageGatewayImpl implements OEPackageGateway { List oepkgDOs = resPage.getRecords(); List oeMenus = OEPackageConverter.toMenu(oepkgDOs); - long total = resPage.getTotal(); + long total = resPage.getTotal() / condition.getPageSize(); Map res = Map.ofEntries( Map.entry("total", total), @@ -194,7 +194,8 @@ public class OEPackageGatewayImpl implements OEPackageGateway { /** * Query the Euler Version based on the provided search condition. * - * @param condition The search condition for querying a part of the RPM Euler Version + * @param condition The search condition for querying a part of the RPM Euler + * Version * @return A map containing relevant information */ @Override @@ -218,6 +219,7 @@ public class OEPackageGatewayImpl implements OEPackageGateway { /** * query pkg num of arch by os. + * * @param os os. * @return pkg nums of arch. */ diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java index b27ee7e..43613f2 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java @@ -97,7 +97,7 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { IPage resPage = rPMPkgMapper.selectPage(page, wrapper); List rpmDOs = resPage.getRecords(); List rPMMenus = RPMPackageConverter.toMenu(rpmDOs); - long total = resPage.getTotal(); + long total = resPage.getTotal() / condition.getPageSize(); Map res = Map.ofEntries( Map.entry("total", total), @@ -289,6 +289,7 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { /** * query pkg num of arch by os. + * * @param os os. * @return pkg nums of arch. */ -- Gitee