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

仿真参数库返回创建人、创建时间

Browse Source
This commit is contained in:
gulongcheng
2025-12-16 19:15:46 +08:00
parent 715ce53fc9
commit 5e563c7b94
5 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibrary.java
View File

@@ -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;
}

5
data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategory.java
View File

@@ -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;
}

5
data/src/main/java/com/sdm/data/model/entity/SimulationParameterLibraryCategoryObject.java
View File

@@ -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;
}

2
data/src/main/java/com/sdm/data/model/resp/SimulationParameterLibraryCategoryObjectResp.java
View File

@@ -50,6 +50,8 @@ public class SimulationParameterLibraryCategoryObjectResp {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
private String creatorName;
// 参数文件JSON存储的数据
private List<Map<String, Object>> parameterJsonValue = new ArrayList<>();
}

40
data/src/main/java/com/sdm/data/service/impl/SimulationParameterLibraryServiceImpl.java
View File

@@ -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<Simulatio
@Autowired
private ApproveFeignClientImpl approveFeignClient;
@Autowired
private UserNameCacheService userNameCacheService;
@Override
@Transactional(rollbackFor = Exception.class)
public SdmResponse addLibrary(String parameterLibraryName) {
SimulationParameterLibrary simulationParameterLibrary = new SimulationParameterLibrary();
simulationParameterLibrary.setParameterLibraryName(parameterLibraryName);
simulationParameterLibrary.setTenantId(ThreadLocalContext.getTenantId());
simulationParameterLibrary.setCreatorId(ThreadLocalContext.getUserId());
this.save(simulationParameterLibrary);
return SdmResponse.success("仿真参数库添加成功");
}
@@ -83,6 +89,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
SimulationParameterLibraryCategory simulationParameterLibraryCategory = new SimulationParameterLibraryCategory();
simulationParameterLibraryCategory.setParameterLibraryId(parameterLibraryId);
simulationParameterLibraryCategory.setParameterLibraryCategoryName(parameterLibraryCategoryName);
simulationParameterLibraryCategory.setCreatorId(ThreadLocalContext.getUserId());
simulationParameterLibraryCategoryService.save(simulationParameterLibraryCategory);
return SdmResponse.success("仿真参数库分类添加成功");
}
@@ -97,6 +104,7 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
SimulationParameterLibraryCategoryObject simulationParameterLibraryCategoryObject = new SimulationParameterLibraryCategoryObject();
BeanUtils.copyProperties(req, simulationParameterLibraryCategoryObject);
simulationParameterLibraryCategoryObject.setFileId(fileId);
simulationParameterLibraryCategoryObject.setCreatorId(ThreadLocalContext.getUserId());
simulationParameterLibraryCategoryObjectService.save(simulationParameterLibraryCategoryObject);
FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.getById(fileId);
@@ -154,11 +162,18 @@ public class SimulationParameterLibraryServiceImpl extends ServiceImpl<Simulatio
if (CollectionUtils.isEmpty(simulationParameterLibraries)) {
return SdmResponse.success(jsonObjects);
}
List<Long> userIds = simulationParameterLibraries.stream().map(SimulationParameterLibrary::getCreatorId).toList();
// 将 List<Long> userIds 转成set
Set<Long> userIdsSet = new HashSet<>(userIds);
Map<Long, String> 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<Simulatio
if (CollectionUtils.isEmpty(simulationParameterLibraryCategories)) {
return SdmResponse.success(jsonObjects);
}
List<Long> userIds = simulationParameterLibraryCategories.stream().map(SimulationParameterLibraryCategory::getCreatorId).toList();
// 将 List<Long> userIds 转成set
Set<Long> userIdsSet = new HashSet<>(userIds);
Map<Long, String> 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<Simulatio
if (CollectionUtils.isEmpty(simulationParameterLibraryCategoryObjects)) {
return SdmResponse.success(jsonObjects);
}
List<Long> userIds = simulationParameterLibraryCategoryObjects.stream().map(SimulationParameterLibraryCategoryObject::getCreatorId).toList();
// 将 List<Long> userIds 转成set
Set<Long> userIdsSet = new HashSet<>(userIds);
Map<Long, String> 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<Simulatio
simulationParameterLibraryCategoryObjectResp.setParameterLibraryCategoryId(simulationParameterLibraryCategory.getId());
simulationParameterLibraryCategoryObjectResp.setParameterLibraryCategoryName(simulationParameterLibraryCategory.getParameterLibraryCategoryName());
Long creatorId = simulationParameterLibraryCategoryObject.getCreatorId();
// 将 List<Long> userIds 转成set
Set<Long> userIdsSet = new HashSet<>();
userIdsSet.add(creatorId);
Map<Long, String> longStringMap = userNameCacheService.batchGetUserNames(userIdsSet);
simulationParameterLibraryCategoryObjectResp.setCreatorName(longStringMap.get(creatorId));
simulationParameterLibraryCategoryObjectResp.setCreateTime(simulationParameterLibraryCategoryObject.getCreateTime());
FileMetadataInfo fileMetadataInfo = fileMetadataInfoService.getById(simulationParameterLibraryCategoryObject.getFileId());
simulationParameterLibraryCategoryObjectResp.setApproveType(fileMetadataInfo.getApproveType());