diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java index 0f264de352f305a8951c9f3c0b5f868e71a1f429..df8c32c599e575e9d78cc8685dd21d6140c529ba 100644 --- a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java @@ -24,6 +24,7 @@ import com.easysoftware.application.rpmpackage.RPMPackageService; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.common.exception.enumvalid.AppCategoryEnum; import com.easysoftware.common.utils.ResultUtil; +import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; import com.easysoftware.domain.epkgpackage.EPKGPackageUnique; import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; import com.easysoftware.domain.rpmpackage.RPMPackageUnique; @@ -48,6 +49,9 @@ public class DomainPackageServiceImpl implements DomainPackageService { @Resource EPKGPackageGateway epkgPackageGateway; + @Resource + ApplicationPackageGateway applicationPackageGateway; + @Override public ResponseEntity searchDomain(DomainSearchCondition condition) { String name = condition.getName(); @@ -68,7 +72,11 @@ public class DomainPackageServiceImpl implements DomainPackageService { String entity = conditon.getEntity(); DomainPackageMenuVo domain = new DomainPackageMenuVo(); domain.setTags(new ArrayList()); - domain.getTags().add("IMAGE"); + + boolean appExisted = applicationPackageGateway.existApp(entity); + if (appExisted) { + domain.getTags().add("IMAGE"); + } RPMPackageUnique unique = new RPMPackageUnique(); unique.setName(entity); @@ -179,7 +187,8 @@ public class DomainPackageServiceImpl implements DomainPackageService { } for (DomainPackageMenuVo menu: menuList) { - map.get(menu.getCategory()).add(menu); + String cate = StringUtils.trimToEmpty(menu.getCategory()); + map.get(cate).add(menu); } List> res = new ArrayList<>(); diff --git a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java b/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java index e09652979266f9a2764264aa78c9d2849f477e2b..d4b22c057f1fdb8e8aae74d704e20eab164cfebd 100644 --- a/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java +++ b/src/main/java/com/easysoftware/application/domainpackage/dto/DomainSearchCondition.java @@ -38,7 +38,7 @@ public class DomainSearchCondition { private String version; @EnumValue(enumClass = TimeOrderEnum.class, enumMethod = "isValidCategory") - private String timeOrder; + private String timeOrder = "desc"; @Range(min = PackageConstant.MIN_PAGE_NUM, max = PackageConstant.MAX_PAGE_NUM) private Integer pageNum = 1; diff --git a/src/main/java/com/easysoftware/common/constant/PackageConstant.java b/src/main/java/com/easysoftware/common/constant/PackageConstant.java index 9746555c2e1f255022402b807cd47f8667a47478..e27f3ff1cbdd53f92ed0e0b01dc34c2156b5cca9 100644 --- a/src/main/java/com/easysoftware/common/constant/PackageConstant.java +++ b/src/main/java/com/easysoftware/common/constant/PackageConstant.java @@ -4,6 +4,6 @@ public class PackageConstant { public static final int MAX_PAGE_NUM = 1_0000; public static final int MIN_PAGE_NUM = 1; - public static final int MAX_PAGE_SIZE = 50; + public static final int MAX_PAGE_SIZE = 100; public static final int MIN_PAGE_SIZE = 5; }