From dacafac0449f8df3ef7637a7ed05fa6270964f16 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 16:19:45 +0800
Subject: [PATCH] ftp 修改，新增保安员培训报名校验，新增押运员批量导入校验，批量导入保安员优化
---
src/main/java/org/springblade/modules/FTP/FtpUtil.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index 53cf37c..aa2bd4f 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -6,13 +6,12 @@
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPReply;
-
import java.io.*;
import java.net.SocketException;
import java.util.Date;
+import java.util.Map;
-import static org.springblade.common.constant.FtpConstant.*;
-import static org.springblade.common.constant.FtpConstant.ftpPassword;
+import static org.springblade.common.config.FtpConfig.*;
/**
* ftp工具类
@@ -302,7 +301,62 @@
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "w"+response1+".json", in1);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "w"+response1+".json", in1);
+ MysqlCenlint.deletess("w"+response1+".json");
}
+ /**
+ * 执行 对象数据（用户，报名对象信息等） 上传
+ * @param obj 对象信息
+ */
+ public static void objectFileUpload(Object obj){
+ String json1 = JSON.toJSONString(obj);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "o"+response1);
+ FileInputStream in1 = null;
+ try {
+ in1 = new FileInputStream(new File(localPath + "o"+response1+".json"));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "o"+response1+".json", in1);
+ MysqlCenlint.deletess("o"+response1+".json");
+ }
+
+ /**
+ * 用户集合
+ * @param map
+ */
+ public static void objectFileUploadList(Map<String, Object> map) {
+ String json1 = JSON.toJSONString(map);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "l"+response1);
+ FileInputStream in1 = null;
+ try {
+ in1 = new FileInputStream(new File(localPath + "l"+response1+".json"));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "l"+response1+".json", in1);
+ MysqlCenlint.deletess("l"+response1+".json");
+ }
+
+ /**
+ * 报名信息查验
+ * @param map
+ */
+ public static void objectFileUploadListUserId(Map<String, Object> map){
+ String json1 = JSON.toJSONString(map);
+ System.out.println("json1 = " + json1);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "t"+response1);
+ FileInputStream in1 = null;
+ try {
+ in1 = new FileInputStream(new File(localPath + "t"+response1+".json"));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "t"+response1+".json", in1);
+ MysqlCenlint.deletess("t"+response1+".json");
+ }
}
--
Gitblit v1.9.3