From 2ebca060a47784db76369a4aa84f63293da9be33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 10:08:08 +0800
Subject: [PATCH] 保安员新增同步编号问题

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index f878947..731f68c 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -9,6 +9,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import static org.springblade.common.config.FtpConfig.*;
 
@@ -16,13 +18,12 @@
 @Component
 public class Monitor {
 
-	@Scheduled(cron = "*/1 * * * * ?")
+//	@Scheduled(cron = "*/5 * * * * ?")
 	public static boolean isFTPFileExist() {
 
 		FTPClient ftp = new FTPClient();
 		String fileName = null;
 		try {
-
 			ftp.connect(ftpHost, ftpPort);
 
 			// 登陆
@@ -34,7 +35,7 @@
 				return false;
 			}
 
-			System.out.println("ftp 连接成功!");
+			System.out.println("ftp 连接成功!时间: "+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 
 			//被动模式,文件上传不成功会有提示
 			ftp.enterLocalActiveMode();
@@ -49,13 +50,13 @@
 			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
 			if (files.length == 0) {
-				return false;
+				ftp.disconnect();
 			} else {
 				for (FTPFile file : files) {
-					 fileName = file.getName();
+					fileName = file.getName();
 					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 					if (null == is) {
-						return false;
+						ftp.disconnect();
 					} else {
 						String substring1 = fileName.substring(0, 1);
 						//把文件下载到本地
@@ -144,17 +145,17 @@
 				}
 				return true;
 			}
-
 		} catch (Exception e) {
 			MysqlCenlint.deletess(fileName);
 			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 			e.printStackTrace();
 		} finally {
-			if (ftp != null) {
+			//如果ftp 没有关闭,则关闭ftp
+			if (ftp.isConnected()) {
 				try {
 					ftp.disconnect();
-				} catch (IOException e) {
-					e.printStackTrace();
+				} catch (IOException io) {
+					io.printStackTrace();
 				}
 			}
 		}

--
Gitblit v1.9.3