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/DataHandler.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 202fffa..e9320d1 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -31,6 +31,8 @@
@Autowired
private RedisTemplate redisTemplate;
+
+
/**
* 初始化
*/
@@ -39,6 +41,28 @@
handler = this;
handler.userService = this.userService;
handler.redisTemplate = this.redisTemplate;
+ }
+
+ /**
+ * 读取数据
+ * @param json
+ * @param uuid
+ * @return
+ */
+ public static Result handlerList(String json, String uuid) {
+ Map map = JSON.parseObject(json, Map.class);
+ System.out.println("map = " + map);
+ //获取结果
+ Object o = map.get(uuid);
+ System.out.println("o = " + o);
+ if (null== o || o.equals("")){
+ return new Result(400,null,"uuid 不匹配",null);
+ }else {
+ //转换
+ Result result = JSON.parseObject(o.toString(), Result.class);
+ System.out.println("result = " + result);
+ return result;
+ }
}
/**
@@ -65,6 +89,7 @@
//用户数处理
User user = handlerUserInfo(uuid);
user.setId(result.getUserId());
+ user.setStatus(1);
//插入数据库
// boolean save = handler.userService.insert(user);
boolean save = handler.userService.save(user);
@@ -93,7 +118,7 @@
//插入数据库
boolean save = handler.userService.save(user);
//失败，返回保安员证编号校验失败消息
- return new Result(202,null,result.getMsg(),null);
+ return new Result(203,null,result.getMsg(),null);
}else if (result.getCode()==204){
//修改
//用户数处理
@@ -140,6 +165,9 @@
user1.setNativeplace("");
user1.setEducation("");
user1.setPoliticaloutlook("");
+ user1.setMyPicture("");
+ user1.setHeight("");
+ user1.setRtime(null);
//返回
return user1;
}
--
Gitblit v1.9.3