(inlong) branch master updated: [INLONG-11163][Manager] Fix the problem of adding dataaddtask failed (#11164)

[aloyszhang]

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

aloyszhang 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 0a884d9244 [INLONG-11163][Manager] Fix the problem of adding 
dataaddtask failed (#11164)
0a884d9244 is described below

commit 0a884d9244ce3a7d09cc993f0ffbdaee7030b301
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Mon Sep 23 14:06:08 2024 +0800

    [INLONG-11163][Manager] Fix the problem of adding dataaddtask failed 
(#11164)
---
 .../apache/inlong/manager/service/source/file/FileSourceOperator.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/file/FileSourceOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/file/FileSourceOperator.java
index 60db39e546..fa10f8081f 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/file/FileSourceOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/file/FileSourceOperator.java
@@ -35,7 +35,6 @@ import org.apache.inlong.manager.pojo.stream.StreamField;
 import org.apache.inlong.manager.service.source.AbstractSourceOperator;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -114,7 +113,6 @@ public class FileSourceOperator extends 
AbstractSourceOperator {
         StreamSourceEntity sourceEntity = 
sourceMapper.selectById(request.getSourceId());
         try {
             List<StreamSourceEntity> dataAddTaskList = 
sourceMapper.selectByTaskMapId(sourceEntity.getId());
-            int dataAddTaskSize = CollectionUtils.isNotEmpty(dataAddTaskList) 
? dataAddTaskList.size() : 0;
             FileSourceDTO dto = 
FileSourceDTO.getFromJson(sourceEntity.getExtParams());
             dto.setStartTime(sourceRequest.getStartTime());
             dto.setEndTime(sourceRequest.getEndTime());
@@ -125,7 +123,7 @@ public class FileSourceOperator extends 
AbstractSourceOperator {
                     CommonBeanUtils.copyProperties(sourceEntity, 
StreamSourceEntity::new);
             dataAddTaskEntity.setId(null);
             dataAddTaskEntity.setSourceName(
-                    sourceEntity.getSourceName() + "-" + (dataAddTaskSize + 1) 
+ "-" + sourceEntity.getId());
+                    sourceEntity.getSourceName() + "-" + 
request.getAuditVersion() + "-" + sourceEntity.getId());
             
dataAddTaskEntity.setExtParams(objectMapper.writeValueAsString(dto));
             dataAddTaskEntity.setTaskMapId(sourceEntity.getId());
             Integer id = sourceMapper.insert(dataAddTaskEntity);