This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 08887b1dc [INLONG-7444][Manager] Support query InLong objects by
status list (#7445)
08887b1dc is described below
commit 08887b1dc240c015775cfc3c16b5ec8666833a78
Author: fuweng11 <[email protected]>
AuthorDate: Tue Feb 28 10:22:06 2023 +0800
[INLONG-7444][Manager] Support query InLong objects by status list (#7445)
---
.../src/main/resources/mappers/InlongStreamEntityMapper.xml | 6 ++++++
.../src/main/resources/mappers/StreamSinkEntityMapper.xml | 6 ++++++
.../src/main/resources/mappers/StreamSourceEntityMapper.xml | 6 ++++++
.../java/org/apache/inlong/manager/pojo/sink/SinkPageRequest.java | 4 ++++
.../org/apache/inlong/manager/pojo/source/SourcePageRequest.java | 4 ++++
.../apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java | 5 +++++
6 files changed, 31 insertions(+)
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index 9fec7e7cd..91316ab84 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -261,6 +261,12 @@
<if test="request.status != null and request.status != ''">
and stream.status = #{request.status, jdbcType=INTEGER}
</if>
+ <if test="request.statusList != null and request.statusList.size()
> 0">
+ and stream.status in
+ <foreach collection="request.statusList" item="status"
index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ </if>
</where>
<choose>
<when test="request.orderField != null and request.orderField !=
'' and request.orderType != null and request.orderType != ''">
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
index 996c85cf4..6d43fd496 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
@@ -223,6 +223,12 @@
<if test="request.status != null and request.status != ''">
and status = #{request.status, jdbcType=INTEGER}
</if>
+ <if test="request.statusList != null and request.statusList.size()
> 0">
+ and status in
+ <foreach collection="request.statusList" item="status"
index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ </if>
<if test="request.inlongClusterName != null and
request.inlongClusterName != ''">
and inlong_cluster_name = #{request.inlongClusterName,
jdbcType=VARCHAR}
</if>
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
index 57860b97a..983f5809f 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
@@ -143,6 +143,12 @@
<if test="request.status != null and request.status != ''">
and status = #{request.status, jdbcType=INTEGER}
</if>
+ <if test="request.statusList != null and request.statusList.size()
> 0">
+ and status in
+ <foreach collection="request.statusList" item="status"
index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ </if>
and template_id is NULL
</where>
<choose>
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkPageRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkPageRequest.java
index 4a14e827b..2833c7b2a 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkPageRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkPageRequest.java
@@ -24,6 +24,7 @@ import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.pojo.common.PageRequest;
import javax.validation.constraints.NotBlank;
+import java.util.List;
/**
* Paging query request for Sink
@@ -49,6 +50,9 @@ public class SinkPageRequest extends PageRequest {
@ApiModelProperty(value = "Status")
private Integer status;
+ @ApiModelProperty(value = "Sink status list")
+ private List<Integer> statusList;
+
@ApiModelProperty("Inlong cluster name")
private String inlongClusterName;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourcePageRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourcePageRequest.java
index d17a85a62..c15eeb1a4 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourcePageRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourcePageRequest.java
@@ -24,6 +24,7 @@ import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.pojo.common.PageRequest;
import javax.validation.constraints.NotBlank;
+import java.util.List;
/**
* Paging query request for Source
@@ -55,4 +56,7 @@ public class SourcePageRequest extends PageRequest {
@ApiModelProperty(value = "Status")
private Integer status;
+ @ApiModelProperty(value = "Source status list")
+ private List<Integer> statusList;
+
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
index b75881001..9a8f0763b 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
@@ -26,6 +26,8 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.pojo.common.PageRequest;
+import java.util.List;
+
/**
* Inlong stream paging query conditions
*/
@@ -46,6 +48,9 @@ public class InlongStreamPageRequest extends PageRequest {
@ApiModelProperty(value = "status")
private Integer status;
+ @ApiModelProperty(value = "Stream status list")
+ private List<Integer> statusList;
+
@ApiModelProperty(value = "Current user", hidden = true)
private String currentUser;
