fix:任务执行上传文件打标签

This commit is contained in:
2026-02-04 18:30:13 +08:00
parent 26e9c3f441
commit 0cb0e25c2f

View File

@@ -912,6 +912,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
if (req.getFile() != null) { if (req.getFile() != null) {
UploadFilesReq filesReq = new UploadFilesReq(); UploadFilesReq filesReq = new UploadFilesReq();
BeanUtils.copyProperties(req, filesReq); BeanUtils.copyProperties(req, filesReq);
req.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
req.setFileTypeDictValue(String.valueOf(req.getFileType()));
SdmResponse response = uploadKeyResultFiles(filesReq); SdmResponse response = uploadKeyResultFiles(filesReq);
if (response.isSuccess() && response.getData() != null) { if (response.isSuccess() && response.getData() != null) {
JSONObject result = JSONObject.from(response.getData()); JSONObject result = JSONObject.from(response.getData());
@@ -1096,6 +1098,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
BeanUtils.copyProperties(req, filesReq); BeanUtils.copyProperties(req, filesReq);
filesReq.setUuid(req.getTaskId()); filesReq.setUuid(req.getTaskId());
filesReq.setSourceFiles(req.getKeyResultList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList()); filesReq.setSourceFiles(req.getKeyResultList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList());
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(req.getKeyResultList().get(0).getFileType()));
// 批量存储文件信息,返回数据供第二步分片上传使用 // 批量存储文件信息,返回数据供第二步分片上传使用
SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq); SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq);
if (sdmResponse.isSuccess() && CollectionUtils.isNotEmpty(sdmResponse.getData())) { if (sdmResponse.isSuccess() && CollectionUtils.isNotEmpty(sdmResponse.getData())) {
@@ -1226,6 +1230,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
GetSimulationTaskFileReq taskFileReq = new GetSimulationTaskFileReq(); GetSimulationTaskFileReq taskFileReq = new GetSimulationTaskFileReq();
taskFileReq.setUuid(req.getTaskId()); taskFileReq.setUuid(req.getTaskId());
taskFileReq.setFileBizType(req.getFileType()); taskFileReq.setFileBizType(req.getFileType());
taskFileReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
taskFileReq.setFileTypeDictValue(String.valueOf(req.getFileType()));
taskFileReq.setCurrent(req.getCurrent()); taskFileReq.setCurrent(req.getCurrent());
taskFileReq.setSize(req.getSize()); taskFileReq.setSize(req.getSize());
SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> sdmResponse = analysisFeignClient.getSimulationTaskFile(taskFileReq); SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> sdmResponse = analysisFeignClient.getSimulationTaskFile(taskFileReq);
@@ -2114,6 +2120,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
BeanUtils.copyProperties(req, filesReq); BeanUtils.copyProperties(req, filesReq);
filesReq.setDirId(parentId); filesReq.setDirId(parentId);
filesReq.setSourceFiles(req.getFileInfoList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList()); filesReq.setSourceFiles(req.getFileInfoList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList());
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(req.getFileInfoList().get(0).getFileType()));
// 批量存储文件信息,返回数据供第二步分片上传使用 // 批量存储文件信息,返回数据供第二步分片上传使用
SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq); SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq);
if (sdmResponse.isSuccess() && CollectionUtils.isNotEmpty(sdmResponse.getData())) { if (sdmResponse.isSuccess() && CollectionUtils.isNotEmpty(sdmResponse.getData())) {
@@ -2267,6 +2276,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
BeanUtils.copyProperties(req, filesReq); BeanUtils.copyProperties(req, filesReq);
filesReq.setDirId(parentId); filesReq.setDirId(parentId);
filesReq.setSourceFiles(req.getAddFileInfoList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList()); filesReq.setSourceFiles(req.getAddFileInfoList().stream().map(i -> new UploadFilesReq(i.getFileName(), i.getFileSize(), i.getFileType())).toList());
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(req.getAddFileInfoList().get(0).getFileType()));
// 批量存储文件信息,返回数据供第二步分片上传使用 // 批量存储文件信息,返回数据供第二步分片上传使用
batchAddResponse = dataFeignClient.batchAddFileInfo(filesReq); batchAddResponse = dataFeignClient.batchAddFileInfo(filesReq);
if (!batchAddResponse.isSuccess()) { if (!batchAddResponse.isSuccess()) {