toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:任务执行打标签（前端不传才设置

Browse Source
This commit is contained in:
zhuxinru
2026-02-06 10:49:23 +08:00
parent 9ee0344f37
commit b86b28e859
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -912,8 +912,10 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
if (req.getFile() != null) {
UploadFilesReq filesReq = new UploadFilesReq();
BeanUtils.copyProperties(req, filesReq);
req.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
req.setFileTypeDictValue(String.valueOf(req.getFileType()));
if (StringUtils.isEmpty(req.getFileTypeDictValue())) {
req.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
req.setFileTypeDictValue(String.valueOf(req.getFileType()));
}
SdmResponse response = uploadKeyResultFiles(filesReq);
if (response.isSuccess() && response.getData() != null) {
JSONObject result = JSONObject.from(response.getData());
@@ -1098,8 +1100,10 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
BeanUtils.copyProperties(req, filesReq);
filesReq.setUuid(req.getTaskId());
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()));
if (StringUtils.isEmpty(filesReq.getFileTypeDictValue())) {
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(req.getKeyResultList().get(0).getFileType()));
}
// 批量存储文件信息，返回数据供第二步分片上传使用
SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq);
if (sdmResponse.isSuccess() && CollectionUtils.isNotEmpty(sdmResponse.getData())) {
@@ -1230,8 +1234,10 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
GetSimulationTaskFileReq taskFileReq = new GetSimulationTaskFileReq();
taskFileReq.setUuid(req.getTaskId());
taskFileReq.setFileBizType(req.getFileType());
taskFileReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
taskFileReq.setFileTypeDictValue(String.valueOf(req.getFileType()));
if (StringUtils.isEmpty(taskFileReq.getFileTypeDictValue())) {
taskFileReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
taskFileReq.setFileTypeDictValue(String.valueOf(req.getFileType()));
}
taskFileReq.setCurrent(req.getCurrent());
taskFileReq.setSize(req.getSize());
SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> sdmResponse = analysisFeignClient.getSimulationTaskFile(taskFileReq);
@@ -2120,8 +2126,10 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
BeanUtils.copyProperties(req, filesReq);
filesReq.setDirId(parentId);
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()));
if (StringUtils.isEmpty(filesReq.getFileTypeDictValue())) {
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(req.getFileInfoList().get(0).getFileType()));
}
// 批量存储文件信息，返回数据供第二步分片上传使用
SdmResponse<List<BatchAddFileInfoResp>> sdmResponse = dataFeignClient.batchAddFileInfo(filesReq);