This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 688e586bf8 [INLONG-11759][Dashboard][Manager] Improve data
synchronization page query (#11769)
688e586bf8 is described below
commit 688e586bf82367bdb7b337837772bfcd4346cd2c
Author: James Zow <james...@163.com>
AuthorDate: Fri Feb 21 14:05:03 2025 +0800
[INLONG-11759][Dashboard][Manager] Improve data synchronization page query
(#11769)
Co-authored-by: James Zow <v_jweiz...@tencent.com>
---
inlong-dashboard/index.html | 2 +-
inlong-dashboard/src/ui/pages/SynchronizeDashboard/index.tsx | 5 +++--
.../inlong/manager/dao/mapper/InlongGroupEntityMapper.java | 3 ++-
.../src/main/resources/mappers/InlongGroupEntityMapper.xml | 3 +++
.../apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java | 3 +++
.../inlong/manager/service/group/InlongGroupService.java | 6 ++++--
.../inlong/manager/service/group/InlongGroupServiceImpl.java | 4 ++--
.../inlong/manager/web/controller/InlongGroupController.java | 10 +++++++---
8 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/inlong-dashboard/index.html b/inlong-dashboard/index.html
index 9ee3bdd11a..9139aa76de 100644
--- a/inlong-dashboard/index.html
+++ b/inlong-dashboard/index.html
@@ -22,7 +22,7 @@ under the License.
<html lang="en">
<head>
<meta charset="UTF-8" />
- <link rel="icon" href="favicon.ico" />
+ <link rel="icon" href="/public/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>InLong</title>
</head>
diff --git a/inlong-dashboard/src/ui/pages/SynchronizeDashboard/index.tsx
b/inlong-dashboard/src/ui/pages/SynchronizeDashboard/index.tsx
index 33fc2202c6..19517accaf 100644
--- a/inlong-dashboard/src/ui/pages/SynchronizeDashboard/index.tsx
+++ b/inlong-dashboard/src/ui/pages/SynchronizeDashboard/index.tsx
@@ -39,7 +39,8 @@ const Comp: React.FC = () => {
const [options, setOptions] = useState({
pageSize: defaultSize,
pageNum: 1,
- inlongGroupMode: 1,
+ inlongGroupMode: null,
+ mqType: 'NONE',
});
const [groupLogs, setGroupLogs] = useState({
@@ -52,6 +53,7 @@ const Comp: React.FC = () => {
url: '/group/countByStatus',
params: {
inlongGroupMode: options.inlongGroupMode,
+ mqType: 'NONE',
},
});
@@ -214,7 +216,6 @@ const Comp: React.FC = () => {
rowKey: 'id',
dataSource: data?.list?.map(item => ({
...item,
- inlongGroupMode: options.inlongGroupMode,
})),
pagination,
loading,
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
index 1c9984e284..a5cbf8e501 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
@@ -43,7 +43,8 @@ public interface InlongGroupEntityMapper {
InlongGroupEntity selectByPrimaryKey(Integer id);
List<Map<String, Object>> countGroupByUser(@Param(value = "username")
String username,
- @Param(value = "inlongGroupMode") Integer inlongGroupMode);
+ @Param(value = "inlongGroupMode") Integer inlongGroupMode,
+ @Param(value = "mqType") String mqType);
InlongGroupEntity selectByGroupId(String groupId);
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 0f8445f0a0..86aea10da5 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -230,6 +230,9 @@
<if test="inlongGroupMode != null">
and inlong_group_mode = #{inlongGroupMode,jdbcType=TINYINT}
</if>
+ <if test="mqType != null and mqType != ''">
+ and mq_type = #{mqType,jdbcType=VARCHAR}
+ </if>
and (creator = #{username,jdbcType=VARCHAR} or
find_in_set(#{username,jdbcType=VARCHAR}, in_charges))
</where>
group by status
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
index 166bd41294..d9b79b0ee8 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupBriefInfo.java
@@ -46,6 +46,9 @@ public class InlongGroupBriefInfo {
@ApiModelProperty(value = "Inlong group id")
private String inlongGroupId;
+ @ApiModelProperty(value = "Inlong group mode")
+ private Integer inlongGroupMode;
+
@ApiModelProperty(value = "Inlong group name")
private String name;
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
index 382f402fd7..e3529728aa 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
@@ -91,14 +91,16 @@ public interface InlongGroupService {
* Query the group information of each status of the current user
*
* @param operator name of operator
+ * @param inlongGroupMode inlong group mode
+ * @param mqType MQ Type
* @return inlong group status statistics
*/
- InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode);
+ InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode, String mqType);
/**
* According to the group id, query the topic to which it belongs
*
- * @param groupId Inlong group id
+ * @param groupId inlong group id
* @return Topic information
* @apiNote TubeMQ corresponds to the group, only 1 topic
*/
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index d75929aff7..e9cf001f62 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -352,9 +352,9 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
}
@Override
- public InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode) {
+ public InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode, String mqType) {
InlongGroupCountResponse countVO = new InlongGroupCountResponse();
- List<Map<String, Object>> statusCount =
groupMapper.countGroupByUser(operator, inlongGroupMode);
+ List<Map<String, Object>> statusCount =
groupMapper.countGroupByUser(operator, inlongGroupMode, mqType);
for (Map<String, Object> map : statusCount) {
int status = (Integer) map.get("status");
long count = (Long) map.get("count");
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
index 274abe99a9..4319cbad35 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -111,11 +111,15 @@ public class InlongGroupController {
@RequestMapping(value = "/group/countByStatus", method = RequestMethod.GET)
@ApiOperation(value = "Count inlong group status for current user")
- @ApiImplicitParam(name = "inlongGroupMode", dataTypeClass = Integer.class,
defaultValue = "0")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "inlongGroupMode", dataTypeClass =
Integer.class),
+ @ApiImplicitParam(name = "mqType", dataTypeClass = String.class)
+ })
public Response<InlongGroupCountResponse> countGroupByUser(
- @RequestParam(required = false, defaultValue = "0") Integer
inlongGroupMode) {
+ @RequestParam(required = false) Integer inlongGroupMode,
+ @RequestParam(required = false) String mqType) {
String operator = LoginUserUtils.getLoginUser().getName();
- return Response.success(groupService.countGroupByUser(operator,
inlongGroupMode));
+ return Response.success(groupService.countGroupByUser(operator,
inlongGroupMode, mqType));
}
@GetMapping(value = "/group/getTopic/{groupId}")
