From 677fc3a2023e84ad7772f54ff285f486f47fa759 Mon Sep 17 00:00:00 2001
From: gouzhonglin <gouzhonglin@huawei.com>
Date: Tue, 12 Mar 2024 14:20:40 +0800
Subject: [PATCH] fix bug /domain

---
 .../domainpackage/DomainPackageServiceImpl.java     | 13 +++++++++++--
 .../domainpackage/dto/DomainSearchCondition.java    |  2 +-
 .../common/constant/PackageConstant.java            |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java b/src/main/java/com/easysoftware/application/domainpackage/DomainPackageServiceImpl.java
index 0f264de..df8c32c 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<Object> 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<String>());
-        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<Map<String, Object>> 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 e096529..d4b22c0 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 9746555..e27f3ff 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;
 }
-- 
Gitee