diff --git a/common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java b/common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java index b03c3346..a3c9aa4b 100644 --- a/common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java @@ -138,6 +138,18 @@ public class UploadFilesReq { @Schema(description = "是否需要覆盖同名文件") private Boolean isConverSameNameFile = false; + @Schema(description = "x轴物理量(曲线结果使用)") + private String xQuantityType; + + @Schema(description = "x轴结果单位(曲线结果使用)") + private String xUnits; + + @Schema(description = "y轴物理量(曲线结果使用)") + private String yQuantityType; + + @Schema(description = "y轴结果单位(曲线结果使用)") + private String yUnits; + /** * 扩展信息 */ diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 0fa7bfaa..176f24cc 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -2774,6 +2774,28 @@ public class SimulationRunServiceImpl extends ServiceImpl> batchAddFileInfoResp = dataFeignClient.batchAddFileInfo(req); + if (batchAddFileInfoResp.isSuccess() && CollectionUtils.isNotEmpty(batchAddFileInfoResp.getData())) { + List batchAddFileInfoList = batchAddFileInfoResp.getData(); + List simulationRunKeyResultList = new ArrayList<>(); + for (UploadFilesReq sourceFile : req.getSourceFiles()) { + BatchAddFileInfoResp addFileInfoResp = batchAddFileInfoList.stream().filter(i -> StringUtils.equals(i.getSourceFileName(), sourceFile.getFileName())).findFirst().get(); + if (addFileInfoResp != null) { + // 同时生成一份keyResult到表里,因为任务下的曲线预览也需要展示物理量和单位 + SimulationRunKeyResult simulationRunKeyResult = new SimulationRunKeyResult(); + simulationRunKeyResult.setUuid(RandomUtil.generateString(32)); + simulationRunKeyResult.setXQuantityType(sourceFile.getXQuantityType()); + simulationRunKeyResult.setXUnits(sourceFile.getXQuantityType()); + simulationRunKeyResult.setYQuantityType(sourceFile.getXQuantityType()); + simulationRunKeyResult.setYUnits(sourceFile.getXQuantityType()); + simulationRunKeyResult.setFileId(addFileInfoResp.getBusinessId()); + simulationRunKeyResultList.add(simulationRunKeyResult); + } + } + if (!simulationRunKeyResultList.isEmpty()) { + simulationKeyResultService.saveBatch(simulationRunKeyResultList); + } + } + return batchAddFileInfoResp; } }