From 5652acfd578f66353f59f398f42c88da901e245e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 15:55:23 +0800
Subject: [PATCH] fix: 附件上传路径link,设备巡检附件去重
---
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index 6f39755..bdfd5c6 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -2,23 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.other.service.TempFileService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.util.URLEncoder;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -26,6 +25,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -76,8 +76,17 @@
tempFileRecord.setExpireTime(LocalDateTime.now().plusHours(2)); // 2灏忔椂鍚庤繃鏈�
tempFileRecord.setType(type);
tempFileMapper.insert(tempFileRecord);
-
return tempFileRecord;
+ }
+
+ @Override
+ public String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException{
+ TempFile tempFile = uploadFile(file, type);
+ if (tempFile != null) {
+ migrateTempFilesToFormal(id, Collections.singletonList(tempFile.getTempId()), type);
+ return tempFile.getTempPath();
+ }
+ return null;
}
/**
@@ -139,6 +148,7 @@
fileRecord.setCommonId(businessId);
fileRecord.setName(originalFilename);
fileRecord.setUrl(formalFilePath.toString());
+ fileRecord.setLink(buildAccessLink(formalFilePath));
fileRecord.setCreateTime(LocalDateTime.now());
fileRecord.setType(fileType);
commonFileMapper.insert(fileRecord);
@@ -155,7 +165,7 @@
}
}
-// @Scheduled(cron = "0 0 3 * * ?") // 姣忓ぉ鍑屾櫒3鐐规墽琛�
+ // @Scheduled(cron = "0 0 3 * * ?") // 姣忓ぉ鍑屾櫒3鐐规墽琛�
public void cleanupExpiredTempFiles() {
LambdaQueryWrapper<TempFile> wrapper = new LambdaQueryWrapper<>();
wrapper.lt(TempFile::getExpireTime, LocalDateTime.now()); // expireTime < 褰撳墠鏃堕棿
@@ -175,4 +185,20 @@
}
log.info("杩囨湡涓存椂鏂囦欢娓呯悊瀹屾垚锛屽叡娓呯悊 {} 涓枃浠�", expiredFiles.size());
}
+
+ 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;
+ }
}
--
Gitblit v1.9.3