diff --git a/inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx b/inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx index 7a0bdecaa1f..2bc083f641e 100644 --- a/inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx +++ b/inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx @@ -43,7 +43,7 @@ const Comp: React.FC = ({ inlongGroupId, ...modalProps }) => { const { run: getData, data } = useRequest( { - url: '/workflow/listTaskExecuteLogs', + url: '/workflow/listTaskLogs', params: { ...options, inlongGroupId: inlongGroupId, diff --git a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java index 6effd908f3f..26f4f30ebcb 100644 --- a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java +++ b/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()) diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java index 2eabbc78d9d..35c7e0a22c1 100644 --- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java +++ b/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 logViews = workFlowClient.getInlongGroupError(inlongGroupId); + List logViews = workFlowClient.getInlongGroupError(inlongGroupId); if (CollectionUtils.isNotEmpty(logViews)) { Map> errMsgMap = Maps.newHashMap(); Map> groupLogMap = Maps.newHashMap(); diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java index 48e44ef0fa6..58556a61ac0 100644 --- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java +++ b/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 getInlongGroupError(String inlongGroupId) { - Response> response = ClientUtils.executeHttpCall( + public List getInlongGroupError(String inlongGroupId) { + Response> response = ClientUtils.executeHttpCall( workflowApi.getInlongGroupError(inlongGroupId, -1)); ClientUtils.assertRespSuccess(response); return response.getData().getList(); diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java index 00e81690192..7505ba1a91b 100644 --- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java +++ b/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> startInlongGroup(@Path("taskId") Integer taskId, @Body Map request); @GET("workflow/event/list") - Call>> getInlongGroupError(@Query("inlongGroupId") String groupId, + Call>> getInlongGroupError(@Query("inlongGroupId") String groupId, @Query("status") Integer status); } diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverRequest.java similarity index 71% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverRequest.java index fde0d7a6610..b69133c37d8 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverQuery.java +++ b/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; } diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprover.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverResponse.java similarity index 67% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprover.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ApproverResponse.java index ec447b61368..7b668b48f23 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprover.java +++ b/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") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementDTO.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementInfo.java similarity index 93% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementDTO.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementInfo.java index 574e75bd5e7..306a45ed44e 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ElementDTO.java +++ b/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 next = Lists.newArrayList(); + private List next = Lists.newArrayList(); } diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogRequest.java similarity index 94% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogRequest.java index ccac17e43e5..2f964bcf1f6 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogQuery.java +++ b/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") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogResponse.java similarity index 95% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogView.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogResponse.java index 1e58f507b75..97b36f42221 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/EventLogView.java +++ b/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; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/FilterKey.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/FilterKey.java deleted file mode 100644 index e621729cd68..00000000000 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/FilterKey.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.inlong.manager.common.pojo.workflow; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import org.apache.inlong.manager.common.util.InlongCollectionUtils; - -/** - * Approvers filter key of workflow - */ -public enum FilterKey { - - DEFAULT; - - private static final List FILTER_KEY_ORDER = ImmutableList.of(DEFAULT); - private static final Map NAME_MAP = InlongCollectionUtils.transformToImmutableMap( - Lists.newArrayList(FilterKey.values()), - FilterKey::name, - Function.identity() - ); - - /** - * Filter order-from small to large range - * - * @return orderly filtering KEY - */ - public static List getFilterKeyByOrder() { - return FILTER_KEY_ORDER; - } - - public static FilterKey fromName(String name) { - return NAME_MAP.get(name); - } -} diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountRequest.java similarity index 93% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountRequest.java index 9ee934425b3..754f85f3e8e 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessCountQuery.java +++ b/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") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessDetailResponse.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessDetailResponse.java index 43078b3b0d2..e1380f5635a 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessDetailResponse.java +++ b/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 taskHistory; @ApiModelProperty(value = "Workflow view") - private WorkflowBriefDTO workflow; + private ProcessInfo workflow; } diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowBriefDTO.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessInfo.java similarity index 90% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowBriefDTO.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessInfo.java index af4841bbe04..1ef839cde52 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowBriefDTO.java +++ b/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; } diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessRequest.java similarity index 94% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessRequest.java index 603fbb4a3be..ad84a1a1764 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessRequest.java @@ -32,15 +32,15 @@ import java.util.List; /** - * Apply process request + * Workflow process request */ @Data -@EqualsAndHashCode(callSuper = false) @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel("Apply process request") -public class ProcessQuery extends PageRequest { +@EqualsAndHashCode(callSuper = false) +@ApiModel("Workflow process request") +public class ProcessRequest extends PageRequest { @ApiModelProperty("Process ID") private Integer id; @@ -60,7 +60,7 @@ public class ProcessQuery extends PageRequest { @ApiModelProperty("Status") private ProcessStatus status; - @ApiModelProperty("InLong group id") + @ApiModelProperty("Inlong group id") private String inlongGroupId; @ApiModelProperty("Start time-lower limit") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountRequest.java similarity index 96% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountRequest.java index 6dea80446e8..4e125ccc198 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountQuery.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskCountRequest.java @@ -28,14 +28,14 @@ import java.util.Date; /** - * Task count query + * Task count request */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel("Task count query") -public class TaskCountQuery { +@ApiModel("Task count request") +public class TaskCountRequest { @ApiModelProperty("Process ID") private Integer processId; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskExecuteLogQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskLogRequest.java similarity index 93% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskExecuteLogQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskLogRequest.java index 297168bbbce..0b252554c69 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskExecuteLogQuery.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskLogRequest.java @@ -31,9 +31,9 @@ @Data @EqualsAndHashCode(callSuper = false) @ApiModel("Task execution log request") -public class TaskExecuteLogQuery extends PageRequest { +public class TaskLogRequest extends PageRequest { - @ApiModelProperty("InLong group id") + @ApiModelProperty("Inlong group id") private String inlongGroupId; @ApiModelProperty("Process name list") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskRequest.java similarity index 98% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskQuery.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskRequest.java index a44a8fa5bd0..581905a8878 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskQuery.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/TaskRequest.java @@ -35,12 +35,12 @@ * Workflow-Task query request */ @Data -@EqualsAndHashCode(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = true) @ApiModel("Workflow-Task query request") -public class TaskQuery extends PageRequest { +public class TaskRequest extends PageRequest { @ApiModelProperty("Task ID") private Integer id; diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowTaskRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprovalRequest.java similarity index 92% rename from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowTaskRequest.java rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprovalRequest.java index cabf4238227..3ceddd3acb1 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowTaskRequest.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApprovalRequest.java @@ -25,11 +25,11 @@ import java.util.List; /** - * Workflow task request + * Workflow approval request */ @Data -@ApiModel("Workflow task request") -public class WorkflowTaskRequest { +@ApiModel("Workflow approval request") +public class WorkflowApprovalRequest { @ApiModelProperty(value = "Transferor persons", notes = "When transferring the task, specify who needs to be transferred to") diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverFilterContext.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverFilterContext.java deleted file mode 100644 index 3f5b0140b2e..00000000000 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowApproverFilterContext.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.inlong.manager.common.pojo.workflow; - -import java.util.HashMap; -import java.util.Map; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Context of workflow approver filter - * - */ -@Data -@Builder -@NoArgsConstructor -public class WorkflowApproverFilterContext { - - public Map toFilterKeyMap() { - return new HashMap<>(); - } -} diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowResult.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowResult.java index 14177bbbe3e..2fe2ea15110 100644 --- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowResult.java +++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/WorkflowResult.java @@ -24,13 +24,13 @@ import java.util.List; /** - * Workflow results + * Workflow result info */ @Data -@ApiModel("Workflow interface response") +@ApiModel("Workflow result info") public class WorkflowResult { - @ApiModelProperty(value = "Application form information") + @ApiModelProperty(value = "Process info") private ProcessResponse processInfo; @ApiModelProperty(value = "Newly generated tasks") diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowApproverEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowApproverEntity.java index 66607b29276..3dbc857de2e 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowApproverEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowApproverEntity.java @@ -17,12 +17,13 @@ package org.apache.inlong.manager.dao.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** - * Workflow approver entity, including process name, task name, filter key, etc. + * Workflow approver entity, including process name, task name, etc. */ @Data public class WorkflowApproverEntity implements Serializable { @@ -31,9 +32,6 @@ public class WorkflowApproverEntity implements Serializable { private Integer id; private String processName; private String taskName; - private String filterKey; - private String filterValue; - private String filterValueDesc; private String approvers; private String creator; private String modifier; diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowEventLogEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowEventLogEntity.java index 2970ac5d84a..28a9d0d1158 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowEventLogEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowEventLogEntity.java @@ -23,46 +23,30 @@ import java.util.Date; /** - * Event log + * Workflow event log */ @Data @ToString public class WorkflowEventLogEntity { private Integer id; - private Integer processId; - private String processName; - private String processDisplayName; - private String inlongGroupId; - private Integer taskId; - private String elementName; - private String elementDisplayName; private String eventType; - private String event; - private String listener; - private Date startTime; - private Date endTime; - private Integer status; - private Integer async; - private String ip; - private String remark; - private String exception; } diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowProcessEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowProcessEntity.java index a4e2377f67a..87e92bf4a89 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowProcessEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowProcessEntity.java @@ -28,65 +28,18 @@ public class WorkflowProcessEntity { private Integer id; - - /** - * Process name - */ private String name; - - /** - * Process display name - */ private String displayName; - - /** - * Process classification - */ private String type; - - /** - * Process title - */ private String title; - /** - * InLong group ID - */ private String inlongGroupId; - - /** - * Applicant name - */ private String applicant; - - /** - * Process status - */ private String status; - - /** - * Form information - */ private String formData; - - /** - * Application time - */ private Date startTime; - - /** - * End time - */ private Date endTime; - - /** - * Extended params - */ private String extParams; - - /** - * Whether to hide - */ private Integer hidden; } diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowTaskEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowTaskEntity.java index 62dfd8356c5..b0e9ba24f0f 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowTaskEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/WorkflowTaskEntity.java @@ -28,87 +28,24 @@ public class WorkflowTaskEntity { public static final String APPROVERS_DELIMITER = ","; - public static final String EXT_TRANSFER_USER_KEY = "transferToUsers"; - /** - * Task ID - */ private Integer id; - - /** - * Task type - */ private String type; - - /** - * Task name - */ private String name; - - /** - * Display name of the task - */ private String displayName; - - /** - * Application form ID - */ private Integer processId; - - /** - * Process name - */ private String processName; - - /** - * Process display name - */ private String processDisplayName; - /** - * Applicant - */ private String applicant; - - /** - * Approver - */ private String approvers; - - /** - * Task status - */ private String status; - - /** - * Task operator - */ private String operator; - - /** - * Remarks information - */ private String remark; - - /** - * Form information - */ private String formData; - - /** - * Start time - */ private Date startTime; - - /** - * End time - */ private Date endTime; - - /** - * Extended params - */ private String extParams; } diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java index d12c069cfe4..afce3218911 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java @@ -86,10 +86,10 @@ List selectByIdAndType(@Param("groupId") String groupId, @Para /** * Filter stream ids with the specified groupId and sinkType from the given stream id list. * - * @param groupId InLong group id. + * @param groupId Inlong group id. * @param sinkType Sink type. - * @param streamIdList InLong stream id list. - * @return List of InLong stream id with the given sink type + * @param streamIdList Inlong stream id list. + * @return List of Inlong stream id with the given sink type */ List selectExistsStreamId(@Param("groupId") String groupId, @Param("sinkType") String sinkType, @Param("streamIdList") List streamIdList); diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowApproverEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowApproverEntityMapper.java index 7171d894097..6f991f2b272 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowApproverEntityMapper.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowApproverEntityMapper.java @@ -17,28 +17,24 @@ package org.apache.inlong.manager.dao.mapper; -import org.apache.inlong.manager.common.pojo.workflow.WorkflowApproverQuery; +import org.apache.ibatis.annotations.Param; +import org.apache.inlong.manager.common.pojo.workflow.ApproverRequest; import org.apache.inlong.manager.dao.entity.WorkflowApproverEntity; +import org.springframework.stereotype.Repository; import java.util.List; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - @Repository public interface WorkflowApproverEntityMapper { - int deleteByPrimaryKey(@Param("id") Integer id, @Param("modifier") String modifier); - int insert(WorkflowApproverEntity record); - int insertSelective(WorkflowApproverEntity record); + WorkflowApproverEntity selectById(Integer id); - WorkflowApproverEntity selectByPrimaryKey(Integer id); + List selectByQuery(ApproverRequest request); - int updateByPrimaryKeySelective(WorkflowApproverEntity record); + int updateById(WorkflowApproverEntity record); - int updateByPrimaryKey(WorkflowApproverEntity record); + int deleteByPrimaryKey(@Param("id") Integer id, @Param("modifier") String modifier); - List selectByQuery(WorkflowApproverQuery query); } diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowEventLogEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowEventLogEntityMapper.java index 970e2a8a3ac..430a9905a5a 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowEventLogEntityMapper.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowEventLogEntityMapper.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.dao.mapper; -import org.apache.inlong.manager.common.pojo.workflow.EventLogQuery; +import org.apache.inlong.manager.common.pojo.workflow.EventLogRequest; import org.apache.inlong.manager.dao.entity.WorkflowEventLogEntity; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Propagation; @@ -33,7 +33,7 @@ public interface WorkflowEventLogEntityMapper { WorkflowEventLogEntity selectById(Integer id); - List selectByCondition(EventLogQuery request); + List selectByCondition(EventLogRequest request); int update(WorkflowEventLogEntity record); diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowProcessEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowProcessEntityMapper.java index b4dc16b5258..c7bc41f1cc7 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowProcessEntityMapper.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowProcessEntityMapper.java @@ -18,8 +18,8 @@ package org.apache.inlong.manager.dao.mapper; import org.apache.inlong.manager.common.pojo.common.CountInfo; -import org.apache.inlong.manager.common.pojo.workflow.ProcessCountQuery; -import org.apache.inlong.manager.common.pojo.workflow.ProcessQuery; +import org.apache.inlong.manager.common.pojo.workflow.ProcessCountRequest; +import org.apache.inlong.manager.common.pojo.workflow.ProcessRequest; import org.apache.inlong.manager.dao.entity.WorkflowProcessEntity; import org.springframework.stereotype.Repository; @@ -35,9 +35,9 @@ public interface WorkflowProcessEntityMapper { WorkflowProcessEntity selectById(Integer id); - List selectByCondition(ProcessQuery query); + List selectByCondition(ProcessRequest query); - List countByQuery(ProcessCountQuery query); + List countByQuery(ProcessCountRequest query); void update(WorkflowProcessEntity workflowProcessEntity); diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowTaskEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowTaskEntityMapper.java index 15545b03d47..c674ca73276 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowTaskEntityMapper.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/WorkflowTaskEntityMapper.java @@ -20,8 +20,8 @@ import org.apache.ibatis.annotations.Param; import org.apache.inlong.manager.common.enums.TaskStatus; import org.apache.inlong.manager.common.pojo.common.CountInfo; -import org.apache.inlong.manager.common.pojo.workflow.TaskCountQuery; -import org.apache.inlong.manager.common.pojo.workflow.TaskQuery; +import org.apache.inlong.manager.common.pojo.workflow.TaskCountRequest; +import org.apache.inlong.manager.common.pojo.workflow.TaskRequest; import org.apache.inlong.manager.dao.entity.WorkflowTaskEntity; import org.springframework.stereotype.Repository; @@ -39,12 +39,12 @@ public interface WorkflowTaskEntityMapper { List selectByProcess(@Param("processId") Integer processId, @Param("status") TaskStatus status); - List selectByQuery(TaskQuery query); + List selectByQuery(TaskRequest query); int countByStatus(@Param("processId") Integer processId, @Param("name") String name, @Param("status") TaskStatus status); - List countByQuery(TaskCountQuery query); + List countByQuery(TaskCountRequest query); int update(WorkflowTaskEntity workflowTaskEntity); diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml index 642355b0841..77cd4bbc826 100644 --- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml +++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml @@ -24,9 +24,6 @@ - - - @@ -36,131 +33,43 @@ - id, process_name, task_name, filter_key, filter_value, filter_value_desc, approvers, creator, modifier, - create_time, modify_time, is_deleted, version + id, process_name, task_name, approvers, creator, modifier, create_time, modify_time, is_deleted, version - - - update workflow_approver - set is_deleted = id, - modifier=#{modifier, jdbcType=VARCHAR} - where id = #{id, jdbcType=INTEGER} - - insert into workflow_approver (id, process_name, task_name, - filter_key, filter_value, filter_value_desc, approvers, creator, modifier) values (#{id, jdbcType=INTEGER}, #{processName, jdbcType=VARCHAR}, #{taskName, jdbcType=VARCHAR}, - #{filterKey, jdbcType=VARCHAR}, #{filterValue, jdbcType=VARCHAR}, #{filterValueDesc, jdbcType=VARCHAR}, #{approvers, jdbcType=VARCHAR}, #{creator, jdbcType=VARCHAR}, #{modifier, jdbcType=VARCHAR}) - - insert into workflow_approver - - - id, - - - process_name, - - - task_name, - - - filter_key, - - - filter_value, - - - filter_value_desc, - - - approvers, - - - creator, - - - modifier, - - - - - #{id, jdbcType=INTEGER}, - - - #{processName, jdbcType=VARCHAR}, - - - #{taskName, jdbcType=VARCHAR}, - - - #{filterKey, jdbcType=VARCHAR}, - - - #{filterValue, jdbcType=VARCHAR}, - - - #{filterValueDesc, jdbcType=VARCHAR}, - - - #{approvers, jdbcType=VARCHAR}, - - - #{creator, jdbcType=VARCHAR}, - - - #{modifier, jdbcType=VARCHAR}, - - - - - update workflow_approver - - - process_name = #{processName, jdbcType=VARCHAR}, - - - task_name = #{taskName, jdbcType=VARCHAR}, - - - filter_key = #{filterKey, jdbcType=VARCHAR}, - - - filter_value = #{filterValue, jdbcType=VARCHAR}, - - - filter_value_desc = #{filterValueDesc, jdbcType=VARCHAR}, - - - approvers = #{approvers, jdbcType=VARCHAR}, - - - creator = #{creator, jdbcType=VARCHAR}, + + + + + update workflow_approver set process_name = #{processName, jdbcType=VARCHAR}, task_name = #{taskName, jdbcType=VARCHAR}, @@ -172,36 +81,14 @@ is_deleted = #{isDeleted, jdbcType=INTEGER}, version = #{version, jdbcType=INTEGER} + 1 where id = #{id, jdbcType=INTEGER} - and is_deleted = 0 - and version = #{version, jdbcType=INTEGER} + and is_deleted = 0 + and version = #{version, jdbcType=INTEGER} - + + + update workflow_approver + set is_deleted = id, + modifier=#{modifier, jdbcType=VARCHAR} + where id = #{id, jdbcType=INTEGER} + diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml index 58b486fd0e4..7254e2ad943 100644 --- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml +++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml @@ -73,7 +73,7 @@ where id = #{id,jdbcType=INTEGER} - - -