[incubator-inlong] branch master updated: [INLONG-3208][Manager] Support batch query by inlong group name and inlong group id (#3217)

[he...@apache.org]

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/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new c13806e  [INLONG-3208][Manager] Support batch query by inlong group name and inlong group id (#3217)
c13806e is described below

commit c13806ef390ca5ee2e1abf45a4e70bbd77c87f29
Author: yunqingmoswu <44...@users.noreply.github.com>
AuthorDate: Fri Mar 18 13:28:45 2022 +0800

    [INLONG-3208][Manager] Support batch query by inlong group name and inlong group id (#3217)
---
 .../manager/common/pojo/group/InlongGroupPageRequest.java  |  8 ++++++++
 .../src/main/resources/mappers/InlongGroupEntityMapper.xml | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
index e3a5f6f..72a19b3 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
@@ -23,6 +23,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.inlong.manager.common.beans.PageRequest;
 
+import java.util.List;
+
 /**
  * Inlong group query request
  */
@@ -34,6 +36,12 @@ public class InlongGroupPageRequest extends PageRequest {
     @ApiModelProperty(value = "Keywords")
     private String keyWord;
 
+    @ApiModelProperty(value = "Inlong group name list")
+    private List<String> nameList;
+
+    @ApiModelProperty(value = "Inlong group id list")
+    private List<String> groupIdList;
+
     @ApiModelProperty(value = "MQ resource object")
     private String middlewareType;
 
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 965dfc8..1dec367 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -113,7 +113,19 @@
                 )
             </if>
             <if test="keyWord != null and keyWord != ''">
-                and (inlong_group_id like CONCAT('%',#{keyWord},'%') or id like CONCAT('%',#{keyWord},'%'))
+                and (inlong_group_id like CONCAT('%',#{keyWord},'%') or name like CONCAT('%',#{keyWord},'%'))
+            </if>
+            <if test="groupIdList != null and groupIdList.size() > 0">
+                and inlong_group_id in
+                <foreach collection="groupIdList" item="inlongGroupId" index="index" open="(" close=")" separator=",">
+                    #{inlongGroupId}
+                </foreach>
+            </if>
+            <if test="nameList != null and nameList.size() > 0">
+                and name in
+                <foreach collection="nameList" item="name" index="index" open="(" close=")" separator=",">
+                    #{name}
+                </foreach>
             </if>
             <if test="middlewareType != null and middlewareType != ''">
                 and middleware_type = #{middlewareType, jdbcType=VARCHAR}