From 029d3549ae83245e80e388f0b5fa5bd535a30a4b Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 28 Apr 2022 16:04:13 +0800
Subject: [PATCH] 保安员批量导入ftp 配置修改完善
---
src/main/java/org/springblade/modules/FTP/Result.java | 8 ++++++++
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 6 +++++-
src/main/java/org/springblade/modules/FTP/Monitor.java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 97826d7..bc46f1b 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -76,6 +76,8 @@
//遍历
if (userList.size()>0) {
List<Result> resultList = new ArrayList<>();
+ //创建更新用户集合对象
+ List<User> updateUser = new ArrayList<>();
//开始遍历
for (User user : userList) {
//取出 uuid
@@ -112,12 +114,12 @@
user.setReasonForLeav("");
User data = result.getUser();
user.setId(data.getId());
+ user.setCreateTime(data.getCreateTime());
//校验保安员证编号
Result result2 = hanlder.checkSecurityNumber(user);
User user2 = result2.getUser();
user2.setId(data.getId());
- //修改
hanlder.userService.updateById(user2);
//设置返回结果
if (result2.getCode() == 200) {
@@ -195,6 +197,8 @@
user1.setReasonForLeav("");
User data = result.getUser();
user1.setId(data.getId());
+ user1.setCreateTime(data.getCreateTime());
+
//校验保安员证编号
Result result2 = hanlder.checkSecurityNumber(user1);
User user2 = result2.getUser();
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 4f48894..75efc63 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -93,7 +93,7 @@
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
- }else if(substring1.equals("ol")){
+ }else if(substring1.equals("l")){
//用户集合数据
//获取对象字符串
String json = OutJson.TestJson(fileName);
diff --git a/src/main/java/org/springblade/modules/FTP/Result.java b/src/main/java/org/springblade/modules/FTP/Result.java
index 1cbb095..39cfd10 100644
--- a/src/main/java/org/springblade/modules/FTP/Result.java
+++ b/src/main/java/org/springblade/modules/FTP/Result.java
@@ -20,6 +20,14 @@
private User user;
+ private Result result;
+
+ public Result(Integer code, String msg, Result result) {
+ this.code = code;
+ this.msg = msg;
+ this.result = result;
+ }
+
public Result(Integer code, String msg, List<Result> data) {
this.code = code;
this.msg = msg;
--
Gitblit v1.9.3