From c41add1b619226de813795e4f0be54bb7155c93a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 02 十一月 2023 17:08:56 +0800
Subject: [PATCH] 硬件协议对接
---
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index ef5de1a..c0c82cf 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -77,15 +77,8 @@
*/
// @Scheduled(cron = "0/30 * * * * ? ")
public void autoRefreshLockStatus() throws Exception {
-<<<<<<< HEAD
- log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
- memberRidesService.autoRefreshLockStatus();
- log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
-=======
log.info("=====================寮�濮嬪畾鏃跺埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
memberRidesService.autoRefreshLockStatus();
- log.info("=====================缁撴潫瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐�=======================");
->>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
}
@@ -93,11 +86,7 @@
* 绔欑偣杞﹁締婊℃灦鐜囬璀�
* @throws Exception
*/
-<<<<<<< HEAD
@Scheduled(fixedDelay = 1000L * 60L * 10L)
-=======
-// @Scheduled(fixedDelay = 1000L * 60L * 3L)
->>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
public void siteReserves() throws Exception {
log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
sitesService.siteReservesNotice();;
--
Gitblit v1.9.3