From 6b724f39b539f3aa4b008edf124ed6c7cf5be4ad Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Jun 2022 11:49:26 +0800
Subject: [PATCH] 新增定时任务处理保安员没有插入完的json文件

---
 src/main/java/org/springblade/modules/quartz/task/Task.java |   84 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 80 insertions(+), 4 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 bc3d8ba..6c3ea68 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -6,8 +6,6 @@
 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.core.tool.utils.BeanUtil;
 import org.springblade.modules.FTP.*;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IUserService;
@@ -15,7 +13,7 @@
 import org.springblade.modules.training.service.TrainingRegistrationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -244,7 +242,7 @@
 						}
 						if (null!=result) {
 							//异步用户处理逻辑
-							myAsyncService.userInfoHandler(uuid,result);
+							userInfoHandler(uuid,result);
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
@@ -467,4 +465,82 @@
 	}
 
 
+
+	/**
+	 * 用户信息处理
+	 * @param uuid
+	 * @param result
+	 */
+	@Async
+	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 {
+				//新增
+				boolean save = userService.save(users);
+				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) {
+				//修改
+				//数据修改
+				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