From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 146 +++++++++---------------------------------------
1 files changed, 28 insertions(+), 118 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 624126b..d326a2b 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.*;
@@ -31,6 +34,7 @@
* @return
*/
public static Result isFTPFileExist(String uuid) {
+ String name = "ni"+uuid;
// System.out.println("uuid = " + uuid);
//创建 ftp 对象
FTPClient ftp = new FTPClient();
@@ -68,36 +72,35 @@
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
} else {
- boolean flag = false;
for (FTPFile file : files){
String fileName = file.getName();
- if (fileName.contains("ni")){
+ if (fileName.equals(name)){
System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
- String s = OutJson.TestJson(fileName);
- System.out.println("s = " + s);
+ 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.getData().get(0);
+ return new Result(200,null,list);
}
- ftp.completePendingCommand();
- ftp.logout();
}
}
-// if (!flag){
-// ftp.logout();
-// }
+ ftp.completePendingCommand();
+ ftp.logout();
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
@@ -174,7 +177,6 @@
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
// ftp.dele(fileName);
-
//返回
return result;
}
@@ -261,16 +263,16 @@
//删除 ftp 文件
// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- ftp.completePendingCommand();
- ftp.logout();
//返回
return result;
}
+ ftp.completePendingCommand();
+ ftp.logout();
}
}
- if (!flag){
- ftp.logout();
- }
+// if (!flag){
+// ftp.logout();
+// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
@@ -286,99 +288,6 @@
}
}
return new Result(400,null,"失败",null);
- }
-
- /**
- * 读取内外推送的文件,每30秒读取一次
- * @return
- */
-// @Scheduled(cron = "*/30 * * * * ?")
- public static boolean isFTPFileExist() {
- FTPClient ftp = new FTPClient();
- try {
- //设置超时时间
- ftp.setDataTimeout(60000);
- //连接超时为60秒
- ftp.setConnectTimeout(60000);
- //连接
- ftp.connect(ftpHost, ftpPort);
- // 登陆
- ftp.login(ftpUserNameIn, ftpPasswordIn);
- // 检验登陆操作的返回码是否正确
- if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
- ftp.disconnect();
- return false;
- }
-
- ftp.enterLocalActiveMode();
-
- // 设置文件类型为二进制，与ASCII有区别
- ftp.setFileType(FTP.BINARY_FILE_TYPE);
-
- // 设置编码格式
- ftp.setControlEncoding("GBK");
-
- // 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
-
- // Use passive mode as default
- ftp.enterLocalPassiveMode();
-
- FTPFile[] files = ftp.listFiles();
- if (files.length==0){
- return false;
- }
- else {
- for (FTPFile file : files) {
- String fileName = file.getName();
- if (fileName.contains("nq")) {
- //把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, 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);
- }
- }
- //删除本地服务器文件
- MysqlCenlint.deletess(fileName);
- //删除 ftp 服务器文件
-// ftp.dele(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- }
- ftp.completePendingCommand();
- ftp.logout();
- }
- }
- } catch (Exception e) {
- System.out.println("ftp连接失败");
- e.printStackTrace();
- } finally {
- if (ftp.isConnected()) {
- try {
- ftp.disconnect();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return false;
}
/**
@@ -440,16 +349,17 @@
//删除 ftp 文件
// ftp.dele(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- ftp.completePendingCommand();
- ftp.logout();
+
//返回
return result;
}
+ ftp.completePendingCommand();
+ ftp.logout();
}
}
- if (!flag){
- ftp.logout();
- }
+// if (!flag){
+// ftp.logout();
+// }
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
--
Gitblit v1.9.3