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 fileDtos = new ArrayList<>(); Page 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 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 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 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 {