[INLONG-5240][Manager] Unify the workflow approver and process classes and tables

inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx

@@ -43,7 +43,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId, ...modalProps }) => {
 
   const { run: getData, data } = useRequest(
     {
-      url: '/workflow/listTaskExecuteLogs',
+      url: '/workflow/listTaskLogs',
       params: {
         ...options,
         inlongGroupId: inlongGroupId,

inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java

@@ -36,7 +36,7 @@
 import org.apache.inlong.manager.common.pojo.source.kafka.KafkaSource;
 import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
 import org.apache.inlong.manager.common.pojo.stream.StreamField;
-import org.apache.inlong.manager.common.pojo.workflow.EventLogView;
+import org.apache.inlong.manager.common.pojo.workflow.EventLogResponse;
 import org.apache.inlong.manager.common.pojo.workflow.ProcessResponse;
 import org.apache.inlong.manager.common.pojo.workflow.TaskResponse;
 import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
@@ -337,7 +337,7 @@ static void createStub() {
                         )
         );
 
-        EventLogView eventLogView1 = EventLogView.builder()
+        EventLogResponse eventLogView1 = EventLogResponse.builder()
                 .id(38)
                 .processId(12)
                 .processName(ProcessName.CREATE_GROUP_RESOURCE.toString())
@@ -352,7 +352,7 @@ static void createStub() {
                 .status(-1)
                 .ip("127.0.0.1")
                 .build();
-        EventLogView eventLogView2 = EventLogView.builder()
+        EventLogResponse eventLogView2 = EventLogResponse.builder()
                 .id(39)
                 .processId(12)
                 .processName(ProcessName.CREATE_GROUP_RESOURCE.toString())

inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java

@@ -45,7 +45,7 @@
 import org.apache.inlong.manager.common.pojo.sort.BaseSortConf;
 import org.apache.inlong.manager.common.pojo.stream.InlongStreamConfigLogListResponse;
 import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.common.pojo.workflow.EventLogView;
+import org.apache.inlong.manager.common.pojo.workflow.EventLogResponse;
 import org.apache.inlong.manager.common.pojo.workflow.ProcessResponse;
 import org.apache.inlong.manager.common.pojo.workflow.TaskResponse;
 import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
@@ -287,7 +287,7 @@ private InlongGroupContext generateSnapshot() {
         // create group context
         InlongGroupContext inlongGroupContext = new InlongGroupContext(groupContext);
         // fetch group logs
-        List<EventLogView> logViews = workFlowClient.getInlongGroupError(inlongGroupId);
+        List<EventLogResponse> logViews = workFlowClient.getInlongGroupError(inlongGroupId);
         if (CollectionUtils.isNotEmpty(logViews)) {
             Map<String, List<String>> errMsgMap = Maps.newHashMap();
             Map<String, List<String>> groupLogMap = Maps.newHashMap();

inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java

@@ -27,7 +27,7 @@
 import org.apache.inlong.manager.client.api.service.WorkflowApi;
 import org.apache.inlong.manager.client.api.util.ClientUtils;
 import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.pojo.workflow.EventLogView;
+import org.apache.inlong.manager.common.pojo.workflow.EventLogResponse;
 import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
 import org.apache.inlong.manager.common.pojo.workflow.form.process.ApplyGroupProcessForm;
 import org.apache.inlong.manager.common.util.JsonUtils;
@@ -74,8 +74,8 @@ public WorkflowResult startInlongGroup(int taskId, ApplyGroupProcessForm groupPr
     /**
      * get inlong group error messages
      */
-    public List<EventLogView> getInlongGroupError(String inlongGroupId) {
-        Response<PageInfo<EventLogView>> response = ClientUtils.executeHttpCall(
+    public List<EventLogResponse> getInlongGroupError(String inlongGroupId) {
+        Response<PageInfo<EventLogResponse>> response = ClientUtils.executeHttpCall(
                 workflowApi.getInlongGroupError(inlongGroupId, -1));
         ClientUtils.assertRespSuccess(response);
         return response.getData().getList();

inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java

@@ -19,7 +19,7 @@
 
 import com.github.pagehelper.PageInfo;
 import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.pojo.workflow.EventLogView;
+import org.apache.inlong.manager.common.pojo.workflow.EventLogResponse;
 import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -38,7 +38,7 @@ public interface WorkflowApi {
     Call<Response<WorkflowResult>> startInlongGroup(@Path("taskId") Integer taskId, @Body Map<String, Object> request);
 
     @GET("workflow/event/list")
-    Call<Response<PageInfo<EventLogView>>> getInlongGroupError(@Query("inlongGroupId") String groupId,
+    Call<Response<PageInfo<EventLogResponse>>> getInlongGroupError(@Query("inlongGroupId") String groupId,
             @Query("status") Integer status);
 
 }

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverQuery.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverRequest.java

@@ -25,34 +25,31 @@
 import lombok.NoArgsConstructor;
 
 /**
- * Workflow Approver Query Condition
+ * Workflow approver request
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("Workflow Approver Query Condition")
-public class WorkflowApproverQuery {
+@ApiModel("Workflow approver request")
+public class ApproverRequest {
 
-    @ApiModelProperty("id")
+    @ApiModelProperty(value = "Primary key")
     private Integer id;
 
-    @ApiModelProperty("WorkflowProcess definition name")
+    @ApiModelProperty("Workflow process name")
     private String processName;
 
-    @ApiModelProperty("Approval task name")
+    @ApiModelProperty("Workflow task name")
     private String taskName;
 
-    @ApiModelProperty("Filter Condition KEY")
-    private String filterKey;
-
-    @ApiModelProperty("Filter matching values")
-    private String filterValue;
-
-    @ApiModelProperty("Approver")
+    @ApiModelProperty("Specified workflow approver")
     private String approver;
 
-    private String creator;
+    @ApiModelProperty("Workflow approvers, separate with commas(,)")
+    private String approvers;
+
+    @ApiModelProperty(value = "Version number")
+    private Integer version;
 
-    private String modifier;
 }

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprover.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverResponse.java

@@ -17,6 +17,7 @@
 
 package org.apache.inlong.manager.common.pojo.workflow;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -27,45 +28,37 @@
 import java.util.Date;
 
 /**
- * Workflow approver config
+ * Workflow approver response
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("Workflow approver")
-public class WorkflowApprover {
+@ApiModel("Workflow Approver response")
+public class ApproverResponse {
 
-    @ApiModelProperty("id")
+    @ApiModelProperty(value = "Primary key")
     private Integer id;
 
-    @ApiModelProperty("process name")
+    @ApiModelProperty("Workflow process name")
     private String processName;
 
-    @ApiModelProperty("process display name")
-    private String processDisplayName;
-
-    @ApiModelProperty("task name")
+    @ApiModelProperty("Workflow task name")
     private String taskName;
 
-    @ApiModelProperty("task display name")
-    private String taskDisplayName;
-
-    @ApiModelProperty("filter key")
-    private FilterKey filterKey;
-
-    @ApiModelProperty("filter value")
-    private String filterValue;
-
-    @ApiModelProperty("filter value desc")
-    private String filterValueDesc;
-
-    @ApiModelProperty("approver list, separate with commas(\",\") when multiple")
-    private String approvers;
+    @ApiModelProperty("Workflow approvers, separate with commas(,)")
+    private String approver;
 
+    @ApiModelProperty(value = "Name of creator")
     private String creator;
+
+    @ApiModelProperty(value = "Name of modifier")
     private String modifier;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
     @ApiModelProperty(value = "Version number")

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementDTO.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementInfo.java

@@ -26,11 +26,11 @@
 import java.util.List;
 
 /**
- * Workflow element DTO
+ * Workflow element info
  */
 @Data
 @ApiModel("Workflow element info")
-public class ElementDTO {
+public class ElementInfo {
 
     @ApiModelProperty(value = "Node name")
     private String name;
@@ -45,6 +45,6 @@ public class ElementDTO {
     private TaskStatus status;
 
     @ApiModelProperty(value = "Next approval node")
-    private List<ElementDTO> next = Lists.newArrayList();
+    private List<ElementInfo> next = Lists.newArrayList();
 
 }

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogQuery.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogRequest.java

@@ -33,12 +33,12 @@
  * Workflow event log query request
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("Workflow event log query request")
-public class EventLogQuery extends PageRequest {
+@EqualsAndHashCode(callSuper = false)
+@ApiModel("Workflow event log request")
+public class EventLogRequest extends PageRequest {
 
     private Integer id;
 
@@ -48,7 +48,7 @@ public class EventLogQuery extends PageRequest {
     @ApiModelProperty("Process name")
     private String processName;
 
-    @ApiModelProperty("InLong group id")
+    @ApiModelProperty("Inlong group id")
     private String inlongGroupId;
 
     @ApiModelProperty("Task id")

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogView.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogResponse.java

@@ -27,14 +27,14 @@
 import java.util.Date;
 
 /**
- * Event log
+ * Event log response
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("Workflow event log query conditions")
-public class EventLogView {
+@ApiModel("Workflow event log response")
+public class EventLogResponse {
 
     @ApiModelProperty("id")
     private Integer id;
@@ -73,7 +73,7 @@ public class EventLogView {
     private Integer status;
 
     @ApiModelProperty("Is it synchronized")
-    private Boolean async;
+    private Integer async;
 
     @ApiModelProperty("Execute IP")
     private String ip;

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountQuery.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountRequest.java

@@ -25,11 +25,11 @@
 import java.util.Date;
 
 /**
- * Process count query
+ * Process count request
  */
 @Data
-@ApiModel("Process count query")
-public class ProcessCountQuery {
+@ApiModel("Process count request")
+public class ProcessCountRequest {
 
     @ApiModelProperty("Process name")
     private String name;
@@ -40,7 +40,7 @@ public class ProcessCountQuery {
     @ApiModelProperty("Applicant")
     private String applicant;
 
-    @ApiModelProperty("InLong group id")
+    @ApiModelProperty("Inlong group id")
     private String inlongGroupId;
 
     @ApiModelProperty("Start time-lower limit")

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessDetailResponse.java

@@ -40,6 +40,6 @@ public class ProcessDetailResponse {
     private List<TaskResponse> taskHistory;
 
     @ApiModelProperty(value = "Workflow view")
-    private WorkflowBriefDTO workflow;
+    private ProcessInfo workflow;
 
 }

inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowBriefDTO.java → inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessInfo.java

@@ -26,7 +26,7 @@
  */
 @Data
 @ApiModel("Workflow brief info")
-public class WorkflowBriefDTO {
+public class ProcessInfo {
 
     @ApiModelProperty(value = "Process name")
     private String name;
@@ -37,7 +37,7 @@ public class WorkflowBriefDTO {
     @ApiModelProperty(value = "Process type")
     private String type;
 
-    @ApiModelProperty(value = "approval process-start node")
-    private ElementDTO startEvent;
+    @ApiModelProperty(value = "Process start node")
+    private ElementInfo startEvent;
 
 }