From 68656aa409a46995c9949c580cc3ed150755b2bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 20:41:56 +0800
Subject: [PATCH] ftp 个人保安新增修改
---
src/main/java/org/springblade/modules/FTP/DataHandler.java | 73 +++++++-----------------------------
1 files changed, 14 insertions(+), 59 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 901ff0f..c485591 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -6,6 +6,7 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -33,6 +34,9 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+ private MyAsyncService myAsyncService;
+
/**
* 初始化
@@ -42,6 +46,7 @@
handler = this;
handler.userService = this.userService;
handler.redisTemplate = this.redisTemplate;
+ handler.myAsyncService = this.myAsyncService;
}
/**
@@ -91,68 +96,17 @@
* @return
*/
public static Result handler(String json, String uuid){
- //读取数据
- List<String> list = Arrays.asList(json.split(";"));
- for (String s : list) {
- Map map = JSON.parseObject(s, Map.class);
- //获取结果
- Object o = map.get(uuid);
- if (null== o || o.equals("")){
- return new Result(400,null,"uuid 不匹配",null);
- }
+ Map map = JSON.parseObject(json, Map.class);
+ //获取结果
+ Object o = map.get(uuid);
+ if (null== o || o.equals("")){
+ return new Result(400,null,"uuid 不匹配",null);
+ }else {
//转换
Result result = JSON.parseObject(o.toString(), Result.class);
- //判断结果
- if (result.getCode()==200){
- //新增
- //用户数处理
- User user = handlerUserInfo(uuid);
- user.setId(result.getUserId());
- user.setStatus(1);
- //插入数据库
-// boolean save = handler.userService.insert(user);
- boolean save = handler.userService.save(user);
- if (save){
- return new Result(200,null,"新增成功",null);
- }else {
- return new Result(400,null,"新增失败",null);
- }
- }else if (result.getCode()==201) {
- //修改
- //用户数处理
- User user = handlerUserInfo(uuid);
- user.setId(result.getUserId());
- //数据修改
- boolean b = handler.userService.updateById(user);
- if (b) {
- return new Result(200, null, "修改成功", null);
- } else {
- return new Result(400, null, "修改失败", null);
- }
- }else if (result.getCode()==203){
- //新增
- //用户数处理
- User user = handlerUserInfo(uuid);
- user.setId(result.getUserId());
- //插入数据库
- boolean save = handler.userService.save(user);
- //失败，返回保安员证编号校验失败消息
- return new Result(203,null,result.getMsg(),null);
- }else if (result.getCode()==204){
- //修改
- //用户数处理
- User user = handlerUserInfo(uuid);
- user.setId(result.getUserId());
- //数据修改
- boolean b = handler.userService.updateById(user);
- //失败，返回保安员证编号校验失败消息
- return new Result(202,null,result.getMsg(),null);
- }else {
- //失败，返回失败消息
- return new Result(202,null,result.getMsg(),null);
- }
+ //返回
+ return result;
}
- return new Result(400,null,"未能找到对应数据",null);
}
/**
@@ -169,6 +123,7 @@
//返回的user,需处理敏感数据
User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//敏感数据处理
+ user1.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid()));
user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
user1.setRegistered(DesensitizedUtil.desensitizedAddress(user.getRegistered()));
--
Gitblit v1.9.3