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 d2e51f6407d65719ce3f433e52c763d4a1eac9e1..34c305e30f1fe54c67d0ff4cad0a8038f26caac0 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 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 dcf145863e13e27c257c58b50526ac168f082b94..ffa74dfddee9840aa946ff2725610519c33aad14 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 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 1fa1e56cf8c1ea8828ed4f58df496d9fbcba2b8d..dfca0766dac0f29fbb6565c2e301a107d122d7e0 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 tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags()); Map pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds()); + Map maintainers = ObjectMapperUtil.toMap(opDo.getMaintainers()); List sortedTags = SortUtil.sortTags(tags); opVo.setTags(sortedTags); @@ -88,6 +89,11 @@ public final class FieldApplicationConverter { pkgIdsMap.put(key, value); } opVo.setPkgIds(pkgIdsMap); + + Map 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 df31d915b6067d002e38758d5f6ec4a6a76d5149..1548898f2323c05deffa3928bd22a35d7a8f8a77 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 tags = ObjectMapperUtil.toObjectList(String.class, opDo.getTags()); Map pkgIds = ObjectMapperUtil.toMap(opDo.getPkgIds()); + Map maintainers = ObjectMapperUtil.toMap(opDo.getMaintainers()); List sortedTags = SortUtil.sortTags(tags); opVo.setTags(sortedTags); @@ -74,6 +75,11 @@ public final class FieldPkgConverter { Map pkgIdsMap = new HashMap<>(); pkgIds.forEach((key, value) -> pkgIdsMap.put(key, String.valueOf(value))); opVo.setPkgIds(pkgIdsMap); + + Map maintainersMap = maintainers.entrySet().stream().collect(Collectors.toMap( + Map.Entry::getKey, e -> String.valueOf(e.getValue()) + )); + opVo.setMaintainers(maintainersMap); return opVo; }