[INLONG-9995][Manager] Fix error

apache · Apr 16, 2024 · 1d9021e · 1d9021e
1 parent 513bfad
commit 1d9021e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/...r/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ProcessResponse.java b/...r/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/ProcessResponse.java
@@ -77,6 +77,6 @@ public class ProcessResponse {
     private List<TaskResponse> currentTasks;
 
     @ApiModelProperty(value = "Extra information shown in the list")
-    private Map<String, Object> showInList;
+    private List<Map<String, Object>> showInList;
 
 }
diff --git a/...ager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/TaskResponse.java b/...ager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/TaskResponse.java
@@ -89,6 +89,6 @@ public class TaskResponse {
     private Object extParams;
 
     @ApiModelProperty(value = "Extra information shown in the list")
-    private Map<String, Object> showInList;
+    private List<Map<String, Object>> showInList;
 
 }
diff --git a/...in/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java b/...in/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyConsumeProcessForm.java
@@ -26,6 +26,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,12 +58,14 @@ public String getInlongGroupId() {
     }
 
     @Override
-    public Map<String, Object> showInList() {
+    public List<Map<String, Object>> showInList() {
+        List<Map<String, Object>> showInList = new ArrayList<>();
         Map<String, Object> show = Maps.newHashMap();
         if (consumeInfo != null) {
             show.put("inlongGroupId", consumeInfo.getInlongGroupId());
             show.put("consumerGroup", consumeInfo.getConsumerGroup());
         }
-        return show;
+        showInList.add(show);
+        return showInList;
     }
 }
diff --git a/...main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java b/...main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java
@@ -79,23 +79,24 @@ public String getInlongGroupId() {
     }
 
     @Override
-    public Map<String, Object> showInList() {
-        Map<String, Object> show = Maps.newHashMap();
+    public List<Map<String, Object>> showInList() {
+        List<Map<String, Object>> showList = new ArrayList<>();
         if (groupInfo != null) {
-            show.put("inlongGroupId", groupInfo.getInlongGroupId());
-            show.put("inlongGroupMode", groupInfo.getInlongGroupMode());
-        } else {
-            List<String> groupIdList = new ArrayList<>();
-            List<Integer> groupModeList = new ArrayList<>();
-            groupFullInfoList.forEach(v -> {
-                InlongGroupInfo groupInfo = v.getGroupInfo();
-                groupIdList.add(groupInfo.getInlongGroupId());
-                groupModeList.add(groupInfo.getInlongGroupMode());
+            addShowInfo(groupInfo, showList);
+        }
+        if (CollectionUtils.isNotEmpty(groupFullInfoList)) {
+            groupFullInfoList.forEach(groupFullInfo -> {
+                addShowInfo(groupFullInfo.getGroupInfo(), showList);
             });
-            show.put("inlongGroupId", Joiner.on(",").join(groupIdList));
-            show.put("inlongGroupMode", Joiner.on(",").join(groupModeList));
         }
-        return show;
+        return showList;
+    }
+
+    private void addShowInfo(InlongGroupInfo groupInfo, List<Map<String, Object>> showList) {
+        Map<String, Object> show = Maps.newHashMap();
+        show.put("inlongGroupId", groupInfo.getInlongGroupId());
+        show.put("inlongGroupMode", groupInfo.getInlongGroupMode());
+        showList.add(show);
     }
 
     @Data

diff --git a/...n/java/org/apache/inlong/manager/pojo/workflow/form/process/GroupResourceProcessForm.java b/...n/java/org/apache/inlong/manager/pojo/workflow/form/process/GroupResourceProcessForm.java
@@ -26,6 +26,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,11 +62,13 @@ public String getInlongGroupId() {
     }
 
     @Override
-    public Map<String, Object> showInList() {
+    public List<Map<String, Object>> showInList() {
+        List<Map<String, Object>> showInList = new ArrayList<>();
         Map<String, Object> show = new HashMap<>();
         show.put("inlongGroupId", groupInfo.getInlongGroupId());
         show.put("groupOperateType", this.groupOperateType);
-        return show;
+        showInList.add(show);
+        return showInList;
     }
 
 }
diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ProcessForm.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ProcessForm.java
@@ -21,6 +21,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,7 +48,7 @@ default String getTitle() {
     /**
      * Field data displayed in the process list.
      */
-    default Map<String, Object> showInList() {
+    default List<Map<String, Object>> showInList() {
         return null;
     }
 

diff --git a/...service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java b/...service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
@@ -244,7 +244,7 @@ private Consumer<ProcessResponse> addCurrentTask(TaskRequest query) {
         };
     }
 
-    private Map<String, Object> getShowInList(WorkflowProcessEntity processEntity) {
+    private List<Map<String, Object>> getShowInList(WorkflowProcessEntity processEntity) {
         WorkflowProcess process = processDefService.getByName(processEntity.getName());
         if (process == null || process.getFormClass() == null) {
             return null;
@@ -270,7 +270,7 @@ private void addShowInListForEachTask(List<TaskResponse> taskList) {
         query.setIdList(list);
 
         List<WorkflowProcessEntity> processEntities = queryService.listProcessEntity(query);
-        Map<Integer, Map<String, Object>> processShowInListMap = Maps.newHashMap();
+        Map<Integer, List<Map<String, Object>>> processShowInListMap = Maps.newHashMap();
         processEntities.forEach(entity -> processShowInListMap.put(entity.getId(), getShowInList(entity)));
         taskList.forEach(task -> task.setShowInList(processShowInListMap.get(task.getProcessId())));
     }