更新上传下载

ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/service/impl/CommonServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.framework.recovery.service.impl;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.ConvertToMultipartFile;
 import com.ruoyi.common.utils.FTPUtil;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.UUID;
@@ -11,8 +12,6 @@ import com.ruoyi.framework.recovery.domain.RecStores;
 import com.ruoyi.framework.recovery.mapper.RecCommodityMapper;
 import com.ruoyi.framework.recovery.mapper.RecStoresMapper;
 import com.ruoyi.framework.recovery.service.ICommonService;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Objects;
@@ -69,9 +66,9 @@ public class CommonServiceImpl implements ICommonService {
         File toFile = multipartFileToFile(file);
         // 上传至ftp服务器
         if (ftpUtil.uploadToFtp(filePath, newFileName, toFile)) {
-            System.out.println("上传至ftp服务器！");
+            log.info("上传至ftp服务器！");
         } else {
-            System.out.println("上传至ftp服务器失败!");
+            log.info("上传至ftp服务器失败!");
         }
         // 如果是图片，就上传缩略图
         if (isImg) {
@@ -85,15 +82,17 @@ public class CommonServiceImpl implements ICommonService {
             File thuFile = multipartFileToFile(multipartFile);
             ftpUtil.uploadToFtp(fileThu, newFileName, thuFile);
         }
-        updateDb(filePath + newFileName, fileThu + newFileName, type, id);
-
+        // 新增由前端拼接
+        if (null != id) {
+            updateDb(filePath + newFileName, fileThu + newFileName, type, id);
+        }
         // 上传并返回新文件名称
-        String fileName = FileUploadUtils.upload(filePath, file);
+//        String fileName = FileUploadUtils.upload(filePath, file);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("thuUrl", fileThu + newFileName);
         ajax.put("hdUrl", filePath + newFileName);
-        ajax.put("fileName", fileName);
-        ajax.put("newFileName", FileUtils.getName(fileName));
+        ajax.put("fileName", file.getOriginalFilename());
+        ajax.put("newFileName", FileUtils.getName(newFileName));
         ajax.put("originalFilename", file.getOriginalFilename());
         return ajax;
     }