From 4566a255edffe93cca71eb74e28debd30c87917b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:23:47 +0800
Subject: [PATCH] 用户新增修改

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 93bc529..d188787 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -1624,7 +1624,7 @@
 		//调用ftp获取返回数据
 		while (true){
 			System.out.println("用户新增开始接收消息......................");
-			Thread.sleep(6000);
+			Thread.sleep(1000);
 			//调用ftp获取返回数据
 			result = Monitor.isFTPFileExist(uuid);
 			//如果返回true,就退处
@@ -1643,8 +1643,8 @@
 			}else{
 				//计数
 				count++;
-				//如果超过10s 没有读取到,则退出
-				if (count == 10) {
+				//如果超过60s 没有读取到,则退出
+				if (count == 60) {
 					break;
 				}
 			}
@@ -1860,4 +1860,19 @@
 	public R getNotUpdatePwdInfo() {
 		return R.data(userService.getNotUpdatePwdInfo());
 	}
+
+	/**
+	 * 用户手动离职(用户数据未同步成功的)
+	 * @param user
+	 * @return
+	 */
+	@GetMapping("/leave")
+	public void leave(User user){
+		user.setStatus(2);
+		String s1 =
+			"update blade_user set status = " + "'" + user.getStatus() + "'"
+				+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
+				+ " " + "where cardid = " + "'" + user.getCardid() + "'";
+		myAsyncService.FTP(s1);
+	}
 }

--
Gitblit v1.9.3