From 1c2d6ad616488a8cadec43c2a72101fce606c67a Mon Sep 17 00:00:00 2001
From: T100738 <1821349743@qq.com>
Date: 星期二, 14 五月 2024 11:17:51 +0800
Subject: [PATCH] commit

---
 product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java |    8 ++------
 product-server-data-center/src/main/java/com/product/data/center/service/DataCollectService.java |   14 ++++++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/DataCollectService.java b/product-server-data-center/src/main/java/com/product/data/center/service/DataCollectService.java
index fe629a8..6eedeaa 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/DataCollectService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/DataCollectService.java
@@ -58,26 +58,24 @@
 		int hour = calendar.get(Calendar.HOUR_OF_DAY);
 		int minute = calendar.get(Calendar.MINUTE);
 		if (hour == 1 && minute == 10) {
-				System.out.println("2222222");
+			System.out.println("2222222");
 		}
 	}
+
 	/**
 	 * 鏁版嵁閲囬泦-瀹氭椂浠诲姟鎵ц鏂规硶
 	 *
 	 * @param uuid
 	 */
 	public void dataCollect(String uuid) {
+
 		synchronized (uuid.intern()) {
-			//鍑屾櫒1鐐�10鍒嗗紑濮嬭繘鍏ユ鏂规硶鐨勪紤鐪犲埌1鐐�20鍒�
+			//鍑屾櫒1鐐�10鍒嗗紑濮嬭繘鍏ユ鏂规硶鍒�1鐐�20鍒嗕笉鎵ц
 			Calendar calendar = Calendar.getInstance();
 			int hour = calendar.get(Calendar.HOUR_OF_DAY);
 			int minute = calendar.get(Calendar.MINUTE);
-			if (hour == 1 && minute == 10) {
-				try {
-					Thread.sleep(600000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
+			if (hour == 1 && (minute >= 10 || minute<=20)){
+				return;
 			}
 			Calendar startCalendar = Calendar.getInstance();
 			Date preExecuteTime = null;
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
index b2a2997..1eefe59 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
@@ -367,12 +367,8 @@
 		Calendar calendar = Calendar.getInstance();
 		int hour = calendar.get(Calendar.HOUR_OF_DAY);
 		int minute = calendar.get(Calendar.MINUTE);
-		if (hour == 1 && minute == 10) {
-			try {
-				Thread.sleep(600000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
+		if (hour == 1 && (minute >= 10 || minute <= 20)) {
+			return;
 		}
 		WriteExtractUtil.append("寮�濮嬫彁鍙栵紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒:::" + uuid);
 		TimeInterval tempTestTimer = DateUtil.timer();

--
Gitblit v1.9.2