Skip to content

Commit c90b73d

Browse files
chenghh-9609chenghh-9609
committed
Merge branch 'develop_930' of github.com:ModelEngine-Group/data-platform into develop_930
2 parents d42fd86 + 0661d42 commit c90b73d

File tree

32 files changed

+765
-213
lines changed

32 files changed

+765
-213
lines changed

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ override INSTALLER = docker
66
build-%:
77
$(MAKE) $*-docker-build
88

9+
.PHONY: build
10+
build: backend-docker-build frontend-docker-build runtime-docker-build
11+
912
.PHONY: install-%
1013
install-%:
1114
@echo "Choose a deployment method:"

‎backend/pom.xml‎

Lines changed: 59 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<lombok.version>1.18.32</lombok.version>
3636
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
3737
<poi.version>5.4.0</poi.version>
38+
<log4j2.version>2.21.1</log4j2.version>
3839
</properties>
3940

4041
<modules>
@@ -99,84 +100,103 @@
99100
</dependency>
100101

101102
<dependency>
102-
<groupId>jakarta.persistence</groupId>
103-
<artifactId>jakarta.persistence-api</artifactId>
104-
<version>${jakarta.persistence.version}</version>
103+
<groupId>jakarta.persistence</groupId>
104+
<artifactId>jakarta.persistence-api</artifactId>
105+
<version>${jakarta.persistence.version}</version>
105106
</dependency>
106107

107108
<dependency>
108-
<groupId>org.springframework.boot</groupId>
109-
<artifactId>spring-boot-starter-data-jpa</artifactId>
110-
<version>${spring-boot.version}</version>
109+
<groupId>org.springframework.boot</groupId>
110+
<artifactId>spring-boot-starter-data-jpa</artifactId>
111+
<version>${spring-boot.version}</version>
111112
</dependency>
112113
<!-- MyBatis version alignment -->
113114
<dependency>
114-
<groupId>com.baomidou</groupId>
115-
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
116-
<version>${mybatis-plus.version}</version>
115+
<groupId>com.baomidou</groupId>
116+
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
117+
<version>${mybatis-plus.version}</version>
117118
</dependency>
118119

119120
<dependency>
120-
<groupId>org.mapstruct</groupId>
121-
<artifactId>mapstruct</artifactId>
122-
<version>${mapstruct.version}</version>
121+
<groupId>org.mapstruct</groupId>
122+
<artifactId>mapstruct</artifactId>
123+
<version>${mapstruct.version}</version>
123124
</dependency>
124125

125126
<dependency>
126-
<groupId>org.projectlombok</groupId>
127-
<artifactId>lombok</artifactId>
128-
<version>${lombok.version}</version>
127+
<groupId>org.projectlombok</groupId>
128+
<artifactId>lombok</artifactId>
129+
<version>${lombok.version}</version>
129130
</dependency>
130131

131132
<dependency>
132-
<groupId>mysql</groupId>
133-
<artifactId>mysql-connector-java</artifactId>
134-
<version>${mysql.version}</version>
133+
<groupId>mysql</groupId>
134+
<artifactId>mysql-connector-java</artifactId>
135+
<version>${mysql.version}</version>
135136
</dependency>
136137

137138
<dependency>
138-
<groupId>org.apache.poi</groupId>
139-
<artifactId>poi</artifactId>
140-
<version>${poi.version}</version>
139+
<groupId>org.apache.poi</groupId>
140+
<artifactId>poi</artifactId>
141+
<version>${poi.version}</version>
141142
</dependency>
142143
</dependencies>
143144
</dependencyManagement>
144145

145146
<dependencies>
146147
<dependency>
147-
<groupId>org.springframework.boot</groupId>
148-
<artifactId>spring-boot-starter-web</artifactId>
149-
<version>${spring-boot.version}</version>
148+
<groupId>org.springframework.boot</groupId>
149+
<artifactId>spring-boot-starter-web</artifactId>
150+
<version>${spring-boot.version}</version>
151+
<exclusions>
152+
<exclusion>
153+
<groupId>org.springframework.boot</groupId>
154+
<artifactId>spring-boot-starter-logging</artifactId>
155+
</exclusion>
156+
</exclusions>
157+
</dependency>
158+
159+
<dependency>
160+
<groupId>org.springframework.boot</groupId>
161+
<artifactId>spring-boot-starter</artifactId>
162+
<version>${spring-boot.version}</version>
163+
<exclusions>
164+
<exclusion>
165+
<groupId>org.springframework.boot</groupId>
166+
<artifactId>spring-boot-starter-logging</artifactId>
167+
</exclusion>
168+
</exclusions>
150169
</dependency>
151170

152171
<dependency>
153-
<groupId>org.springframework.boot</groupId>
154-
<artifactId>spring-boot-starter</artifactId>
155-
<version>${spring-boot.version}</version>
172+
<groupId>com.baomidou</groupId>
173+
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
174+
<version>${mybatis-plus.version}</version>
156175
</dependency>
157176

177+
<!-- Log4j2 API -->
158178
<dependency>
159-
<groupId>com.baomidou</groupId>
160-
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
161-
<version>${mybatis-plus.version}</version>
179+
<groupId>org.springframework.boot</groupId>
180+
<artifactId>spring-boot-starter-log4j2</artifactId>
181+
<version>${spring-boot.version}</version>
162182
</dependency>
163183

164184
<dependency>
165-
<groupId>org.projectlombok</groupId>
166-
<artifactId>lombok</artifactId>
167-
<version>${lombok.version}</version>
185+
<groupId>org.projectlombok</groupId>
186+
<artifactId>lombok</artifactId>
187+
<version>${lombok.version}</version>
168188
</dependency>
169189

170190
<dependency>
171-
<groupId>org.mapstruct</groupId>
172-
<artifactId>mapstruct</artifactId>
173-
<version>${mapstruct.version}</version>
191+
<groupId>org.mapstruct</groupId>
192+
<artifactId>mapstruct</artifactId>
193+
<version>${mapstruct.version}</version>
174194
</dependency>
175195

176196
<dependency>
177-
<groupId>org.apache.poi</groupId>
178-
<artifactId>poi</artifactId>
179-
<version>${poi.version}</version>
197+
<groupId>org.apache.poi</groupId>
198+
<artifactId>poi</artifactId>
199+
<version>${poi.version}</version>
180200
</dependency>
181201
</dependencies>
182202

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -80,31 +80,6 @@
8080
<groupId>org.springframework.boot</groupId>
8181
<artifactId>spring-boot-maven-plugin</artifactId>
8282
</plugin>
83-
<plugin>
84-
<groupId>org.openapitools</groupId>
85-
<artifactId>openapi-generator-maven-plugin</artifactId>
86-
<version>6.6.0</version>
87-
<executions>
88-
<execution>
89-
<goals>
90-
<goal>generate</goal>
91-
</goals>
92-
<configuration>
93-
<inputSpec>${project.basedir}/../../openapi/specs/data-cleaning.yaml</inputSpec>
94-
<generatorName>spring</generatorName>
95-
<output>${project.build.directory}/generated-sources/openapi</output>
96-
<apiPackage>com.dataengine.cleaning.interfaces.api</apiPackage>
97-
<modelPackage>com.dataengine.cleaning.interfaces.dto</modelPackage>
98-
<configOptions>
99-
<interfaceOnly>true</interfaceOnly>
100-
<useTags>true</useTags>
101-
<useSpringBoot3>true</useSpringBoot3>
102-
<documentationProvider>springdoc</documentationProvider>
103-
</configOptions>
104-
</configuration>
105-
</execution>
106-
</executions>
107-
</plugin>
10883
</plugins>
10984
</build>
11085
</project>

‎backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/interfaces/api/CleaningTaskController.java‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,40 @@
44
import com.dataengine.cleaning.interfaces.dto.CreateCleaningTaskRequest;
55
import com.dataengine.cleaning.application.service.CleaningTaskService;
66

7-
import org.springframework.beans.factory.annotation.Autowired;
7+
import com.dataengine.common.interfaces.PagedResponse;
8+
import com.dataengine.common.interfaces.Response;
9+
import lombok.RequiredArgsConstructor;
810
import org.springframework.http.ResponseEntity;
911
import org.springframework.web.bind.annotation.*;
1012

11-
import java.util.List;
12-
1313
@RestController
14-
public class CleaningTaskController implements CleaningTaskApi {
15-
16-
@Autowired
17-
private CleaningTaskService cleaningTaskService;
18-
19-
@Override
20-
public ResponseEntity<List<CleaningTask>> cleaningTasksGet(Integer page, Integer size, String status,
21-
String keywords) {
22-
return ResponseEntity.ok(cleaningTaskService.getTasks(status, keywords, page, size));
14+
@RequestMapping("/cleaning/tasks")
15+
@RequiredArgsConstructor
16+
public class CleaningTaskController {
17+
private final CleaningTaskService cleaningTaskService;
18+
19+
@GetMapping
20+
public ResponseEntity<Response<PagedResponse<CleaningTask>>> cleaningTasksGet(
21+
@RequestParam("page") Integer page,
22+
@RequestParam("size") Integer size, @RequestParam(value = "status", required = false) String status,
23+
@RequestParam(value = "keywords", required = false) String keywords) {
24+
return ResponseEntity.ok(Response.ok(PagedResponse.of(cleaningTaskService.getTasks(status, keywords, page,
25+
size))));
2326
}
2427

25-
@Override
26-
public ResponseEntity<CleaningTask> cleaningTasksPost(CreateCleaningTaskRequest request) {
27-
return ResponseEntity.ok(cleaningTaskService.createTask(request));
28+
@PostMapping
29+
public ResponseEntity<Response<CleaningTask>> cleaningTasksPost(@RequestBody CreateCleaningTaskRequest request) {
30+
return ResponseEntity.ok(Response.ok(cleaningTaskService.createTask(request)));
2831
}
2932

30-
@Override
31-
public ResponseEntity<CleaningTask> cleaningTasksTaskIdGet(String taskId) {
32-
return ResponseEntity.ok(cleaningTaskService.getTask(taskId));
33+
@GetMapping("/{taskId}")
34+
public ResponseEntity<Response<CleaningTask>> cleaningTasksTaskIdGet(@PathVariable("taskId") String taskId) {
35+
return ResponseEntity.ok(Response.ok(cleaningTaskService.getTask(taskId)));
3336
}
3437

35-
@Override
36-
public ResponseEntity<Void> cleaningTasksTaskIdDelete(String taskId) {
38+
@DeleteMapping("/{taskId}")
39+
public ResponseEntity<Response<Object>> cleaningTasksTaskIdDelete(@PathVariable("taskId") String taskId) {
3740
cleaningTaskService.deleteTask(taskId);
38-
return ResponseEntity.noContent().build();
41+
return ResponseEntity.ok(Response.ok(null));
3942
}
4043
}

‎backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/interfaces/api/CleaningTemplateController.java‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,52 @@
55
import com.dataengine.cleaning.interfaces.dto.CleaningTemplate;
66
import com.dataengine.cleaning.interfaces.dto.CreateCleaningTemplateRequest;
77
import com.dataengine.cleaning.interfaces.dto.UpdateCleaningTemplateRequest;
8-
import org.springframework.beans.factory.annotation.Autowired;
8+
import com.dataengine.common.interfaces.PagedResponse;
9+
import com.dataengine.common.interfaces.Response;
10+
import lombok.RequiredArgsConstructor;
911
import org.springframework.http.ResponseEntity;
10-
import org.springframework.web.bind.annotation.*;
12+
import org.springframework.web.bind.annotation.DeleteMapping;
13+
import org.springframework.web.bind.annotation.GetMapping;
14+
import org.springframework.web.bind.annotation.PathVariable;
15+
import org.springframework.web.bind.annotation.PostMapping;
16+
import org.springframework.web.bind.annotation.PutMapping;
17+
import org.springframework.web.bind.annotation.RequestBody;
18+
import org.springframework.web.bind.annotation.RequestMapping;
19+
import org.springframework.web.bind.annotation.RestController;
1120

12-
import java.util.List;
1321

1422
@RestController
15-
public class CleaningTemplateController implements CleaningTemplateApi {
16-
17-
@Autowired
18-
private CleaningTemplateService cleaningTemplateService;
19-
20-
@Override
21-
public ResponseEntity<List<CleaningTemplate>> cleaningTemplatesGet() {
22-
return ResponseEntity.ok(cleaningTemplateService.getTemplates());
23+
@RequestMapping("/cleaning/templates")
24+
@RequiredArgsConstructor
25+
public class CleaningTemplateController {
26+
private final CleaningTemplateService cleaningTemplateService;
27+
28+
@GetMapping
29+
public ResponseEntity<Response<PagedResponse<CleaningTemplate>>> cleaningTemplatesGet() {
30+
return ResponseEntity.ok(Response.ok(PagedResponse.of(cleaningTemplateService.getTemplates())));
2331
}
2432

25-
@Override
26-
public ResponseEntity<CleaningTemplate> cleaningTemplatesPost(CreateCleaningTemplateRequest request) {
27-
return ResponseEntity.ok(cleaningTemplateService.createTemplate(request));
33+
@PostMapping
34+
public ResponseEntity<Response<CleaningTemplate>> cleaningTemplatesPost(
35+
@RequestBody CreateCleaningTemplateRequest request) {
36+
return ResponseEntity.ok(Response.ok(cleaningTemplateService.createTemplate(request)));
2837
}
2938

30-
@Override
31-
public ResponseEntity<CleaningTemplate> cleaningTemplatesTemplateIdGet(String templateId) {
32-
return ResponseEntity.ok(cleaningTemplateService.getTemplate(templateId));
39+
@GetMapping("/{templateId}")
40+
public ResponseEntity<Response<CleaningTemplate>> cleaningTemplatesTemplateIdGet(
41+
@PathVariable("templateId") String templateId) {
42+
return ResponseEntity.ok(Response.ok(cleaningTemplateService.getTemplate(templateId)));
3343
}
3444

35-
@Override
36-
public ResponseEntity<CleaningTemplate> cleaningTemplatesTemplateIdPut(String templateId,
37-
UpdateCleaningTemplateRequest request) {
38-
return ResponseEntity.ok(cleaningTemplateService.updateTemplate(templateId, request));
45+
@PutMapping("/{templateId}")
46+
public ResponseEntity<Response<CleaningTemplate>> cleaningTemplatesTemplateIdPut(
47+
@PathVariable("templateId") String templateId, @RequestBody UpdateCleaningTemplateRequest request) {
48+
return ResponseEntity.ok(Response.ok(cleaningTemplateService.updateTemplate(templateId, request)));
3949
}
4050

41-
@Override
42-
public ResponseEntity<Void> cleaningTemplatesTemplateIdDelete(String templateId) {
51+
@DeleteMapping("/{templateId}")
52+
public ResponseEntity<Response<Object>> cleaningTemplatesTemplateIdDelete(
53+
@PathVariable("templateId") String templateId) {
4354
cleaningTemplateService.deleteTemplate(templateId);
4455
return ResponseEntity.noContent().build();
4556
}

‎backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/interfaces/dto/CleaningProcess.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.dataengine.cleaning.interfaces.dto;
2+
3+
4+
import lombok.Getter;
5+
import lombok.Setter;
6+
7+
/**
8+
* CleaningProcess
9+
*/
10+
11+
@Getter
12+
@Setter
13+
public class CleaningProcess {
14+
private Float process;
15+
16+
private Integer totalFileNum;
17+
18+
private Integer finishedFileNum;
19+
}
20+

0 commit comments

Comments
 (0)