From 5a8f20362a967ce2e307734f41911feb5d80c9b6 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Tue, 16 Jul 2024 14:30:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Afrom=20file=20=E8=AF=BB=E5=8F=96ftp?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AEftp=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SpectrumFileServiceImpl.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
index f758432a..e9a46635 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
@@ -181,12 +181,13 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
         List<FileDto> fileDtos = new ArrayList<>();
         Page<FileDto> page = new Page<>(pageNo, pageSize);
         try {
-            ftpClient = ftpUtil.LoginFTP();
-            if (ObjectUtil.isNull(ftpClient))
-                return Result.error(Prompt.FTP_ERR);
-            boolean exist = ftpClient.changeWorkingDirectory(filePath);
-            if (!exist) return Result.OK(page);
-            List<FTPFile> ftpFiles = ListUtil.toList(ftpClient.listFiles());
+            File folder = new File(filePath);
+//            ftpClient = ftpUtil.LoginFTP();
+//            if (ObjectUtil.isNull(ftpClient))
+//                return Result.error(Prompt.FTP_ERR);
+//            boolean exist = ftpClient.changeWorkingDirectory(filePath);
+//            if (!exist) return Result.OK(page);
+            List<File> ftpFiles = ListUtil.toList(folder.listFiles());
             // 根据文件名进行过滤
             String name = fileVo.getName();
             if (StrUtil.isNotBlank(name)){
@@ -195,11 +196,10 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
                         .filter(file -> containsAllIgnoreCase(file.getName(),names))
                         .collect(Collectors.toList());
             }
-            for (FTPFile ftpFile : ftpFiles) {
+            for (File ftpFile : ftpFiles) {
                 String fileName = ftpFile.getName();
-                Calendar calendar = ftpFile.getTimestamp();
-                Date updateDate = calendar.getTime();
-                long size = ftpFile.getSize();
+                Date updateDate = new Date(ftpFile.lastModified());
+                long size = ftpFile.length();
                 FileDto fileDto = new FileDto();
                 fileDto.setName(fileName);
                 fileDto.setUpdateDate(updateDate);
@@ -212,7 +212,7 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
             List<FileDto> records = PageUtil.page(pageNo, pageSize, fileDtos);
             page.setRecords(records).setTotal(fileDtos.size());
             return Result.OK(page);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return Result.error(e.getMessage());
         }finally {