From 9934d682a76c8d6bd05bc184bd18c1fe78399f69 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Apr 2022 15:12:48 +0800
Subject: [PATCH] 保安员新增同步修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 22 +++++++++++++++-------
1 files changed, 15 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 b883ab7..63561dc 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -28,7 +28,7 @@
* @param uuid 随机数
* @return
*/
- public static R isFTPFileExist(String uuid) {
+ public static Result isFTPFileExist(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
boolean flag = false;
@@ -40,7 +40,7 @@
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
- return R.data(400,null,"ftp 连接失败");
+ return new Result(400,null,"ftp 连接失败",null);
}
ftp.enterLocalActiveMode();
@@ -55,7 +55,7 @@
ftp.changeWorkingDirectory(ftpPath);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
- return R.data(400,null,"未读取到文件");
+ return new Result(400,null,"未读取到文件",null);
} else {
for (FTPFile file : files){
String fileName = file.getName();
@@ -67,7 +67,7 @@
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
- R result = DataHandler.handler(s,uuid);
+ Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
@@ -75,11 +75,19 @@
ftp.completePendingCommand();
if (result.getCode()==200) {
//返回
- return R.data(result);
+ 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);
}
}
}
- return R.data(400,null,"未读取到对应的文件");
+ return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
System.out.println("ftp连接失败");
@@ -93,7 +101,7 @@
}
}
}
- return R.data(400,null,"失败");
+ return new Result(400,null,"失败",null);
}
/**
--
Gitblit v1.9.3