From 6766d8e9d4eed2d148145a1503653eebba106c01 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 25 Nov 2025 16:36:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8A=E4=BC=A0=E7=AE=97=E4=BE=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MinioFileIDataFileServiceImpl.java | 2 +- .../model/entity/SimulationRunKeyResult.java | 14 ++++++++++---- .../com/sdm/project/model/req/KeyResultReq.java | 4 ++-- .../service/impl/SimulationRunServiceImpl.java | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index d325762d..1765910c 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -210,7 +210,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { @Override public SdmResponse queryFileMetadataInfo(String uuid, String uuidOwnType, Integer dirId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (dirId != null) { + if (dirId != 0) { queryWrapper.eq(FileMetadataInfo::getId,dirId); } else { queryWrapper.eq(FileMetadataInfo::getRelatedResourceUuid,uuid); diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java b/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java index 9e9d90b8..e5b1b117 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java @@ -1,12 +1,10 @@ package com.sdm.project.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -105,4 +103,12 @@ public class SimulationRunKeyResult implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Schema(description= "创建者名称,列表展示使用") + @TableField(value = "creatorName", insertStrategy = FieldStrategy.NEVER,select = false,updateStrategy = FieldStrategy.NEVER) + private String creatorName; + + @Schema(description= "更新者名称,列表展示使用") + @TableField(value = "updaterName", insertStrategy = FieldStrategy.NEVER,select = false,updateStrategy = FieldStrategy.NEVER) + private String updaterName; + } diff --git a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java index ffa6fdea..23e93b15 100644 --- a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java +++ b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java @@ -29,10 +29,10 @@ public class KeyResultReq extends BaseReq { private String units; @Schema(description = "最大数值") - private String maxValue; + private String max; @Schema(description = "最小数值") - private String minValue; + private String min; @Schema(description = "数值") private String value; 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 8f53be37..0438a301 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 @@ -488,7 +488,7 @@ public class SimulationRunServiceImpl extends ServiceImpl fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(simulationTask.getUuid(), NodeTypeEnum.TASK.getValue(), null); + SdmResponse fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(simulationTask.getUuid(), NodeTypeEnum.TASK.getValue(), 0); if (fileMetadataInfoResp.getData() != null) { simulationRun.setFolderId(fileMetadataInfoResp.getData().getId()); } @@ -585,7 +585,7 @@ public class SimulationRunServiceImpl extends ServiceImpl fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getUuId(), NodeTypeEnum.RUN.getValue(), null); + SdmResponse fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getUuId(), NodeTypeEnum.RUN.getValue(), 0); if (fileMetadataInfoResp.getData() != null) { createDirReq.setParDirId(fileMetadataInfoResp.getData().getId()); }