Skip to content

Commit 6cf3099

Browse files
hefanlihefanli
committed
fix:修复文件上传后数据集文件数和大小未更新的问题
1 parent c2d3f95 commit 6cf3099

12 files changed

Lines changed: 39 additions & 110 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ components:
613613
fileType:
614614
type: string
615615
description: 文件类型
616-
size:
616+
fileSize:
617617
type: integer
618618
format: int64
619619
description: 文件大小（字节）
@@ -627,7 +627,7 @@ components:
627627
filePath:
628628
type: string
629629
description: 文件路径
630-
uploadedAt:
630+
uploadTime:
631631
type: string
632632
format: date-time
633633
description: 上传时间

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private void scanDataset(String taskId, String srcDatasetId) {
143143
}
144144
List<Map<String, Object>> files = datasetFile.getContent().stream()
145145
.map(content -> Map.of("fileName", (Object) content.getFileName(),
146-
"fileSize", content.getSize(),
146+
"fileSize", content.getFileSize(),
147147
"filePath", content.getFilePath(),
148148
"fileType", content.getFileType(),
149149
"fileId", content.getId()))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public class DatasetFileResponse {
2020
/** 文件类型 */
2121
private String fileType;
2222
/** 文件大小（字节） */
23-
private Long size;
23+
private Long fileSize;
2424
/** 文件状态 */
2525
private String status;
2626
/** 文件描述 */
2727
private String description;
2828
/** 文件路径 */
2929
private String filePath;
3030
/** 上传时间 */
31-
private LocalDateTime uploadedAt;
31+
private LocalDateTime uploadTime;
3232
/** 最后更新时间 */
3333
private LocalDateTime lastAccessTime;
3434
/** 上传者 */

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/application/DatasetApplicationService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ public Dataset updateDataset(String datasetId, UpdateDatasetRequest updateDatase
8888
if (Objects.nonNull(updateDatasetRequest.getStatus())) {
8989
dataset.setStatus(updateDatasetRequest.getStatus());
9090
}
91+
if (StringUtils.hasText(updateDatasetRequest.getDataSource())) {
92+
// 数据源id不为空，使用异步线程进行文件扫盘落库
93+
processDataSourceAsync(dataset.getId(), updateDatasetRequest.getDataSource());
94+
}
9195
datasetRepository.updateById(dataset);
9296
return dataset;
9397
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/application/DatasetFileApplicationService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ public String preUpload(UploadFilesPreRequest chunkUploadRequest, String dataset
224224
*
225225
* @param uploadFileRequest 上传请求
226226
*/
227+
@Transactional
227228
public void chunkUpload(String datasetId, UploadFileRequest uploadFileRequest) {
228229
FileUploadResult uploadResult = fileService.chunkUpload(DatasetConverter.INSTANCE.toChunkUploadRequest(uploadFileRequest));
229230
saveFileInfoToDb(uploadResult, uploadFileRequest, datasetId);
@@ -237,6 +238,7 @@ private void saveFileInfoToDb(FileUploadResult fileUploadResult, UploadFileReque
237238
// 文件切片上传没有完成
238239
return;
239240
}
241+
Dataset dataset = datasetRepository.getById(datasetId);
240242
File savedFile = fileUploadResult.getSavedFile();
241243
LocalDateTime currentTime = LocalDateTime.now();
242244
DatasetFile datasetFile = DatasetFile.builder()
@@ -251,5 +253,7 @@ private void saveFileInfoToDb(FileUploadResult fileUploadResult, UploadFileReque
251253
.build();
252254

253255
datasetFileRepository.save(datasetFile);
256+
dataset.addFile(datasetFile);
257+
datasetRepository.updateById(dataset);
254258
}
255259
}

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import com.dataengine.common.domain.model.ChunkUploadRequest;
44
import com.dataengine.common.interfaces.PagedResponse;
55
import com.dataengine.datamanagement.domain.model.dataset.Dataset;
6+
import com.dataengine.datamanagement.domain.model.dataset.DatasetFile;
67
import com.dataengine.datamanagement.domain.model.dataset.Tag;
7-
import com.dataengine.datamanagement.interfaces.dto.CreateDatasetRequest;
8-
import com.dataengine.datamanagement.interfaces.dto.DatasetResponse;
9-
import com.dataengine.datamanagement.interfaces.dto.TagResponse;
10-
import com.dataengine.datamanagement.interfaces.dto.UploadFileRequest;
8+
import com.dataengine.datamanagement.interfaces.dto.*;
119
import org.mapstruct.Mapper;
1210
import org.mapstruct.Mapping;
1311
import org.mapstruct.factory.Mappers;
@@ -36,12 +34,6 @@ public interface DatasetConverter {
3634
@Mapping(target = "tags", ignore = true)
3735
Dataset convertToDataset(CreateDatasetRequest createDatasetRequest);
3836

39-
/**
40-
* 将数据集转换为响应
41-
*/
42-
@Mapping(source = "number", target = "page")
43-
PagedResponse<DatasetResponse> convertToPagedResponse(Page<Dataset> dataset);
44-
4537
/**
4638
* 将上传文件请求转换为分片上传请求
4739
*/
@@ -50,7 +42,11 @@ public interface DatasetConverter {
5042
/**
5143
* 将数据集转换为响应
5244
*/
53-
TagResponse convertToResponse(Tag dataset);
54-
5545
List<DatasetResponse> convertToResponse(List<Dataset> datasets);
46+
47+
/**
48+
*
49+
* 将数据集文件转换为响应
50+
*/
51+
DatasetFileResponse convertToResponse(DatasetFile datasetFile);
5652
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public class DatasetFileResponse {
2020
/** 文件类型 */
2121
private String fileType;
2222
/** 文件大小（字节） */
23-
private Long size;
23+
private Long fileSize;
2424
/** 文件状态 */
2525
private String status;
2626
/** 文件描述 */
2727
private String description;
2828
/** 文件路径 */
2929
private String filePath;
3030
/** 上传时间 */
31-
private LocalDateTime uploadedAt;
31+
private LocalDateTime uploadTime;
3232
/** 最后更新时间 */
3333
private LocalDateTime lastAccessTime;
3434
/** 上传者 */

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class UpdateDatasetRequest {
1616
private String name;
1717
/** 数据集描述 */
1818
private String description;
19+
/** 归集任务id */
20+
private String dataSource;
1921
/** 标签列表 */
2022
private List<String> tags;
2123
/** 数据集状态 */

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

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.dataengine.datamanagement.interfaces.rest;
22

3+
import com.dataengine.common.infrastructure.common.IgnoreResponseWrap;
34
import com.dataengine.common.infrastructure.common.Response;
45
import com.dataengine.common.infrastructure.exception.SystemErrorCode;
56
import com.dataengine.datamanagement.application.DatasetFileApplicationService;
67
import com.dataengine.datamanagement.domain.model.dataset.DatasetFile;
8+
import com.dataengine.datamanagement.interfaces.converter.DatasetConverter;
79
import com.dataengine.datamanagement.interfaces.dto.DatasetFileResponse;
810
import com.dataengine.datamanagement.interfaces.dto.PagedDatasetFileResponse;
911
import com.dataengine.datamanagement.interfaces.dto.UploadFileRequest;
@@ -22,7 +24,6 @@
2224
import org.springframework.web.bind.annotation.*;
2325
import org.springframework.web.multipart.MultipartFile;
2426

25-
import java.time.ZoneOffset;
2627
import java.util.stream.Collectors;
2728

2829
/**
@@ -54,7 +55,7 @@ public ResponseEntity<Response<PagedDatasetFileResponse>> getDatasetFiles(
5455

5556
PagedDatasetFileResponse response = new PagedDatasetFileResponse();
5657
response.setContent(filesPage.getContent().stream()
57-
.map(this::convertToResponse)
58+
.map(DatasetConverter.INSTANCE::convertToResponse)
5859
.collect(Collectors.toList()));
5960
response.setPage(filesPage.getNumber());
6061
response.setSize(filesPage.getSize());
@@ -75,7 +76,7 @@ public ResponseEntity<Response<DatasetFileResponse>> uploadDatasetFile(
7576
DatasetFile datasetFile = datasetFileApplicationService.uploadFile(
7677
datasetId, file, description, "system");
7778

78-
return ResponseEntity.status(HttpStatus.CREATED).body(Response.ok(convertToResponse(datasetFile)));
79+
return ResponseEntity.status(HttpStatus.CREATED).body(Response.ok(DatasetConverter.INSTANCE.convertToResponse(datasetFile)));
7980
} catch (IllegalArgumentException e) {
8081
return ResponseEntity.badRequest().body(Response.error(SystemErrorCode.UNKNOWN_ERROR, null));
8182
} catch (Exception e) {
@@ -90,7 +91,7 @@ public ResponseEntity<Response<DatasetFileResponse>> getDatasetFileById(
9091
@PathVariable("fileId") String fileId) {
9192
try {
9293
DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(datasetId, fileId);
93-
return ResponseEntity.ok(Response.ok(convertToResponse(datasetFile)));
94+
return ResponseEntity.ok(Response.ok(DatasetConverter.INSTANCE.convertToResponse(datasetFile)));
9495
} catch (IllegalArgumentException e) {
9596
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(SystemErrorCode.UNKNOWN_ERROR, null));
9697
}
@@ -108,6 +109,7 @@ public ResponseEntity<Response<Void>> deleteDatasetFile(
108109
}
109110
}
110111

112+
@IgnoreResponseWrap
111113
@GetMapping(value = "/{fileId}/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
112114
public ResponseEntity<Resource> downloadDatasetFile(
113115
@PathVariable("datasetId") String datasetId,
@@ -128,24 +130,6 @@ public ResponseEntity<Resource> downloadDatasetFile(
128130
}
129131
}
130132

131-
private DatasetFileResponse convertToResponse(DatasetFile datasetFile) {
132-
DatasetFileResponse response = new DatasetFileResponse();
133-
response.setId(datasetFile.getId());
134-
response.setFileName(datasetFile.getFileName());
135-
response.setOriginalName(null);
136-
response.setFileType(datasetFile.getFileType());
137-
response.setSize(datasetFile.getFileSize());
138-
response.setStatus(datasetFile.getStatus());
139-
response.setDescription(null);
140-
response.setFilePath(datasetFile.getFilePath());
141-
if (datasetFile.getUploadTime() != null) {
142-
response.setUploadedAt(datasetFile.getUploadTime().atOffset(ZoneOffset.UTC).toLocalDateTime());
143-
}
144-
response.setLastAccessTime(datasetFile.getLastAccessTime());
145-
response.setUploadedBy(null);
146-
return response;
147-
}
148-
149133
/**
150134
* 文件上传请求
151135
*
@@ -154,6 +138,7 @@ private DatasetFileResponse convertToResponse(DatasetFile datasetFile) {
154138
*/
155139
@PostMapping("/upload/pre-upload")
156140
public ResponseEntity<Response<String>> preUpload(@PathVariable("datasetId") String datasetId, @RequestBody @Valid UploadFilesPreRequest request) {
141+
157142
return ResponseEntity.ok(Response.ok(datasetFileApplicationService.preUpload(request, datasetId)));
158143
}
159144

‎frontend/src/pages/DataManagement/Detail/components/Overview.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ export default function Overview({ dataset, filesOperation }) {
104104
},
105105
{
106106
title: "大小",
107-
dataIndex: "size",
108-
key: "size",
107+
dataIndex: "fileSize",
108+
key: "fileSize",
109109
width: 150,
110110
render: (text) => formatBytes(text),
111111
},
112112
{
113113
title: "上传时间",
114-
dataIndex: "uploadedAt",
115-
key: "uploadedAt",
114+
dataIndex: "uploadTime",
115+
key: "uploadTime",
116116
width: 200,
117117
render: (text) => formatDateTime(text),
118118
},

0 commit comments

Comments
 (0)