From 9fdc3a488e13456b72513facf25e1e54257f9513 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 22:10:24 +0800
Subject: [PATCH] 保安员导出问题
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 96ce7bd..3ebc751 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -34,8 +34,11 @@
// 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,24 +60,18 @@
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, 2);
-// System.out.println("substring1 = " + substring1);
if (substring1.equals("ni")){
System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
@@ -85,6 +82,7 @@
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
is.close();
ftp.completePendingCommand();
@@ -136,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);
// 登陆
@@ -183,6 +184,7 @@
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
//返回
return result;
}
@@ -215,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);
// 登陆
@@ -261,6 +266,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
@@ -295,7 +301,9 @@
FTPClient ftp = new FTPClient();
try {
//设置超时时间
- ftp.setConnectTimeout(2000);
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -360,6 +368,7 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
@@ -442,6 +451,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
+// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
--
Gitblit v1.9.3