From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/FTP/DataHandler.java | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 1602ac1..522611f 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -12,10 +12,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* ftp 数据处理
@@ -98,16 +95,16 @@
public static Result handler(String json, String uuid){
Map map = JSON.parseObject(json, Map.class);
//获取结果
- System.out.println("uuid = " + uuid);
Object o = map.get(uuid);
- System.out.println("结果数据 = " + o);
if (null== o || o.equals("")){
return new Result(400,null,"uuid 不匹配",null);
}else {
+ List<Result> list = new ArrayList<>();
//转换
Result result = JSON.parseObject(o.toString(), Result.class);
+ list.add(result);
//返回
- return result;
+ return new Result(200,null,list);
}
}
@@ -117,34 +114,39 @@
* @return
*/
public static User handlerUserInfo(String uuid){
+ User user2 = new User();
//从redis 中获取用户数据
Object o1 = handler.redisTemplate.opsForValue().get(uuid);
- User user = JSON.parseObject(o1.toString(), User.class);
- //取出后将 redis 删除
- handler.redisTemplate.delete(uuid);
- //返回的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()));
- if (user.getHold().equals("1")) {
- user1.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
- }else {
- user1.setSecuritynumber("");
+ if (null!=o1){
+ User user = JSON.parseObject(o1.toString(), User.class);
+ //取出后将 redis 删除
+ handler.redisTemplate.delete(uuid);
+ //返回的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()));
+ if (user.getHold().equals("1")) {
+ user1.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
+ } else {
+ user1.setSecuritynumber("");
+ }
+ user1.setAvatar("");
+ user1.setEmail("");
+ user1.setFingerprint("");
+ user1.setNation("");
+ user1.setNativeplace("");
+ user1.setEducation("");
+ user1.setPoliticaloutlook("");
+ user1.setMyPicture("");
+ user1.setHeight("");
+ user1.setRtime(null);
+ //返回
+ return user1;
}
- user1.setAvatar("");
- user1.setEmail("");
- user1.setFingerprint("");
- user1.setNation("");
- user1.setNativeplace("");
- user1.setEducation("");
- user1.setPoliticaloutlook("");
- user1.setMyPicture("");
- user1.setHeight("");
- user1.setRtime(null);
- //返回
- return user1;
+ //返回null
+ return user2;
}
}
--
Gitblit v1.9.3