From 9c08a3cfd782b2818e335da9d678abfb4d584fb9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Jun 2022 20:24:45 +0800
Subject: [PATCH] 新增操作记录
---
src/main/java/org/springblade/modules/quartz/task/Task.java | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 127 insertions(+), 24 deletions(-)
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 6dde849..08b0cdf 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -2,11 +2,15 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.modules.FTP.*;
+import org.springblade.modules.log.entity.HandlerLog;
+import org.springblade.modules.log.service.HandlerLogService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
@@ -20,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Array;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -41,6 +46,9 @@
@Autowired
private IUserService userService;
+
+ @Autowired
+ private HandlerLogService handlerLogService;
@Autowired
private RedisTemplate redisTemplate;
@@ -382,10 +390,14 @@
private void userListInfoHandler(Result result) {
//获取 result
List<Result> data1 = result.getData();
+ System.out.println("批量导入数据 = " + data1);
if (data1.size()>0){
for (Result result1 : data1) {
// 取出 Msg ,此 msg 存的对应的 uuid
String uuid = result1.getMsg();
+ //从redis 中获取用户数据
+ Object o1 = redisTemplate.opsForValue().get(uuid);
+ User user0 = JSON.parseObject(o1.toString(), User.class);
// 从redis 中获取对应的用户信息,脱敏处理过
User user = handlerUserInfo(uuid);
if (result1.getCode()==200){
@@ -421,9 +433,46 @@
}
if (result1.getCode()==202){
//已在其他单位存在
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(user.getDeptId());
+ handlerLog.setOperatorTime(user.getCreateTime());
+ handlerLog.setRemark("用户["+DesensitizedUtil.desensitizedIdNumberBy4(user0.getCardid())+"]已在其他单位存在");
+ handlerLog.setType(2);
+ //插入记录
+ handlerLogService.save(handlerLog);
}
if (result1.getCode()==203){
+ //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
+ user.setId(result.getUserId());
+ //先查询当前库是否有改用户？
+ User user2 = userService.getById(result.getUserId());
+ //判断
+ if (null != user2) {
+ //修改
+ //数据修改
+ boolean b = userService.updateById(user);
+ if (b) {
+ //异步同步到群防群控
+ myAsyncService.updateUserByQfqk(user);
+ }
+ } else {
+ //新增
+ boolean save = userService.save(user);
+ if (save) {
+ //异步同步到群防群控
+ myAsyncService.qfqkUserSave(user);
+ }
+ }
//保安证编号不匹配
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(user.getDeptId());
+ handlerLog.setOperatorTime(user.getCreateTime());
+ handlerLog.setRemark("用户["+DesensitizedUtil.desensitizedIdNumberBy4(user0.getCardid())+"]保安证编号不匹配,请核实!");
+ handlerLog.setType(2);
+ //插入记录
+ handlerLogService.save(handlerLog);
}
}
}
@@ -535,7 +584,7 @@
//创建集合，存年龄符合要求
List<String> ageList = new ArrayList<>();
//创建年龄不符合集合
- List<String> errorList = new ArrayList<>();
+ List<User> errorList = new ArrayList<>();
AtomicInteger number = new AtomicInteger();
if (null != result) {
//获取 result
@@ -555,7 +604,7 @@
//查询用户信息
User user = userService.getById(userId);
//加入更新集合
- errorList.add(user.getRealName());
+ errorList.add(user);
}
}
}
@@ -605,6 +654,26 @@
}
});
}
+
+ //如果存在年龄不符的，则抛出异常
+ if (number.get()>0){
+ String deptId = errorList.get(0).getDeptId();
+ List<String> arrayList = new ArrayList<>();
+ errorList.forEach(user -> {
+ arrayList.add(user.getAccount());
+ });
+ //已在其他单位存在
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(deptId);
+ handlerLog.setOperatorTime(new Date());
+ handlerLog.setType(3);
+ String errorAccount = StringUtils.join(arrayList, "\\\n");
+ handlerLog.setRemark("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+ //插入记录
+ handlerLogService.save(handlerLog);
+ }
+
}
}
@@ -626,28 +695,7 @@
myAsyncService.FTP(sql);
}
- /**
- * 用户审查
- * @return
- */
- public void userExamine() {
- System.out.println("用户审查任务发起"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
- //查询审查状态为未审查的保安员
- User user = new User();
- user.setStatus(1);
- user.setIsDeleted(0);
- user.setRoleId("1412226235153731586");
- //未审查
- user.setExaminationType("2");
- //查询
- List<User> users = userService.list(new QueryWrapper<>(user));
- //遍历
- if (users.size()>0){
- users.forEach(user1 -> {
- myAsyncService.userExamineFTP(user1);
- });
- }
- }
+
@@ -658,6 +706,9 @@
*/
@Async
public void userInfoHandler(String uuid, Result result){
+ //从redis 中获取用户数据
+ Object o1 = redisTemplate.opsForValue().get(uuid);
+ User user0 = JSON.parseObject(o1.toString(), User.class);
//用户数处理
User users = handlerUserInfo(uuid);
if (null!=users) {
@@ -703,6 +754,15 @@
//异步同步到群防群控
myAsyncService.qfqkUserSave(users);
}
+ //保安证编号不匹配
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(user0.getDeptId());
+ handlerLog.setOperatorTime(user0.getCreateTime());
+ handlerLog.setRemark("用户["+DesensitizedUtil.desensitizedIdNumberBy4(user0.getCardid())+"]保安证编号不匹配,请核实!");
+ handlerLog.setType(1);
+ //插入记录
+ handlerLogService.save(handlerLog);
} else if (result.getCode() == 204) {
//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
users.setId(result.getUserId());
@@ -725,9 +785,52 @@
myAsyncService.qfqkUserSave(users);
}
}
+ //保安证编号不匹配
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(user0.getDeptId());
+ handlerLog.setOperatorTime(user0.getCreateTime());
+ handlerLog.setRemark("用户["+DesensitizedUtil.desensitizedIdNumberBy4(user0.getCardid())+"]保安证编号不匹配,请核实!");
+ handlerLog.setType(1);
+ //插入记录
+ handlerLogService.save(handlerLog);
+ }else {
+ //已在其他单位存在
+ HandlerLog handlerLog = new HandlerLog();
+ handlerLog.setCreateTime(new Date());
+ handlerLog.setDeptId(user0.getDeptId());
+ handlerLog.setOperatorTime(user0.getCreateTime());
+ handlerLog.setRemark("用户["+DesensitizedUtil.desensitizedIdNumberBy4(user0.getCardid())+"]已在其他单位存在");
+ handlerLog.setType(1);
+ //插入记录
+ handlerLogService.save(handlerLog);
}
}
}
+ /**
+ * 用户审查
+ * @return
+ */
+ public void userExamine() {
+ System.out.println("用户审查任务发起"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ //查询审查状态为未审查的保安员
+ User user = new User();
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ user.setRoleId("1412226235153731586");
+ //未审查
+ user.setExaminationType("2");
+ //查询
+ List<User> users = userService.list(new QueryWrapper<>(user));
+ //遍历
+ if (users.size()>0){
+ users.forEach(user1 -> {
+ myAsyncService.userExamineFTP(user1);
+ });
+ }
+ }
+
+
}
--
Gitblit v1.9.3