From df054296327ebca617a9c19bb01139b9c40bf232 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 11:25:44 +0800
Subject: [PATCH] 培训报名，保安员头像导入新增修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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..16fd859 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -31,7 +31,7 @@
* @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;
@@ -57,26 +57,26 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
- System.out.println("检验文件是否存在 = " + ftpFile);
+// System.out.println("检验文件是否存在 = " + ftpFile);
// Use passive mode as default
ftp.enterLocalPassiveMode();
FTPFile[] files = ftp.listFiles();
- System.out.println("files = " + files);
- System.out.println("开始读取内网回传消息");
+// System.out.println("files = " + files);
+// System.out.println("开始读取内网回传消息");
if (files.length==0){
- System.out.println("未读取到文件");
+// System.out.println("未读取到文件");
return new Result(400,null,"未读取到文件",null);
} else {
- System.out.println("-----有读取到文件--------");
+// System.out.println("-----有读取到文件--------");
for (FTPFile file : files){
String fileName = file.getName();
- System.out.println("fileName = " + fileName);
+// 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);
+ String substring1 = fileName.substring(0, 2);
+// System.out.println("substring1 = " + substring1);
+ if (substring1.equals("ni")){
+ System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -85,7 +85,8 @@
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.dele(fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
@@ -103,6 +104,10 @@
if (result.getCode()==203) {
//返回
return new Result(203,null,result.getMsg(),null);
+ }
+ if (result.getCode()==205){
+ //返回
+ return new Result(202,null,"新增失败,找不到该用户",null);
}
}
}
@@ -178,7 +183,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.dele(fileName);
//返回
return result;
}
@@ -257,7 +263,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.dele(fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -286,10 +293,12 @@
* 读取内外推送的文件,每30秒读取一次
* @return
*/
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
try {
+ //设置超时时间
+ ftp.setConnectTimeout(2000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -325,8 +334,8 @@
if (null == is) {
return false;
} else {
- String substring1 = fileName.substring(0, 4);
- if (substring1.equals("nsql")) {
+ String substring1 = fileName.substring(0, 2);
+ if (substring1.equals("nq")) {
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
//
@@ -354,7 +363,8 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.dele(fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
is.close();
@@ -388,6 +398,10 @@
FTPClient ftp = new FTPClient();
boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -432,7 +446,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.dele(fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -446,7 +461,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
--
Gitblit v1.9.3