From 20058d5bcb4978169b2c152681891ebcaa3f5bc5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 11:45:02 +0800
Subject: [PATCH] 培训报名,保安员导入修改ftp 连接时间

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index e6bf922..109bd74 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1314,10 +1314,10 @@
 			user.setStatus(1);
 			user.setIsDeleted(0);
 			//分配保安角色
-			Role role = new Role();
-			role.setRoleAlias("保安");
-			Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-			user.setRoleId(oneRole.getId().toString());
+//			Role role = new Role();
+//			role.setRoleAlias("保安");
+//			Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+			user.setRoleId("1412226235153731586");
 
 			if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
 				user.setHold("1");
@@ -1379,7 +1379,7 @@
 			//调用ftp获取返回数据
 			while (true){
 				try {
-					Thread.sleep(1000);
+					Thread.sleep(3000);
 				} catch (InterruptedException e) {
 					e.printStackTrace();
 				}
@@ -1389,12 +1389,12 @@
 				if (result.getCode() == 200) {
 					break;
 				}
-//				else {
-//					count++;
-//					if (count == 60) {
-//						break;
-//					}
-//				}
+				else {
+					count++;
+					if (count == 60) {
+						break;
+					}
+				}
 			}
 		}
 
@@ -1412,7 +1412,11 @@
 					User user = handlerUserInfo(uuid);
 					if (result1.getCode()==200){
 						user.setId(result1.getUserId());
-						this.save(user);
+						boolean save = this.save(user);
+						//同步用户数据到群防群控
+						if (save) {
+							myAsyncService.qfqkUserSave(user);
+						}
 						//加入新增集合
 //						addList.add(user);
 					}
@@ -1636,7 +1640,7 @@
 			//调用ftp获取返回数据
 			while (true){
 				try {
-					Thread.sleep(1000);
+					Thread.sleep(2000);
 				} catch (InterruptedException e) {
 					e.printStackTrace();
 				}

--
Gitblit v1.9.3