From 7b291d619aa70e5bb33f2b1caabe7f4b0bd003d9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Jun 2022 17:28:15 +0800
Subject: [PATCH] 制证数据更新

---
 src/main/java/org/springblade/modules/quartz/task/Task.java |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index 387b37d..fac35c1 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -8,9 +8,6 @@
 import org.springblade.modules.FTP.FtpUtil;
 import org.springblade.modules.FTP.MysqlCenlint;
 import org.springblade.modules.FTP.OutJson;
-import org.springblade.modules.training.service.TrainingRegistrationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -104,7 +101,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}else if(substring1.equals("o")){
 							//获取对象字符串
 							String json = OutJson.TestJson(fileName);
@@ -113,9 +111,10 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}else if(substring1.equals("l")){
-							//用户集合数据
+							//用户集合数据,批量导入用户
 							//获取对象字符串
 							String json = OutJson.TestJson(fileName);
 							//数据处理
@@ -123,7 +122,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}else if(substring1.equals("t")){
 							//培训报名数据
 							//获取对象字符串
@@ -133,7 +133,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}else if(substring1.equals("s")){
 							//获取保安员证编号数据
 							//获取对象字符串
@@ -143,18 +144,31 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+						}else if(substring1.equals("u")){
+							//保安员审查
+							//获取对象字符串
+							String json = OutJson.TestJson(fileName);
+							//数据处理
+							DataHanlder.handlerUserExamine(json);
+							//删除本地文件
+							MysqlCenlint.deletess(fileName);
+							//删除 ftp 文件
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}
-//						else if(substring1.equals("f")){
-//							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
+						else if(substring1.equals("f")){
+							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+//							ftp.dele(fileName);
+						}
+//						else {
+//							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
 //							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
 //							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 //						}
-						else {
-							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
-							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-						}
 						//删除本地文件,ftp 文件没有对应读取的不删除
 						MysqlCenlint.deletess(fileName);
 						is.close();

--
Gitblit v1.9.3