Skip to content

Commit 2867f39

Browse files
committed
refactor: enhance CleaningTaskService and related components with validation and repository updates
1 parent 871ba57 commit 2867f39

42 files changed

Lines changed: 522 additions & 346 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

backend/services/data-cleaning-service/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<artifactId>data-management-service</artifactId>
2828
<version>${project.version}</version>
2929
</dependency>
30+
<dependency>
31+
<groupId>com.datamate</groupId>
32+
<artifactId>operator-market-service</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
3035
<dependency>
3136
<groupId>org.springframework.boot</groupId>
3237
<artifactId>spring-boot-starter-test</artifactId>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package com.datamate.cleaning;
22

3-
import org.springframework.boot.autoconfigure.SpringBootApplication;
3+
import org.springframework.context.annotation.ComponentScan;
44
import org.springframework.scheduling.annotation.EnableAsync;
55
import org.springframework.scheduling.annotation.EnableScheduling;
66

77
/**
88
* 数据归集服务配置类
99
* 基于DataX的数据归集和同步服务,支持多种数据源的数据采集和归集
1010
*/
11-
@SpringBootApplication
1211
@EnableAsync
1312
@EnableScheduling
13+
@ComponentScan(basePackages = {
14+
"com.datamate.cleaning"
15+
})
1416
public class DataCleaningServiceConfiguration {
1517
// Configuration class for JAR packaging - no main method needed
1618
}

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/application/CleaningTaskService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.datamate.cleaning.domain.repository.CleaningTaskRepository;
1111
import com.datamate.cleaning.domain.repository.OperatorInstanceRepository;
1212

13+
import com.datamate.cleaning.infrastructure.validator.CleanTaskValidator;
1314
import com.datamate.cleaning.interfaces.dto.CleaningProcess;
1415
import com.datamate.cleaning.interfaces.dto.CleaningTaskDto;
1516
import com.datamate.cleaning.interfaces.dto.CreateCleaningTaskRequest;
@@ -59,6 +60,8 @@ public class CleaningTaskService {
5960

6061
private final DatasetFileApplicationService datasetFileService;
6162

63+
private final CleanTaskValidator cleanTaskValidator;
64+
6265
private final String DATASET_PATH = "/dataset";
6366

6467
private final String FLOW_PATH = "/flow";
@@ -80,6 +83,9 @@ public int countTasks(String status, String keywords) {
8083

8184
@Transactional
8285
public CleaningTaskDto createTask(CreateCleaningTaskRequest request) {
86+
cleanTaskValidator.checkNameDuplication(request.getName());
87+
cleanTaskValidator.checkInputAndOutput(request.getInstance());
88+
8389
CreateDatasetRequest createDatasetRequest = new CreateDatasetRequest();
8490
createDatasetRequest.setName(request.getDestDatasetName());
8591
createDatasetRequest.setDatasetType(DatasetType.valueOf(request.getDestDatasetType()));

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/application/CleaningTemplateService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.datamate.cleaning.domain.repository.OperatorInstanceRepository;
66
import com.datamate.cleaning.interfaces.dto.*;
77
import com.datamate.cleaning.domain.model.entity.TemplateWithInstance;
8+
import com.datamate.operator.domain.repository.OperatorRepository;
9+
import com.datamate.operator.interfaces.dto.OperatorDto;
810
import lombok.RequiredArgsConstructor;
911
import org.apache.commons.lang3.StringUtils;
1012
import org.springframework.stereotype.Service;
@@ -24,8 +26,10 @@ public class CleaningTemplateService {
2426

2527
private final OperatorInstanceRepository operatorInstanceRepo;
2628

29+
private final OperatorRepository operatorRepo;
30+
2731
public List<CleaningTemplateDto> getTemplates(String keywords) {
28-
List<OperatorDto> allOperators = operatorInstanceRepo.findAllOperators();
32+
List<OperatorDto> allOperators = operatorRepo.findAllOperators();
2933
Map<String, OperatorDto> operatorsMap = allOperators.stream()
3034
.collect(Collectors.toMap(OperatorDto::getId, Function.identity()));
3135
List<TemplateWithInstance> allTemplates = cleaningTemplateRepo.findAllTemplates(keywords);

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/common/exception/CleanErrorCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public enum CleanErrorCode implements ErrorCode {
1212
*/
1313
DUPLICATE_TASK_NAME("clean.0001", "清洗任务名称重复"),
1414

15-
CREATE_DATASET_FAILED("clean.0002", "创建数据集失败");
15+
IN_AND_OUT_NOT_MATCH("clean.0002", "算子输入输出不匹配");
1616

1717
private final String code;
1818
private final String message;

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/CreateDatasetRequest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/DatasetFileResponse.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/DatasetResponse.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/DatasetTypeResponse.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/PagedDatasetFileResponse.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)