From 7f36a55767f870937a473f9c0eebf0240300a5ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 22:07:21 +0800
Subject: [PATCH] ftp 个人保安新增修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 69 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index d92f97c..624126b 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -68,45 +68,36 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
for (FTPFile file : files){
String fileName = file.getName();
if (fileName.contains("ni")){
System.out.println("-------接收到内网回传的文件： " + fileName);
- //把文件下载到本地
+ //把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
+ System.out.println("s = " + s);
//数据处理
Result result = DataHandler.handler(s,uuid);
- //删除本地文件
- MysqlCenlint.deletess(fileName);
-// ftp.dele(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ //匹配上了删除文件
+ if (result.getCode()==200) {
+ flag = true;
+ //删除本地文件
+ MysqlCenlint.deletess(fileName);
+ //删除 ftp 文件
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
+ //返回
+ return result.getData().get(0);
+ }
ftp.completePendingCommand();
ftp.logout();
- if (result.getCode()==200) {
- //返回
- return new Result(200,null,"新增成功",null);
- }
- if (result.getCode()==201) {
- //返回
- return new Result(201,null,"修改成功",null);
- }
- if (result.getCode()==202) {
- //返回
- return new Result(202,null,result.getMsg(),null);
- }
- if (result.getCode()==203) {
- //返回
- return new Result(203,null,result.getMsg(),null);
- }
- if (result.getCode()==205){
- //返回
- return new Result(202,null,"新增失败,找不到该用户",null);
- }
}
}
- System.out.println("未读取到对应的文件");
+// if (!flag){
+// ftp.logout();
+// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
@@ -165,6 +156,7 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
for (FTPFile file : files){
String fileName = file.getName();
if (fileName.contains("nl")){
@@ -176,19 +168,23 @@
Result result = DataHandler.handlerList(s,uuid);
//匹配上了删除文件
if (result.getCode()==200) {
+ flag = true;
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
// ftp.dele(fileName);
+
//返回
return result;
}
-// is.close();
ftp.completePendingCommand();
ftp.logout();
}
}
+// if (!flag){
+// ftp.logout();
+// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
@@ -247,6 +243,7 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
for (FTPFile file : files){
String fileName = file.getName();
if (fileName.contains("nt")){
@@ -258,18 +255,21 @@
Result result = DataHandler.handlerList(s,uuid);
//匹配上了删除文件
if (result.getCode()==200) {
+ flag = true;
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.completePendingCommand();
+ ftp.logout();
//返回
return result;
}
-// is.close();
- ftp.completePendingCommand();
- ftp.logout();
}
+ }
+ if (!flag){
+ ftp.logout();
}
return new Result(400,null,"未读取到对应的文件",null);
}
@@ -422,6 +422,7 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
for (FTPFile file : files){
String fileName = file.getName();
if (fileName.contains("ns")){
@@ -433,18 +434,22 @@
Result result = DataHandler.handlerSecurityNumberBit(s,uuid);
//匹配上了删除文件
if (result.getCode()==200) {
+ flag = true;
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ ftp.completePendingCommand();
+ ftp.logout();
//返回
return result;
}
- ftp.completePendingCommand();
- ftp.logout();
}
}
+ if (!flag){
+ ftp.logout();
+ }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
--
Gitblit v1.9.3