From b5a87e4b0da54ad57f195e52cd06e7824e2e1f54 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 16:41:47 +0800
Subject: [PATCH] yys 1.app推送接口 2.数采缓存 3.数采历史数据

---
 src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java |   19 ++++++++++++++-----
 1 files changed, 14 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 40098d5..6d870af 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -9,16 +9,13 @@
 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 +23,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;
 
@@ -75,9 +73,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 +149,7 @@
                 fileRecord.setUrl(formalFilePath.toString());
                 fileRecord.setCreateTime(LocalDateTime.now());
                 fileRecord.setType(fileType);
+                fileRecord.setFileSize(tempFile.getFileSize());
                 commonFileMapper.insert(fileRecord);
 
                 // 鍒犻櫎涓存椂鏂囦欢璁板綍
@@ -155,7 +164,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