[incubator-inlong] branch master updated: [INLONG-2018][InLong-Manager] After approving data access, some failures happen and the data access is always in the state of configuration (#2019)

[gosonzhang]

This is an automated email from the ASF dual-hosted git repository.

gosonzhang 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 4738720  [INLONG-2018][InLong-Manager] After approving data access, 
some failures happen and the data access is always in the state of 
configuration (#2019)
4738720 is described below

commit 4738720f4b2a44e8b40d28b18eeafc67da192f29
Author: healchow <healc...@gmail.com>
AuthorDate: Fri Dec 17 15:54:16 2021 +0800

    [INLONG-2018][InLong-Manager] After approving data access, some failures 
happen and the data access is always in the state of configuration (#2019)
---
 .../inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java      | 5 +++--
 .../src/main/resources/mappers/SourceFileDetailEntityMapper.xml      | 2 +-
 .../inlong/manager/service/core/impl/DataStreamServiceImpl.java      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
 
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
index 067b53e..05d77e2 100644
--- 
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
+++ 
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
@@ -45,11 +45,12 @@ public interface SourceFileDetailEntityMapper {
      * @param groupId Business group id
      * @param streamId Data stream id
      * @param status Modified status
-     * @param operator Edit person's name
+     * @param modifier Modifier name
      * @return whether succeed
      * @apiNote If stream id is null, update all data stream associated with 
group id
      */
-    boolean updateStatusAfterApprove(String groupId, String streamId, Integer 
status, String operator);
+    boolean updateStatusAfterApprove(@Param("groupId") String groupId, 
@Param("streamId") String streamId,
+            @Param("status") Integer status, @Param("modifier") String 
modifier);
 
     List<SourceFileDetailEntity> selectByCondition(SourceFileDetailPageRequest 
request);
 
diff --git 
a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
 
b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
index e83c7a1..5280ac2 100644
--- 
a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
+++ 
b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
@@ -376,7 +376,7 @@
         update source_file_detail
         <set>
             status = #{status, jdbcType=INTEGER},
-            modifier = #{operator, jdbcType=VARCHAR}
+            modifier = #{modifier, jdbcType=VARCHAR}
         </set>
         <where>
             inlong_group_id = #{groupId, jdbcType=VARCHAR}
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
index c3d8d37..e81587d 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
@@ -620,7 +620,7 @@ public class DataStreamServiceImpl implements 
DataStreamService {
         // businessMapper.updateStatusByIdentifier(groupId, status, operator);
         streamMapper.updateStatusByIdentifier(groupId, streamId, status, 
operator);
 
-        LOGGER.info("success to update stream after approve for groupId={}", 
groupId);
+        LOGGER.info("success to update stream after approve for groupId=" + 
groupId + ", streamId=" + streamId);
         return true;
     }