From 5e563c7b946e5402babdc0d6aa866ce7a4b85635 Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Tue, 16 Dec 2025 19:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E5=8F=82=E6=95=B0=E5=BA=93?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SimulationParameterLibrary.java | 6 +++ .../SimulationParameterLibraryCategory.java | 5 +++ ...ulationParameterLibraryCategoryObject.java | 5 +++ ...ionParameterLibraryCategoryObjectResp.java | 2 + ...SimulationParameterLibraryServiceImpl.java | 40 +++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibrary.java b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibrary.java index 0ada05f7..c43a8e8b 100644 --- a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibrary.java +++ b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibrary.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.io.Serializable; 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; @@ -49,5 +50,10 @@ public class SimulationParameterLibrary implements Serializable { @TableField("tenantId") private Long tenantId; + @Schema(description= "创建者ID") + @TableField("creatorId") + private Long creatorId; + + } diff --git a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategory.java b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategory.java index 9271916e..d69ce8be 100644 --- a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategory.java +++ b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategory.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.io.Serializable; 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; @@ -49,5 +50,9 @@ public class SimulationParameterLibraryCategory implements Serializable { @TableField("update_time") private LocalDateTime updateTime; + @Schema(description= "创建者ID") + @TableField("creatorId") + private Long creatorId; + } diff --git a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategoryObject.java b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategoryObject.java index 9b7e2289..f8a4f3f5 100644 --- a/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategoryObject.java +++ b/data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategoryObject.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.io.Serializable; 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; @@ -61,5 +62,9 @@ public class SimulationParameterLibraryCategoryObject implements Serializable { @TableField("update_time") private LocalDateTime updateTime; + @Schema(description= "创建者ID") + @TableField("creatorId") + private Long creatorId; + } diff --git a/data/src/main/java/com/sdm/data/model/resp/SimulationParameterLibraryCategoryObjectResp.java b/data/src/main/java/com/sdm/data/model/resp/SimulationParameterLibraryCategoryObjectResp.java index 0d72cbb1..0af8da27 100644 --- a/data/src/main/java/com/sdm/data/model/resp/SimulationParameterLibraryCategoryObjectResp.java +++ b/data/src/main/java/com/sdm/data/model/resp/SimulationParameterLibraryCategoryObjectResp.java @@ -50,6 +50,8 @@ public class SimulationParameterLibraryCategoryObjectResp { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + private String creatorName; + // 参数文件JSON存储的数据 private List> parameterJsonValue = new ArrayList<>(); } diff --git a/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java index b08137bc..e43d4500 100644 --- a/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java @@ -14,6 +14,7 @@ import com.sdm.common.entity.enums.ApproveTypeEnum; import com.sdm.common.entity.enums.SimulationParameterDataTypeEnum; import com.sdm.common.entity.req.system.LaunchApproveReq; import com.sdm.common.feign.impl.system.ApproveFeignClientImpl; +import com.sdm.common.service.UserNameCacheService; import com.sdm.data.dao.SimulationParameterLibraryMapper; import com.sdm.data.model.bo.ApprovalParamContentsModel; import com.sdm.data.model.entity.FileMetadataInfo; @@ -38,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.time.format.DateTimeFormatter; import java.util.*; /** @@ -67,12 +69,16 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl userIds = simulationParameterLibraries.stream().map(SimulationParameterLibrary::getCreatorId).toList(); + // 将 List userIds 转成set + Set userIdsSet = new HashSet<>(userIds); + Map longStringMap = userNameCacheService.batchGetUserNames(userIdsSet); + simulationParameterLibraries.forEach(simulationParameterLibrary -> { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibrary.getId()); jsonObject.put("type", SimulationParameterDataTypeEnum.LIBRARY.getValue()); jsonObject.put("name", simulationParameterLibrary.getParameterLibraryName()); + jsonObject.put("createName",longStringMap.get(simulationParameterLibrary.getCreatorId())); + jsonObject.put("createTime", simulationParameterLibrary.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); jsonObjects.add(jsonObject); }); return SdmResponse.success(jsonObjects); @@ -175,11 +190,20 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl userIds = simulationParameterLibraryCategories.stream().map(SimulationParameterLibraryCategory::getCreatorId).toList(); + // 将 List userIds 转成set + Set userIdsSet = new HashSet<>(userIds); + Map longStringMap = userNameCacheService.batchGetUserNames(userIdsSet); + + simulationParameterLibraryCategories.forEach(simulationParameterLibraryCategory -> { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibraryCategory.getId()); jsonObject.put("type", SimulationParameterDataTypeEnum.CATEGORY.getValue()); jsonObject.put("name", simulationParameterLibraryCategory.getParameterLibraryCategoryName()); + jsonObject.put("createName",longStringMap.get(simulationParameterLibraryCategory.getCreatorId())); + jsonObject.put("createTime", simulationParameterLibraryCategory.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); jsonObjects.add(jsonObject); }); return SdmResponse.success(jsonObjects); @@ -193,11 +217,19 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl userIds = simulationParameterLibraryCategoryObjects.stream().map(SimulationParameterLibraryCategoryObject::getCreatorId).toList(); + // 将 List userIds 转成set + Set userIdsSet = new HashSet<>(userIds); + Map longStringMap = userNameCacheService.batchGetUserNames(userIdsSet); + simulationParameterLibraryCategoryObjects.forEach(simulationParameterLibraryCategoryObject -> { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", simulationParameterLibraryCategoryObject.getId()); jsonObject.put("type", SimulationParameterDataTypeEnum.OBJECT.getValue()); jsonObject.put("name", simulationParameterLibraryCategoryObject.getParameterLibraryCategoryObjectName()); + jsonObject.put("createName",longStringMap.get(simulationParameterLibraryCategoryObject.getCreatorId())); + jsonObject.put("createTime", simulationParameterLibraryCategoryObject.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); jsonObjects.add(jsonObject); }); return SdmResponse.success(jsonObjects); @@ -309,6 +341,14 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl userIds 转成set + Set userIdsSet = new HashSet<>(); + userIdsSet.add(creatorId); + Map longStringMap = userNameCacheService.batchGetUserNames(userIdsSet); + simulationParameterLibraryCategoryObjectResp.setCreatorName(longStringMap.get(creatorId)); + simulationParameterLibraryCategoryObjectResp.setCreateTime(simulationParameterLibraryCategoryObject.getCreateTime()); + FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.getById(simulationParameterLibraryCategoryObject.getFileId()); simulationParameterLibraryCategoryObjectResp.setApproveType(fileMetadataInfo.getApproveType());