From f06e21058aa18bf69831f818ea0320ea843e61f7 Mon Sep 17 00:00:00 2001
From: gi1tee <gouzhonglin@huawei.com>
Date: Thu, 11 Jul 2024 10:10:03 +0800
Subject: [PATCH] fix-main

---
 .../easysoftware/application/fieldpkg/vo/FieldPkgVo.java    | 2 +-
 .../application/filedapplication/vo/FiledApplicationVo.java | 2 +-
 .../gatewayimpl/converter/FieldApplicationConverter.java    | 6 ++++++
 .../fieldpkg/converter/FieldPkgConverter.java               | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java
index d2e51f6..34c305e 100644
--- a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java
+++ b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java
@@ -70,5 +70,5 @@ public class FieldPkgVo {
     /**
      * maintainers.
      */
-    private String maintainers;
+    private Map<String, String> maintainers;
 }
diff --git a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java
index dcf1458..ffa74df 100644
--- a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java
+++ b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java
@@ -70,6 +70,6 @@ public class FiledApplicationVo {
     /**
      * maintainers.
      */
-    private String maintainers;
+    private Map<String, String> maintainers;
 
 }
diff --git a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java
index 1fa1e56..dfca076 100644
--- a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java
+++ b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/converter/FieldApplicationConverter.java
@@ -77,6 +77,7 @@ public final class FieldApplicationConverter {
         BeanUtils.copyProperties(opDo, opVo);
         List<String> tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags());
         Map<String, Object> pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds());
+        Map<String, Object> maintainers = ObjectMapperUtil.toMap(opDo.getMaintainers());
 
         List<String> sortedTags = SortUtil.sortTags(tags);
         opVo.setTags(sortedTags);
@@ -88,6 +89,11 @@ public final class FieldApplicationConverter {
             pkgIdsMap.put(key, value);
         }
         opVo.setPkgIds(pkgIdsMap);
+
+        Map<String, String> maintainersMap = maintainers.entrySet().stream().collect(Collectors.toMap(
+            Map.Entry::getKey, e -> String.valueOf(e.getValue())
+        ));
+        opVo.setMaintainers(maintainersMap);
         return opVo;
     }
 
diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java
index df31d91..1548898 100644
--- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java
+++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java
@@ -67,6 +67,7 @@ public final class FieldPkgConverter {
         BeanUtils.copyProperties(opDo, opVo);
         List<String> tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags());
         Map<String, Object> pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds());
+        Map<String, Object> maintainers = ObjectMapperUtil.toMap(opDo.getMaintainers());
 
         List<String> sortedTags = SortUtil.sortTags(tags);
         opVo.setTags(sortedTags);
@@ -74,6 +75,11 @@ public final class FieldPkgConverter {
         Map<String, String> pkgIdsMap = new HashMap<>();
         pkgIds.forEach((key, value) -> pkgIdsMap.put(key, String.valueOf(value)));
         opVo.setPkgIds(pkgIdsMap);
+
+        Map<String, String> maintainersMap = maintainers.entrySet().stream().collect(Collectors.toMap(
+            Map.Entry::getKey, e -> String.valueOf(e.getValue())
+        ));
+        opVo.setMaintainers(maintainersMap);
         return opVo;
     }
 
-- 
Gitee