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 9805b8ad00943ecac76e73a2975430dddceddece..b0502fad0e0ec980c41da0e813a74e4fc0e83ca4 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 bc8f530de3cad213151cd1974bd591dae27e8c4f..680677246499f1176478b079471a5c19b2c4d557 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 4d99978a8ea87a84d656a4f94b1f8eff7c900ba3..e657750f349dc7a8a3c8cf121a472ea65a09ce42 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 66ef9dbbde777ebd195a398c68844e185ec4d5d5..b4d16c1dbe3bf9e878f761eeeda83733d405c840 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 b27ee7ed5c5326c56f44e5d9b39fd2c619959252..43613f2910cca236b03c855843c341923422c563 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. */