From 424bcce460d6265c2b79487d65d3798a61acd8bf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 18:43:07 +0800
Subject: [PATCH] ftp 个人保安新增修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 82 +++++++++++++++++++++++++----------------
1 files changed, 50 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..8c463f6 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -78,31 +78,36 @@
String s = OutJson.TestJson(fileName);
//数据处理
Result result = DataHandler.handler(s,uuid);
- //删除本地文件
- MysqlCenlint.deletess(fileName);
+ if (result.getCode()==400){
+// return new Result(400,null,"uuid 不匹配",null);
+ break;
+ }else {
+ //删除本地文件
+ MysqlCenlint.deletess(fileName);
// ftp.dele(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- 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);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ 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);
+ }
}
}
}
@@ -165,6 +170,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,18 +182,21 @@
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);
+ ftp.completePendingCommand();
+ ftp.logout();
//返回
return result;
}
-// is.close();
- ftp.completePendingCommand();
- ftp.logout();
}
+ }
+ if (!flag){
+ ftp.logout();
}
return new Result(400,null,"未读取到对应的文件",null);
}
@@ -247,6 +256,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 +268,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 +435,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 +447,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