From c5f3670dfaad3dc2fa3ba62751edcfc3296c963a Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Mon, 30 May 2022 15:29:21 +0800
Subject: [PATCH] 新增保安员定时审查未审查的保安员任务
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index a614d0e..3fa8d6e 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -24,12 +24,14 @@
@Component
public class Monitor {
+
/**
* 读取文件（用户对象）单用户新增
* @param uuid 随机数
* @return
*/
public static Result isFTPFileExist(String uuid) {
+// System.out.println("uuid = " + uuid);
//创建 ftp 对象
FTPClient ftp = new FTPClient();
boolean flag = false;
@@ -44,28 +46,37 @@
ftp.disconnect();
return new Result(400,null,"ftp 连接失败",null);
}
- System.out.println("开始读取内网回传消息");
+
ftp.enterLocalActiveMode();
+
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
// 设置编码格式
ftp.setControlEncoding("GBK");
-
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ 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("未读取到文件");
+// 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);
+ System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -92,6 +103,10 @@
if (result.getCode()==203) {
//返回
return new Result(203,null,result.getMsg(),null);
+ }
+ if (result.getCode()==205){
+ //返回
+ return new Result(202,null,"新增失败,找不到该用户",null);
}
}
}
@@ -143,6 +158,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);
@@ -218,6 +237,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);
@@ -267,10 +290,12 @@
* 读取内外推送的文件,每30秒读取一次
* @return
*/
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
try {
+ //设置超时时间
+ ftp.setConnectTimeout(2000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -291,6 +316,10 @@
// 检验文件是否存在
ftp.changeWorkingDirectory(ftpPath);
+
+ // Use passive mode as default
+ ftp.enterLocalPassiveMode();
+
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return false;
@@ -365,6 +394,10 @@
FTPClient ftp = new FTPClient();
boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -385,6 +418,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);
@@ -419,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