From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式
---
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 40098d5..093ddab 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -8,17 +8,14 @@
import com.ruoyi.other.service.TempFileService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import lombok.RequiredArgsConstructor;
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,22 +23,20 @@
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;
@Service
@Slf4j
+@RequiredArgsConstructor
public class TempFileServiceImpl extends ServiceImpl<TempFileMapper, TempFile> implements TempFileService {
- @Autowired
- private TempFileMapper tempFileMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
+ private final TempFileMapper tempFileMapper;
+ private final CommonFileMapper commonFileMapper;
@Value("${file.upload-dir}")
private String uploadDir;
-
@Value("${file.temp-dir}")
private String tempDir;
@@ -75,9 +70,19 @@
tempFileRecord.setTempPath(tempFilePath.toString());
tempFileRecord.setExpireTime(LocalDateTime.now().plusHours(2)); // 2灏忔椂鍚庤繃鏈�
tempFileRecord.setType(type);
+ tempFileRecord.setFileSize(file.getSize());
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;
}
/**
@@ -141,6 +146,7 @@
fileRecord.setUrl(formalFilePath.toString());
fileRecord.setCreateTime(LocalDateTime.now());
fileRecord.setType(fileType);
+ fileRecord.setFileSize(tempFile.getFileSize());
commonFileMapper.insert(fileRecord);
// 鍒犻櫎涓存椂鏂囦欢璁板綍
@@ -155,7 +161,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 < 褰撳墠鏃堕棿
--
Gitblit v1.9.3