From 3a5d12b67221a19ff199846c19c4e74b71f3be84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Jun 2022 17:15:03 +0800
Subject: [PATCH] 图片，文件上传文件名修改
---
src/main/java/org/springblade/modules/quartz/task/Task.java | 86 ++++++++++++++++++++++++++++++-------------
1 files changed, 60 insertions(+), 26 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 08b0cdf..004bcd9 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -104,7 +104,8 @@
return false;
}
- ftp.enterLocalActiveMode();
+ //主动模式
+// ftp.enterLocalActiveMode();
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
@@ -115,19 +116,19 @@
// 检验文件是否存在
ftp.changeWorkingDirectory(ftpPath);
- // Use passive mode as default
+ // Use passive mode as default 被动模式
ftp.enterLocalPassiveMode();
FTPFile[] files = ftp.listFiles();
if (files.length==0){
- ftp.logout();
return false;
}
else {
for (int i = files.length-1; i >=0 ; i--) {
String fileName = files[i].getName();
+ String substring1 = fileName.substring(0, 2);
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+"：读取到文件 = " + fileName);
- if (fileName.contains("nq")) {
+ if (substring1.contains("nq")) {
//把文件下载到本地
long l = System.currentTimeMillis();
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -165,13 +166,18 @@
}
}
//关闭流
- ftp.completePendingCommand();
- ftp.logout();
+// ftp.completePendingCommand();
+// ftp.logout();
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
+ try {
+ ftp.logout();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (ftp.isConnected()) {
try {
ftp.disconnect();
@@ -205,7 +211,7 @@
return false;
}
- ftp.enterLocalActiveMode();
+// ftp.enterLocalActiveMode();
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
@@ -223,14 +229,15 @@
//文件个数大于10个时开始处理
// if (files.length==0 || files.length<10){
if (files.length==0){
- ftp.logout();
+// ftp.logout();
return false;
}
else {
for (int i = files.length-1; i >=0 ; i--) {
String fileName = files[i].getName();
+ String substring = fileName.substring(0, 2);
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+"：读取到文件 = " + fileName);
- if (fileName.contains("ni")) {
+ if (substring.contains("ni")) {
// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
//把文件下载到本地
long l = System.currentTimeMillis();
@@ -267,13 +274,18 @@
}
}
//关闭流
- ftp.completePendingCommand();
- ftp.logout();
+// ftp.completePendingCommand();
+// ftp.logout();
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
+ try {
+ ftp.logout();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (ftp.isConnected()) {
try {
ftp.disconnect();
@@ -307,7 +319,7 @@
return false;
}
- ftp.enterLocalActiveMode();
+// ftp.enterLocalActiveMode();
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
@@ -324,14 +336,15 @@
FTPFile[] files = ftp.listFiles();
//文件个数大于10个时开始处理
if (files.length==0){
- ftp.logout();
+
return false;
}
else {
for (int i = files.length-1; i >=0 ; i--) {
String fileName = files[i].getName();
+ String substring = fileName.substring(0, 2);
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+"：读取到文件 = " + fileName);
- if (fileName.contains("nl")) {
+ if (substring.contains("nl")) {
//把文件下载到本地
long l = System.currentTimeMillis();
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -365,13 +378,18 @@
}
}
//关闭流
- ftp.completePendingCommand();
- ftp.logout();
+// ftp.completePendingCommand();
+// ftp.logout();
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
+ try {
+ ftp.logout();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (ftp.isConnected()) {
try {
ftp.disconnect();
@@ -387,7 +405,8 @@
* 用户集合信息处理
* @param result
*/
- private void userListInfoHandler(Result result) {
+ @Async
+ public void userListInfoHandler(Result result) {
//获取 result
List<Result> data1 = result.getData();
System.out.println("批量导入数据 = " + data1);
@@ -444,9 +463,11 @@
}
if (result1.getCode()==203){
//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
- user.setId(result.getUserId());
+ user.setHold("2");
+ user.setSecuritynumber("");
+ user.setId(result1.getUserId());
//先查询当前库是否有改用户？
- User user2 = userService.getById(result.getUserId());
+ User user2 = userService.getById(result1.getUserId());
//判断
if (null != user2) {
//修改
@@ -500,7 +521,7 @@
return false;
}
- ftp.enterLocalActiveMode();
+// ftp.enterLocalActiveMode();
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
@@ -509,7 +530,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+// ftp.changeWorkingDirectory(ftpPath);
// Use passive mode as default
ftp.enterLocalPassiveMode();
@@ -517,14 +538,15 @@
FTPFile[] files = ftp.listFiles();
//文件个数大于10个时开始处理
if (files.length==0){
- ftp.logout();
+// ftp.logout();
return false;
}
else {
for (int i = files.length-1; i >=0 ; i--) {
String fileName = files[i].getName();
+ String substring = fileName.substring(0, 2);
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+"：读取到文件 = " + fileName);
- if (fileName.contains("nt")) {
+ if (substring.contains("nt")) {
//把文件下载到本地
long l = System.currentTimeMillis();
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -554,13 +576,18 @@
}
}
//关闭流
- ftp.completePendingCommand();
- ftp.logout();
+// ftp.completePendingCommand();
+// ftp.logout();
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
+ try {
+ ftp.logout();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (ftp.isConnected()) {
try {
ftp.disconnect();
@@ -576,10 +603,13 @@
* 报名信息处理
* @param result
*/
- private void applyHandler(String uuid,Result result) {
+ @Async
+ public void applyHandler(String uuid,Result result) {
//取出培训学校id
//从redis 中获取用户数据
String s = redisTemplate.opsForValue().get(uuid).toString();
+ //删除
+ redisTemplate.delete(uuid);
if (null!=s && !s.equals("")) {
//创建集合，存年龄符合要求
List<String> ageList = new ArrayList<>();
@@ -746,6 +776,8 @@
}
} else if (result.getCode() == 203) {
//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
+ users.setHold("2");
+ users.setSecuritynumber("");
//新增
users.setId(result.getUserId());
//插入数据库
@@ -765,6 +797,8 @@
handlerLogService.save(handlerLog);
} else if (result.getCode() == 204) {
//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
+ users.setHold("2");
+ users.setSecuritynumber("");
users.setId(result.getUserId());
//先查询当前库是否有改用户？
User user2 = userService.getById(result.getUserId());
--
Gitblit v1.9.3