From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序

---
 src/main/java/org/springblade/modules/FTP/monitor.java |  103 ++++++++++++++++++++++++++-------------------------
 1 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index 25fb817..984a8f8 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -8,26 +8,18 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.InputStream;
+
+import static org.springblade.common.constant.FtpConstant.*;
 
 @Component
 public class monitor {
-	//ftp服务器IP地址
-	private static String ftpHost = "192.168.0.105";
-	//ftp服务器端口
-	private static int ftpPort = 21;
-	//ftp服务器用户名
-	private static String ftpUserName = "yly";
-	//ftp服务器密码
-	private static String ftpPassword = "Yly@123";
-	//ftp服务器路径
-	private static String ftpPath = "anbao/";
-	//本地路径
-	private static String localPath = "D:\\anbao";
+
 	//文件名
 	//private static String fileName = "nsql.json";
 
 
-	@Scheduled(cron = "*/30 * * * * ?")
+	//@Scheduled(cron = "*/30 * * * * ?")
 	public static boolean isFTPFileExist() {
 
 		FTPClient ftp = new FTPClient();
@@ -36,7 +28,7 @@
 
 			// 连接ftp服务器
 
-			ftp.connect(ftpHost, ftpPort);
+			ftp.connect(ftpHost_dev, ftpPort);
 
 			// 登陆
 
@@ -61,7 +53,6 @@
 			// 设置编码格式
 
 			ftp.setControlEncoding("GBK");
-
 			// 提取绝对地址的目录以及文件名
 
 			//ftpPath = ftpPath.replace("ftp://" + ftpHost + ":" + ftpPort + "/", "");
@@ -75,45 +66,58 @@
 			//ftp.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 
 			// 检验文件是否存在
+			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
-			if (files.length==0){
+			if (files.length == 0) {
 				return false;
-			}
-			else {
-				for (FTPFile file : files){
+			} else {
+				for (FTPFile file : files) {
 					String fileName = file.getName();
-					String substring1 = fileName.substring(0, 1);
-					if (substring1.equals("w")) {
-						//把文件下载到本地
-						FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, 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);
+					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+					if (null == is) {
+						return false;
+					} else {
+						String substring1 = fileName.substring(0, 1);
+						if (substring1.equals("w")) {
+							//把文件下载到本地
+							FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, 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);
+								}
 							}
-							//修改
-							else if (substring.equals("up")) {
-								MysqlCenlint.update(sqls);
-							}
-							//删除
-							else {
-								MysqlCenlint.delete(sqls);
-							}
+							//删除本地文件
+//						MysqlCenlint.deletes(fileName);
+							MysqlCenlint.deletess(fileName);
+							FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							is.close();
+							ftp.completePendingCommand();
 						}
-						//删除本地文件
-						MysqlCenlint.deletes(fileName);
-						MysqlCenlint.deletess(fileName);
-						FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-						//is.close();
-						ftp.completePendingCommand();
+						else {
+							//把文件下载到本地
+							FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, MinioPath, fileName);
+							//MysqlCenlint.deletess(fileName);
+							FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							is.close();
+							ftp.completePendingCommand();
+						}
 					}
 				}
 				return true;
@@ -162,7 +166,6 @@
 
 
 		} catch (Exception e) {
-
 			e.printStackTrace();
 
 		} finally {

--
Gitblit v1.9.3