From 2ec204948e957a03149dba08ed78ef4561aa9758 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 15:48:18 +0800
Subject: [PATCH] ftp 文件读取修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 96 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 513e91f..53d9c4e 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -31,11 +31,14 @@
* @return
*/
public static Result isFTPFileExist(String uuid) {
- System.out.println("uuid = " + uuid);
+// System.out.println("uuid = " + uuid);
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
@@ -57,26 +60,20 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
- System.out.println("检验文件是否存在 = " + ftpFile);
+
// Use passive mode as default
ftp.enterLocalPassiveMode();
FTPFile[] files = ftp.listFiles();
- System.out.println("files = " + files);
- System.out.println("开始读取内网回传消息");
if (files.length==0){
- System.out.println("未读取到文件");
return new Result(400,null,"未读取到文件",null);
} else {
- System.out.println("-----有读取到文件--------");
for (FTPFile file : files){
String fileName = file.getName();
- System.out.println("fileName = " + fileName);
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 1);
- System.out.println("substring1 = " + substring1);
- if (substring1.equals("n")){
- System.out.println("-------接收到内网回传的文件： " + substring1);
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("ni")){
+ System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -85,8 +82,9 @@
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- is.close();
+// is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
//返回
@@ -103,6 +101,10 @@
if (result.getCode()==203) {
//返回
return new Result(203,null,result.getMsg(),null);
+ }
+ if (result.getCode()==205){
+ //返回
+ return new Result(202,null,"新增失败,找不到该用户",null);
}
}
}
@@ -132,8 +134,11 @@
public static Result getFtpDataByUuidList(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -164,9 +169,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("nl")){
+ if (fileName.contains("nl")){
+ //转流
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -179,10 +184,11 @@
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
@@ -211,8 +217,11 @@
public static Result getFtpDataByUuidListTrain(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -243,9 +252,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("nt")){
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("nt")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -257,11 +266,12 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
@@ -286,10 +296,14 @@
* 读取内外推送的文件,每30秒读取一次
* @return
*/
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -321,12 +335,12 @@
else {
for (FTPFile file : files) {
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- if (null == is) {
- return false;
- } else {
- String substring1 = fileName.substring(0, 4);
- if (substring1.equals("nsql")) {
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// if (null == is) {
+// return false;
+// } else {
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("nq")) {
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
//
@@ -354,13 +368,12 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
- is.close();
+// is.close();
ftp.completePendingCommand();
- }
- return true;
}
}
} catch (Exception e) {
@@ -388,6 +401,10 @@
FTPClient ftp = new FTPClient();
boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -418,9 +435,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("ns")){
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("ns")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -432,11 +449,12 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
@@ -446,7 +464,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
--
Gitblit v1.9.3