Skip to content

Commit a94c028

Browse files
Dallas98Dallas98
authored
Merge pull request #4 from ModelEngine-Group/develop_930_gfl
Develop 930 gfl
2 parents 1f65c0c + f50a248 commit a94c028

File tree

11 files changed

+198
-150
lines changed

11 files changed

+198
-150
lines changed

‎backend/openapi/specs/data-management.yaml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ tags:
2727
description: 标签管理
2828

2929
paths:
30-
/datasets:
30+
/data-management/datasets:
3131
get:
3232
tags: [Dataset]
33+
operationId: getDatasets
3334
summary: 获取数据集列表
3435
description: 分页查询数据集列表，支持按类型、标签等条件筛选
3536
parameters:
@@ -82,6 +83,7 @@ paths:
8283

8384
post:
8485
tags: [Dataset]
86+
operationId: createDataset
8587
summary: 创建数据集
8688
description: 创建新的数据集
8789
requestBody:
@@ -104,9 +106,10 @@ paths:
104106
schema:
105107
$ref: '#/components/schemas/ErrorResponse'
106108

107-
/datasets/{datasetId}:
109+
/data-management/datasets/{datasetId}:
108110
get:
109111
tags: [Dataset]
112+
operationId: getDatasetById
110113
summary: 获取数据集详情
111114
description: 根据ID获取数据集详细信息
112115
parameters:
@@ -133,6 +136,7 @@ paths:
133136
put:
134137
tags: [Dataset]
135138
summary: 更新数据集
139+
operationId: updateDataset
136140
description: 更新数据集信息
137141
parameters:
138142
- name: datasetId
@@ -163,6 +167,7 @@ paths:
163167

164168
delete:
165169
tags: [Dataset]
170+
operationId: deleteDataset
166171
summary: 删除数据集
167172
description: 删除指定的数据集
168173
parameters:
@@ -182,10 +187,11 @@ paths:
182187
schema:
183188
$ref: '#/components/schemas/ErrorResponse'
184189

185-
/datasets/{datasetId}/files:
190+
/data-management/datasets/{datasetId}/files:
186191
get:
187192
tags: [DatasetFile]
188193
summary: 获取数据集文件列表
194+
operationId: getDatasetFiles
189195
description: 分页获取数据集中的文件列表
190196
parameters:
191197
- name: datasetId
@@ -228,6 +234,7 @@ paths:
228234
post:
229235
tags: [DatasetFile]
230236
summary: 上传文件到数据集
237+
operationId: uploadDatasetFile
231238
description: 向指定数据集上传文件
232239
parameters:
233240
- name: datasetId
@@ -258,11 +265,12 @@ paths:
258265
schema:
259266
$ref: '#/components/schemas/DatasetFileResponse'
260267

261-
/datasets/{datasetId}/files/{fileId}:
268+
/data-management/datasets/{datasetId}/files/{fileId}:
262269
get:
263270
tags: [DatasetFile]
264271
summary: 获取文件详情
265272
description: 获取数据集中指定文件的详细信息
273+
operationId: getDatasetFileById
266274
parameters:
267275
- name: datasetId
268276
in: path
@@ -287,6 +295,7 @@ paths:
287295
delete:
288296
tags: [DatasetFile]
289297
summary: 删除文件
298+
operationId: deleteDatasetFile
290299
description: 从数据集中删除指定文件
291300
parameters:
292301
- name: datasetId
@@ -305,9 +314,10 @@ paths:
305314
'204':
306315
description: 删除成功
307316

308-
/datasets/{datasetId}/files/{fileId}/download:
317+
/data-management/datasets/{datasetId}/files/{fileId}/download:
309318
get:
310319
tags: [DatasetFile]
320+
operationId: downloadDatasetFile
311321
summary: 下载文件
312322
description: 下载数据集中的指定文件
313323
parameters:
@@ -332,8 +342,9 @@ paths:
332342
type: string
333343
format: binary
334344

335-
/dataset-types:
345+
/data-management/dataset-types:
336346
get:
347+
operationId: getDatasetTypes
337348
tags: [DatasetType]
338349
summary: 获取数据集类型列表
339350
description: 获取所有支持的数据集类型
@@ -347,9 +358,10 @@ paths:
347358
items:
348359
$ref: '#/components/schemas/DatasetTypeResponse'
349360

350-
/tags:
361+
/data-management/tags:
351362
get:
352363
tags: [Tag]
364+
operationId: getTags
353365
summary: 获取标签列表
354366
description: 获取所有可用的标签
355367
parameters:
@@ -370,6 +382,7 @@ paths:
370382

371383
post:
372384
tags: [Tag]
385+
operationId: createTag
373386
summary: 创建标签
374387
description: 创建新的标签
375388
requestBody:
@@ -386,9 +399,10 @@ paths:
386399
schema:
387400
$ref: '#/components/schemas/TagResponse'
388401

389-
/datasets/{datasetId}/statistics:
402+
/data-management/datasets/{datasetId}/statistics:
390403
get:
391404
tags: [Dataset]
405+
operationId: getDatasetStatistics
392406
summary: 获取数据集统计信息
393407
description: 获取数据集的统计信息（文件数量、大小、完成度等）
394408
parameters:

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/rest/DatasetController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public DatasetController(DatasetApplicationService datasetApplicationService) {
3232
}
3333

3434
@Override
35-
public ResponseEntity<PagedDatasetResponse> datasetsGet(Integer page, Integer size, String type,
36-
String tags, String keyword, String status) {
35+
public ResponseEntity<PagedDatasetResponse> getDatasets(Integer page, Integer size, String type,
36+
String tags, String keyword, String status) {
3737
Pageable pageable = PageRequest.of(page != null ? page : 0, size != null ? size : 20);
3838

3939
List<String> tagList = null;
@@ -58,7 +58,7 @@ public ResponseEntity<PagedDatasetResponse> datasetsGet(Integer page, Integer si
5858
}
5959

6060
@Override
61-
public ResponseEntity<DatasetResponse> datasetsPost(CreateDatasetRequest createDatasetRequest) {
61+
public ResponseEntity<DatasetResponse> createDataset(CreateDatasetRequest createDatasetRequest) {
6262
try {
6363
Long dataSourceId = null;
6464
if (createDatasetRequest.getDataSource() != null) {
@@ -82,7 +82,7 @@ public ResponseEntity<DatasetResponse> datasetsPost(CreateDatasetRequest createD
8282
}
8383

8484
@Override
85-
public ResponseEntity<DatasetResponse> datasetsDatasetIdGet(String datasetId) {
85+
public ResponseEntity<DatasetResponse> getDatasetById(String datasetId) {
8686
try {
8787
Dataset dataset = datasetApplicationService.getDataset(datasetId);
8888
return ResponseEntity.ok(convertToResponse(dataset));
@@ -92,7 +92,7 @@ public ResponseEntity<DatasetResponse> datasetsDatasetIdGet(String datasetId) {
9292
}
9393

9494
@Override
95-
public ResponseEntity<DatasetResponse> datasetsDatasetIdPut(String datasetId, UpdateDatasetRequest updateDatasetRequest) {
95+
public ResponseEntity<DatasetResponse> updateDataset(String datasetId, UpdateDatasetRequest updateDatasetRequest) {
9696
try {
9797
Dataset dataset = datasetApplicationService.updateDataset(
9898
datasetId,
@@ -109,7 +109,7 @@ public ResponseEntity<DatasetResponse> datasetsDatasetIdPut(String datasetId, Up
109109
}
110110

111111
@Override
112-
public ResponseEntity<Void> datasetsDatasetIdDelete(String datasetId) {
112+
public ResponseEntity<Void> deleteDataset(String datasetId) {
113113
try {
114114
datasetApplicationService.deleteDataset(datasetId);
115115
return ResponseEntity.noContent().build();
@@ -119,7 +119,7 @@ public ResponseEntity<Void> datasetsDatasetIdDelete(String datasetId) {
119119
}
120120

121121
@Override
122-
public ResponseEntity<DatasetStatisticsResponse> datasetsDatasetIdStatisticsGet(String datasetId) {
122+
public ResponseEntity<DatasetStatisticsResponse> getDatasetStatistics(String datasetId) {
123123
try {
124124
Map<String, Object> stats = datasetApplicationService.getDatasetStatistics(datasetId);
125125

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/rest/DatasetFileController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public DatasetFileController(DatasetFileApplicationService datasetFileApplicatio
3434
}
3535

3636
@Override
37-
public ResponseEntity<PagedDatasetFileResponse> datasetsDatasetIdFilesGet(String datasetId, Integer page, Integer size,
38-
String fileType, String status) {
37+
public ResponseEntity<PagedDatasetFileResponse> getDatasetFiles(String datasetId, Integer page, Integer size,
38+
String fileType, String status) {
3939
Pageable pageable = PageRequest.of(page != null ? page : 0, size != null ? size : 20);
4040

4141
Page<DatasetFile> filesPage = datasetFileApplicationService.getDatasetFiles(
@@ -56,7 +56,7 @@ public ResponseEntity<PagedDatasetFileResponse> datasetsDatasetIdFilesGet(String
5656
}
5757

5858
@Override
59-
public ResponseEntity<DatasetFileResponse> datasetsDatasetIdFilesPost(String datasetId, MultipartFile file, String description) {
59+
public ResponseEntity<DatasetFileResponse> uploadDatasetFile(String datasetId, MultipartFile file, String description) {
6060
try {
6161
DatasetFile datasetFile = datasetFileApplicationService.uploadFile(
6262
datasetId, file, description, "system");
@@ -70,7 +70,7 @@ public ResponseEntity<DatasetFileResponse> datasetsDatasetIdFilesPost(String dat
7070
}
7171

7272
@Override
73-
public ResponseEntity<DatasetFileResponse> datasetsDatasetIdFilesFileIdGet(String datasetId, String fileId) {
73+
public ResponseEntity<DatasetFileResponse> getDatasetFileById(String datasetId, String fileId) {
7474
try {
7575
DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(datasetId, fileId);
7676
return ResponseEntity.ok(convertToResponse(datasetFile));
@@ -80,7 +80,7 @@ public ResponseEntity<DatasetFileResponse> datasetsDatasetIdFilesFileIdGet(Strin
8080
}
8181

8282
@Override
83-
public ResponseEntity<Void> datasetsDatasetIdFilesFileIdDelete(String datasetId, String fileId) {
83+
public ResponseEntity<Void> deleteDatasetFile(String datasetId, String fileId) {
8484
try {
8585
datasetFileApplicationService.deleteDatasetFile(datasetId, fileId);
8686
return ResponseEntity.noContent().build();
@@ -90,7 +90,7 @@ public ResponseEntity<Void> datasetsDatasetIdFilesFileIdDelete(String datasetId,
9090
}
9191

9292
@Override
93-
public ResponseEntity<Resource> datasetsDatasetIdFilesFileIdDownloadGet(String datasetId, String fileId) {
93+
public ResponseEntity<Resource> downloadDatasetFile(String datasetId, String fileId) {
9494
try {
9595
DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(datasetId, fileId);
9696
Resource resource = datasetFileApplicationService.downloadFile(datasetId, fileId);

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/rest/DatasetTypeController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class DatasetTypeController implements DatasetTypeApi {
1616

1717
@Override
18-
public ResponseEntity<List<DatasetTypeResponse>> datasetTypesGet() {
18+
public ResponseEntity<List<DatasetTypeResponse>> getDatasetTypes() {
1919
// 硬编码的数据集类型，实际应用中可以从数据库获取
2020
List<DatasetTypeResponse> types = Arrays.asList(
2121
createDatasetType("IMAGE", "图像数据集", "用于机器学习的图像数据集", Arrays.asList("jpg", "jpeg", "png", "bmp", "gif")),
@@ -24,7 +24,7 @@ public ResponseEntity<List<DatasetTypeResponse>> datasetTypesGet() {
2424
createDatasetType("VIDEO", "视频数据集", "用于视频分析的视频数据集", Arrays.asList("mp4", "avi", "mov", "mkv")),
2525
createDatasetType("MULTIMODAL", "多模态数据集", "包含多种数据类型的数据集", Arrays.asList("*"))
2626
);
27-
27+
2828
return ResponseEntity.ok(types);
2929
}
3030

@@ -35,7 +35,7 @@ private DatasetTypeResponse createDatasetType(String code, String name, String d
3535
response.setDescription(description);
3636
response.setSupportedFormats(supportedFormats);
3737
response.setIcon(getIconForType(code));
38-
38+
3939
return response;
4040
}
4141

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/rest/TagController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public TagController(TagApplicationService tagApplicationService) {
2727
}
2828

2929
@Override
30-
public ResponseEntity<List<TagResponse>> tagsGet(String keyword) {
30+
public ResponseEntity<List<TagResponse>> getTags(String keyword) {
3131
List<Tag> tags = tagApplicationService.searchTags(keyword);
3232

3333
List<TagResponse> response = tags.stream()
@@ -38,7 +38,7 @@ public ResponseEntity<List<TagResponse>> tagsGet(String keyword) {
3838
}
3939

4040
@Override
41-
public ResponseEntity<TagResponse> tagsPost(CreateTagRequest createTagRequest) {
41+
public ResponseEntity<TagResponse> createTag(CreateTagRequest createTagRequest) {
4242
try {
4343
Tag tag = tagApplicationService.createTag(
4444
createTagRequest.getName(),

0 commit comments

Comments
 (0)