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 | 152 ++++++++++++++++++++++++--------------------------
1 files changed, 72 insertions(+), 80 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 53d9c4e..624126b 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -68,54 +68,43 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
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 (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);
-// is.close();
- ftp.completePendingCommand();
+ //匹配上了删除文件
if (result.getCode()==200) {
+ flag = true;
+ //删除本地文件
+ MysqlCenlint.deletess(fileName);
+ //删除 ftp 文件
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
//返回
- return new Result(200,null,"新增成功",null);
+ return result.getData().get(0);
}
- 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);
- }
+ ftp.completePendingCommand();
+ ftp.logout();
}
}
- System.out.println("未读取到对应的文件");
+// if (!flag){
+// ftp.logout();
+// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -167,11 +156,10 @@
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")){
- //转流
-// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -180,25 +168,30 @@
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) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -250,10 +243,9 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
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 (fileName.contains("nt")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -263,17 +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();
}
+ }
+ if (!flag){
+ ftp.logout();
}
return new Result(400,null,"未读取到对应的文件",null);
}
@@ -281,7 +277,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -335,52 +331,46 @@
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, 2);
- if (fileName.contains("nq")) {
- //把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
- //
- String s = OutJson.TestJson(fileName);
- //sql语句
- String sql = OutJson.stringReplace(s);
- String[] split = sql.split(";");//以逗号分割
- for (String sqls : split) {
- //判断是否是新增，删除，修改
- String substring = sqls.substring(0, 2);
- //新增
- if (substring.equals("in")) {
- //运行sql语句
- MysqlCenlint.inster(sqls);
- }
- //修改
- else if (substring.equals("up")) {
- MysqlCenlint.update(sqls);
- }
- //删除
- else {
- MysqlCenlint.delete(sqls);
- }
+ if (fileName.contains("nq")) {
+ //把文件下载到本地
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
+ //
+ String s = OutJson.TestJson(fileName);
+ //sql语句
+ String sql = OutJson.stringReplace(s);
+ String[] split = sql.split(";");//以逗号分割
+ for (String sqls : split) {
+ //判断是否是新增，删除，修改
+ String substring = sqls.substring(0, 2);
+ //新增
+ if (substring.equals("in")) {
+ //运行sql语句
+ MysqlCenlint.inster(sqls);
}
- //删除本地服务器文件
- MysqlCenlint.deletess(fileName);
- //删除 ftp 服务器文件
-// ftp.dele(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ //修改
+ else if (substring.equals("up")) {
+ MysqlCenlint.update(sqls);
+ }
+ //删除
+ else {
+ MysqlCenlint.delete(sqls);
+ }
}
- //关闭流
-// is.close();
- ftp.completePendingCommand();
+ //删除本地服务器文件
+ MysqlCenlint.deletess(fileName);
+ //删除 ftp 服务器文件
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ }
+ ftp.completePendingCommand();
+ ftp.logout();
}
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -399,7 +389,6 @@
public static Result getSecurityNumberBit(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
//设置超时时间
ftp.setDataTimeout(60000);
@@ -433,10 +422,9 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
+ boolean flag = false;
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 (fileName.contains("ns")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -446,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;
}
-// is.close();
- ftp.completePendingCommand();
}
}
+ if (!flag){
+ ftp.logout();
+ }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
--
Gitblit v1.9.3