(inlong) branch master updated: [INLONG-11891][Manager] Support querying topic audit information (#11893)

[dockerzhang]

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 fa070e4c1d [INLONG-11891][Manager] Support querying topic audit 
information (#11893)
fa070e4c1d is described below

commit fa070e4c1d72d2f7acb7ef126c88f496d962a083
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Tue Jun 17 14:54:50 2025 +0800

    [INLONG-11891][Manager] Support querying topic audit information (#11893)
---
 .../inlong/manager/pojo/audit/AuditRequest.java    |  3 +++
 .../manager/service/audit/AuditRunnable.java       |  6 ++++++
 .../service/core/impl/AuditServiceImpl.java        | 22 +++++++++++++---------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditRequest.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditRequest.java
index b3d685f0b3..d55b1b392f 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditRequest.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditRequest.java
@@ -49,6 +49,9 @@ public class AuditRequest {
     @ApiModelProperty(value = "sink id")
     private Integer sinkId;
 
+    @ApiModelProperty(value = "sink type")
+    private String sinkType;
+
     @ApiModelProperty(value = "query start date, format by 'yyyy-MM-dd'", 
required = true, example = "2022-01-01")
     private String startDate;
 
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
index 25f4a3789d..72c4325f04 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/audit/AuditRunnable.java
@@ -108,6 +108,9 @@ public class AuditRunnable implements Runnable {
         try {
             String start = request.getStartDate();
             String end = request.getEndDate();
+            if (StringUtils.isBlank(streamId)) {
+                streamId = "*";
+            }
             if (StringUtils.isBlank(request.getEndDate())) {
                 end = 
SECOND_DATE_FORMATTER.parseDateTime(request.getEndDate()).plusDays(1).toString(SECOND_FORMAT);
             }
@@ -143,6 +146,9 @@ public class AuditRunnable implements Runnable {
     private List<AuditInfo> getAuditInfoList(AuditRequest request, String 
groupId, String streamId, String auditId) {
         List<AuditInfo> auditSet = new ArrayList<>();
         try {
+            if (StringUtils.isBlank(streamId)) {
+                streamId = "*";
+            }
             String start = 
DAY_DATE_FORMATTER.parseDateTime(request.getStartDate()).toString(SECOND_FORMAT);
             String end = 
DAY_DATE_FORMATTER.parseDateTime(request.getStartDate()).plusDays(1).toString(SECOND_FORMAT);
             if (StringUtils.isNotBlank(request.getEndDate())) {
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
index 0d53a14248..2296618c6c 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
@@ -172,17 +172,21 @@ public class AuditServiceImpl implements AuditService {
         String sourceNodeType = null;
         Integer sinkId = request.getSinkId();
         StreamSinkEntity sinkEntity = null;
-        List<StreamSinkEntity> sinkEntityList = 
sinkEntityMapper.selectByRelatedId(groupId, streamId);
-        if (sinkId != null) {
-            sinkEntity = sinkEntityMapper.selectByPrimaryKey(sinkId);
-        } else if (CollectionUtils.isNotEmpty(sinkEntityList)) {
-            sinkEntity = sinkEntityList.get(0);
+        if (StringUtils.isNotBlank(streamId)) {
+            List<StreamSinkEntity> sinkEntityList = 
sinkEntityMapper.selectByRelatedId(groupId, streamId);
+            if (sinkId != null) {
+                sinkEntity = sinkEntityMapper.selectByPrimaryKey(sinkId);
+            } else if (CollectionUtils.isNotEmpty(sinkEntityList)) {
+                sinkEntity = sinkEntityList.get(0);
+            }
+            // if sink info is existed, get sink type for query audit info.
+            if (sinkEntity != null) {
+                sinkNodeType = sinkEntity.getSinkType();
+            }
+        } else {
+            sinkNodeType = request.getSinkType();
         }
 
-        // if sink info is existed, get sink type for query audit info.
-        if (sinkEntity != null) {
-            sinkNodeType = sinkEntity.getSinkType();
-        }
         Map<String, String> auditIdMap = new HashMap<>();
 
         if (StringUtils.isNotBlank(groupId)) {