From 0e3b84e870ddbb254627ecf34b21c2a3d50a577d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Jun 2022 12:56:34 +0800
Subject: [PATCH] ftp 新增逻辑修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 210eaae..81f9a5f 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -1,5 +1,6 @@
package org.springblade.modules.FTP;
+import com.alibaba.fastjson.JSON;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
@@ -12,7 +13,9 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.SocketException;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import static org.springblade.common.config.FtpConfig.*;
@@ -76,27 +79,28 @@
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
- String s = OutJson.TestJson(fileName);
+ String json = OutJson.TestJson(fileName);
//数据处理
- Result result = DataHandler.handler(s,uuid);
- //匹配上了删除文件
- if (result.getCode()==200) {
- flag = true;
+ Map map = JSON.parseObject(json, Map.class);
+ //获取结果
+ Object o = map.get(uuid);
+ if (null!= o || !o.equals("")){
+ Result result = JSON.parseObject(o.toString(), Result.class);
+ System.out.println("读取返回结果 result = " + result);
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
// ftp.dele(fileName);
+ List<Result> list = new ArrayList<>();
+ list.add(result);
//返回
- return result;
+ return new Result(200,null,list);
}
}
}
ftp.completePendingCommand();
ftp.logout();
-// if (!flag){
-// ftp.logout();
-// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
--
Gitblit v1.9.3