src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -97,9 +97,6 @@ } else { sysUserMap = new HashMap<>(); } //巡检人ids List<String> inspectorIds = entityPage.getRecords().stream().map(InspectionTask::getInspectorId).collect(Collectors.toList()); //获取所有不重复的用户ID Set<Long> allUserIds = entityPage.getRecords().stream() .map(InspectionTask::getInspectorId) // 获取"2,3"这样的字符串 @@ -162,9 +159,18 @@ dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); // 初始化三个附件列表 dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList())); dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList())); dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList())); List<CommonFile> taskFiles = finalCommonFiles.stream() .filter(commonFile -> Objects.equals(commonFile.getCommonId(), inspectionTask.getId())) .collect(Collectors.toList()); dto.setCommonFileList(taskFiles.stream() .filter(commonFile -> Objects.equals(commonFile.getType(), FileNameType.INSPECTION.getValue())) .collect(Collectors.toList())); dto.setCommonFileListAfter(taskFiles.stream() .filter(commonFile -> Objects.equals(commonFile.getType(), FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())) .collect(Collectors.toList())); dto.setCommonFileListBefore(taskFiles.stream() .filter(commonFile -> Objects.equals(commonFile.getType(), FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())) .collect(Collectors.toList())); return dto; src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.config.RuoYiConfig; import com.ruoyi.other.mapper.TempFileMapper; import com.ruoyi.other.pojo.TempFile; import com.ruoyi.sales.mapper.CommonFileMapper; @@ -86,6 +89,7 @@ commonFile.setCommonId(id); commonFile.setName(file.getOriginalFilename()); commonFile.setUrl(tempFilePath.toString()); commonFile.setLink(buildAccessLink(tempFilePath)); commonFile.setType(type); commonFileMapper.insert(commonFile); return commonFile; @@ -133,7 +137,7 @@ String formalFilename = businessId + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID().toString().substring(0, 8) + (com.ruoyi.common.utils.StringUtils.hasText(fileExtension) ? "." + fileExtension : ""); (StringUtils.hasText(fileExtension) ? "." + fileExtension : ""); Path formalFilePath = formalDirPath.resolve(formalFilename); @@ -155,6 +159,7 @@ fileRecord.setCommonId(businessId); fileRecord.setName(originalFilename); fileRecord.setUrl(formalFilePath.toString()); fileRecord.setLink(buildAccessLink(formalFilePath)); fileRecord.setCreateTime(LocalDateTime.now()); fileRecord.setType(tempFile.getType()); commonFileMapper.insert(fileRecord); @@ -167,4 +172,20 @@ } } } private String buildAccessLink(Path formalFilePath) { String normalizedPath = formalFilePath.toString().replace("\\", "/"); String profile = RuoYiConfig.getProfile(); String normalizedProfile = profile == null ? "" : profile.replace("\\", "/"); String relativePath = normalizedPath; if (StringUtils.hasText(normalizedProfile) && normalizedPath.startsWith(normalizedProfile)) { relativePath = normalizedPath.substring(normalizedProfile.length()); } if (!relativePath.startsWith("/")) { relativePath = "/" + relativePath; } return Constants.RESOURCE_PREFIX + relativePath; } }
