From b367ef20f7fb5be71610dd89b18bde7d99a2647d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Jun 2022 12:21:36 +0800
Subject: [PATCH] 调整删除文件逻辑
---
src/main/java/org/springblade/modules/FTP/DataHandler.java | 57 ++++++++++--------
src/main/java/org/springblade/modules/quartz/task/Task.java | 117 ++++++++++++++++++++------------------
2 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 50accce..522611f 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -114,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;
}
}
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 d60c768..3759d63 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -240,15 +240,20 @@
//转换
result = JSON.parseObject(value.toString(), Result.class);
}
- if (null!=result) {
- //异步用户处理逻辑
- userInfoHandler(uuid,result);
- }
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+"：成功删除ftp文件 = " + fileName);
+ if (null!=result) {
+ try {
+ userInfoHandler(uuid, result);
+ }catch (Exception e) {
+ //异步用户处理逻辑
+ e.printStackTrace();
+ }
+ }
+
}
}
//关闭流
@@ -470,69 +475,71 @@
public void userInfoHandler(String uuid, Result result){
//用户数处理
User users = handlerUserInfo(uuid);
- System.out.println("用户数据 = " + users);
- //判断结果
- if (result.getCode()==200){
- //新增
- users.setId(result.getUserId());
- users.setStatus(1);
- //插入数据库
- boolean save = userService.save(users);
- if (save){
- //异步同步到群防群控
- myAsyncService.qfqkUserSave(users);
- }
- }else if (result.getCode()==201) {
- //修改
- users.setId(result.getUserId());
- //先查询当前库是否有改用户？
- User user2 = userService.getById(result.getUserId());
- if (null!=user2) {
- //数据修改
- boolean b = userService.updateById(users);
- if (b) {
- //异步同步到群防群控
- myAsyncService.updateUserByQfqk(users);
- }
- }else {
+ if (null!=users) {
+ System.out.println("用户数据 = " + users);
+ //判断结果
+ if (result.getCode() == 200) {
//新增
+ users.setId(result.getUserId());
+ users.setStatus(1);
+ //插入数据库
boolean save = userService.save(users);
- if (save){
+ if (save) {
//异步同步到群防群控
myAsyncService.qfqkUserSave(users);
}
- }
- }else if (result.getCode()==203){
- //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
- //新增
- users.setId(result.getUserId());
- //插入数据库
- boolean save = userService.save(users);
- if (save) {
- //异步同步到群防群控
- myAsyncService.qfqkUserSave(users);
- }
- }else if (result.getCode()==204){
- //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
- users.setId(result.getUserId());
- //先查询当前库是否有改用户？
- User user2 = userService.getById(result.getUserId());
- //判断
- if (null!=user2) {
+ } else if (result.getCode() == 201) {
//修改
- //数据修改
- boolean b = userService.updateById(users);
- if (b){
- //异步同步到群防群控
- myAsyncService.updateUserByQfqk(users);
+ users.setId(result.getUserId());
+ //先查询当前库是否有改用户？
+ User user2 = userService.getById(result.getUserId());
+ if (null != user2) {
+ //数据修改
+ boolean b = userService.updateById(users);
+ if (b) {
+ //异步同步到群防群控
+ myAsyncService.updateUserByQfqk(users);
+ }
+ } else {
+ //新增
+ boolean save = userService.save(users);
+ if (save) {
+ //异步同步到群防群控
+ myAsyncService.qfqkUserSave(users);
+ }
}
- }else {
+ } else if (result.getCode() == 203) {
+ //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
//新增
+ users.setId(result.getUserId());
+ //插入数据库
boolean save = userService.save(users);
- if (save){
+ if (save) {
//异步同步到群防群控
myAsyncService.qfqkUserSave(users);
}
+ } else if (result.getCode() == 204) {
+ //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
+ users.setId(result.getUserId());
+ //先查询当前库是否有改用户？
+ User user2 = userService.getById(result.getUserId());
+ //判断
+ if (null != user2) {
+ //修改
+ //数据修改
+ boolean b = userService.updateById(users);
+ if (b) {
+ //异步同步到群防群控
+ myAsyncService.updateUserByQfqk(users);
+ }
+ } else {
+ //新增
+ boolean save = userService.save(users);
+ if (save) {
+ //异步同步到群防群控
+ myAsyncService.qfqkUserSave(users);
+ }
+ }
}
}
}
--
Gitblit v1.9.3