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 |  196 +++++++++++++++++++++++++------------------------
 1 files changed, 100 insertions(+), 96 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 564ca29..624126b 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,67 +60,51 @@
 			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("-----有读取到文件--------");
+				boolean flag = false;
 				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, 1);
-//					System.out.println("substring1 = " + substring1);
-					if (substring1.equals("n")){
+					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);
-						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) {
@@ -136,8 +123,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);
 			// 登陆
@@ -166,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();
-					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
-					String substring1 = fileName.substring(0, 2);
-					if (substring1.equals("nl")){
+					if (fileName.contains("nl")){
 						//把文件下载到本地
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
 						// 解析数据
@@ -179,24 +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) {
@@ -215,8 +210,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);
 			// 登陆
@@ -245,11 +243,10 @@
 			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 (substring1.equals("nt")){
+					if (fileName.contains("nt")){
 						//把文件下载到本地
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
 						// 解析数据
@@ -258,16 +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);
 			}
@@ -275,7 +277,7 @@
 			System.out.println("ftp连接失败");
 			e.printStackTrace();
 		} finally {
-			if (ftp != null) {
+			if (ftp.isConnected()) {
 				try {
 					ftp.disconnect();
 				} catch (IOException e) {
@@ -290,12 +292,14 @@
 	 * 读取内外推送的文件,每30秒读取一次
 	 * @return
 	 */
-	@Scheduled(cron = "*/30 * * * * ?")
+//	@Scheduled(cron = "*/30 * * * * ?")
 	public static boolean isFTPFileExist() {
 		FTPClient ftp = new FTPClient();
 		try {
 			//设置超时时间
-			ftp.setConnectTimeout(2000);
+			ftp.setDataTimeout(60000);
+			//连接超时为60秒
+			ftp.setConnectTimeout(60000);
 			//连接
 			ftp.connect(ftpHost, ftpPort);
 			// 登陆
@@ -327,53 +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, 4);
-						if (substring1.equals("nsql")) {
-							//把文件下载到本地
-							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 服务器文件
-							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);
 					}
-					return true;
+					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) {
@@ -392,8 +389,11 @@
 	public static Result getSecurityNumberBit(String uuid) {
 		//创建 ftp 对象
 		FTPClient ftp = new FTPClient();
-		boolean flag = false;
 		try {
+			//设置超时时间
+			ftp.setDataTimeout(60000);
+			//连接超时为60秒
+			ftp.setConnectTimeout(60000);
 			//连接
 			ftp.connect(ftpHost, ftpPort);
 			// 登陆
@@ -422,11 +422,10 @@
 			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 (substring1.equals("ns")){
+					if (fileName.contains("ns")){
 						//把文件下载到本地
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
 						// 解析数据
@@ -435,16 +434,21 @@
 						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);
 			}
@@ -452,7 +456,7 @@
 			System.out.println("ftp连接失败");
 			e.printStackTrace();
 		} finally {
-			if (ftp != null) {
+			if (ftp.isConnected()) {
 				try {
 					ftp.disconnect();
 				} catch (IOException e) {

--
Gitblit v1.9.3