From 80e1bfbfd98c8213cd19a2efb021e6e7902fc799 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 08:27:49 +0800
Subject: [PATCH] 新增任务

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

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index c80b99b..513e91f 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -24,100 +24,6 @@
 @Component
 public class Monitor {
 
-	/**
-	 * 读取文件(用户对象)单用户新增
-	 * @return
-	 */
-	@Scheduled(cron = "*/5 * * * * ?")
-	public static Result readFile() {
-		String uuid = "123-456";
-		//创建 ftp 对象
-		FTPClient ftp = new FTPClient();
-		boolean flag = false;
-		try {
-			//连接
-			ftp.connect(ftpHost, ftpPort);
-
-			// 登陆
-			ftp.login(ftpUserNameIn, ftpPasswordIn);
-			// 检验登陆操作的返回码是否正确
-			if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-				ftp.disconnect();
-				return new Result(400,null,"ftp 连接失败",null);
-			}
-
-			ftp.enterLocalActiveMode();
-
-			// 设置文件类型为二进制,与ASCII有区别
-			ftp.setFileType(FTP.BINARY_FILE_TYPE);
-
-			// 设置编码格式
-			ftp.setControlEncoding("GBK");
-			// 检验文件是否存在
-			boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
-			System.out.println("检验文件是否存在 = " + ftpFile);
-			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("-----有读取到文件--------");
-				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")){
-						System.out.println("-------接收到内网回传的文件: " + substring1);
-					    //把文件下载到本地
-						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
-						// 解析数据
-						String s = OutJson.TestJson(fileName);
-						//数据处理
-						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) {
-							//返回
-							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);
-						}
-					}
-				}
-				System.out.println("未读取到对应的文件");
-				return new Result(400,null,"未读取到对应的文件",null);
-			}
-		} catch (Exception e) {
-			System.out.println("ftp连接失败");
-			e.printStackTrace();
-		} finally {
-			if (ftp != null) {
-				try {
-					ftp.disconnect();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return new Result(400,null,"失败",null);
-	}
 
 	/**
 	 * 读取文件(用户对象)单用户新增
@@ -125,6 +31,7 @@
 	 * @return
 	 */
 	public static Result isFTPFileExist(String uuid) {
+		System.out.println("uuid = " + uuid);
 		//创建 ftp 对象
 		FTPClient ftp = new FTPClient();
 		boolean flag = false;
@@ -142,6 +49,7 @@
 
 			ftp.enterLocalActiveMode();
 
+
 			// 设置文件类型为二进制,与ASCII有区别
 			ftp.setFileType(FTP.BINARY_FILE_TYPE);
 
@@ -150,6 +58,9 @@
 			// 检验文件是否存在
 			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("开始读取内网回传消息");
@@ -243,6 +154,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);
@@ -318,6 +233,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);
@@ -391,6 +310,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return false;
@@ -485,6 +408,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);

--
Gitblit v1.9.3