From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/FTP/MyAsyncService.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/MyAsyncService.java b/src/main/java/org/springblade/modules/FTP/MyAsyncService.java
index fc3d46d..93de9ae 100644
--- a/src/main/java/org/springblade/modules/FTP/MyAsyncService.java
+++ b/src/main/java/org/springblade/modules/FTP/MyAsyncService.java
@@ -42,6 +42,37 @@
 		FtpUtil.sqlFileUpload(s);
 	}
 
+	/**
+	 * FTP 审查结果推送
+	 * @param s sql语句
+	 */
+	@Async
+	public void FTP1(String s) {
+		//为防止外网尚未更新完成,休眠2秒发送第一次
+		try {
+			Thread.sleep(2);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		FtpUtil.sqlFileUpload(s);
+		FTP2(s);
+	}
+
+	/**
+	 * FTP 审查结果推送
+	 * @param s sql语句
+	 */
+	@Async
+	public void FTP2(String s) {
+		//休眠30s,再次发送一次
+		try {
+			Thread.sleep(30);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		FtpUtil.sqlFileUpload(s);
+	}
+
 
 	/**
 	 * 异步审查新增的保安员
@@ -56,6 +87,7 @@
 			user.setId(user0.getId());
 			//远程调用接口
 			String body = InvestigateUtil.httpGetOne(user0.getCardid());
+			System.out.println("user0 = " + user0.getCardid());
 			JSONObject jsonObject = new JSONObject(body);
 			Object data = jsonObject.get("data");
 			JSONObject jsonData = new JSONObject(data.toString());
@@ -112,7 +144,7 @@
 			String s1 = "update blade_user set examination_type = " + user.getExaminationType() +
 				",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
 				" where id = " + "'" + user.getId() + "'";
-			FTP(s1);
+			FTP1(s1);
 		}
 
 	}

--
Gitblit v1.9.3