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

fix:bug修复

Browse Source
This commit is contained in:
zhuxinru
2025-12-23 19:39:39 +08:00
parent 51111263f6
commit 1b81e8626f
7 changed files with 110 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
data/src/main/java/com/sdm/data/model/dto/ExportKnowledgeDto.java Normal file
View File

@@ -0,0 +1,56 @@
package com.sdm.data.model.dto;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.req.data.SimulationPoolInfo;
import com.sdm.common.entity.resp.data.PoolInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class ExportKnowledgeDto implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description= "文件原始名称")
private String originalName;
@Schema(description= "文件大小")
private String fileSize;
@Schema(description= "projectName:所属项目,只有列表展示使用")
private String projectName;
@Schema(description= "分析方向,只有列表展示使用")
private String analysisDirectionName;
@Schema(description= "工况")
private String poolInfos;
@Schema(description= "版本号（从1开始递增）")
private Long versionNo;
@Schema(description= "创建者名称,列表展示使用")
private String creatorName;
@Schema(description= "approvalStatus")
private String approvalStatus;
@Schema(description= "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@Schema(description= "修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@Schema(description= "备注信息")
private String remarks;
}

34
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

@@ -37,6 +37,7 @@ import com.sdm.common.utils.*;
import com.sdm.common.utils.excel.ExcelUtil;
import com.sdm.data.aop.PermissionCheckAspect;
import com.sdm.data.model.bo.ApprovalFileDataContentsModel;
import com.sdm.data.model.dto.ExportKnowledgeDto;
import com.sdm.data.model.entity.*;
import com.sdm.common.entity.resp.data.PoolInfo;
@@ -76,6 +77,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -2734,19 +2736,33 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
ExcelUtil.exportExcelNoMerge(new JSONArray(),exportExcelFormats,httpServletResponse);
return response;
}
List<ExportKnowledgeDto> exportKnowledgeDtoList = new ArrayList<>();
for (FileMetadataInfo fileMetadataInfo : dataList) {
ExportKnowledgeDto exportKnowledgeDto = new ExportKnowledgeDto();
exportKnowledgeDto.setOriginalName(fileMetadataInfo.getOriginalName());
exportKnowledgeDto.setProjectName(fileMetadataInfo.getProjectName());
exportKnowledgeDto.setAnalysisDirectionName(fileMetadataInfo.getAnalysisDirectionName());
exportKnowledgeDto.setVersionNo(fileMetadataInfo.getVersionNo());
exportKnowledgeDto.setCreatorName(fileMetadataInfo.getCreatorName());
exportKnowledgeDto.setUpdateTime(fileMetadataInfo.getUpdateTime());
exportKnowledgeDto.setRemarks(fileMetadataInfo.getRemarks());
if (fileMetadataInfo.getApprovalStatus() == null) {
fileMetadataInfo.setApprovalStatus("审批完成");
}else if (ApprovalFileDataStatusEnum.PENDING.getKey().equals(fileMetadataInfo.getApprovalStatus())) {
fileMetadataInfo.setApprovalStatus(ApprovalFileDataStatusEnum.PENDING.getDescription());
}else if (ApprovalFileDataStatusEnum.APPROVED.getKey().equals(fileMetadataInfo.getApprovalStatus())) {
fileMetadataInfo.setApprovalStatus(ApprovalFileDataStatusEnum.APPROVED.getDescription());
}else if (ApprovalFileDataStatusEnum.REJECTED.getKey().equals(fileMetadataInfo.getApprovalStatus())) {
fileMetadataInfo.setApprovalStatus(ApprovalFileDataStatusEnum.REJECTED.getDescription());
exportKnowledgeDto.setApprovalStatus("审批完成");
} else {
exportKnowledgeDto.setApprovalStatus(ApprovalFileDataStatusEnum.getDescByKey(fileMetadataInfo.getApprovalStatus()));
}
fileMetadataInfo.setApprovalStatus("");
if (CollectionUtils.isNotEmpty(fileMetadataInfo.getPoolInfos())) {
List<TaskBaseInfo> taskBaseInfoList = fileMetadataInfo.getPoolInfos().get(0).getTaskBaseInfoList();
if (CollectionUtils.isNotEmpty(taskBaseInfoList)) {
// 导出知识库的工况那列展示工况名称
exportKnowledgeDto.setPoolInfos(taskBaseInfoList.stream().map(TaskBaseInfo::getTaskName).collect(Collectors.joining(",")));
}
}
// 格式化文件大小
exportKnowledgeDto.setFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(fileMetadataInfo.getFileSize())));
exportKnowledgeDtoList.add(exportKnowledgeDto);
}
ExcelUtil.exportExcelNoMerge(JSONArray.from(dataList),exportExcelFormats,httpServletResponse);
ExcelUtil.exportExcelNoMerge(JSONArray.from(exportKnowledgeDtoList),exportExcelFormats,httpServletResponse);
} else {
response = SdmResponse.failed(taskRespond.getMessage());
}