From 8e75bb4e451d6d3f33e2146335bad0f85d27d99f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 02 十一月 2023 17:06:46 +0800
Subject: [PATCH] 硬件协议对接

---
 server/platform/src/main/java/com/doumee/task/ScheduleTool.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 1bd9fc6..ef5de1a 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -51,7 +51,7 @@
     /**
      * @throws Exception
      */
-    @Scheduled(cron = "0 0 11 * * ? ")
+//    @Scheduled(cron = "0 0 11 * * ? ")
     public void syncStudent() throws Exception {
         //鍓嶄竴澶╃殑鏁告摎
         Date ydate = DateUtil.addDaysToDate(new Date(), -1);
@@ -75,11 +75,17 @@
      * 30 绉掑埛鏂颁竴娆�
      * @throws Exception
      */
-    @Scheduled(cron = "0/30 * * * * ? ")
+//    @Scheduled(cron = "0/30 * * * * ? ")
     public void autoRefreshLockStatus() throws Exception {
+<<<<<<< HEAD
         log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
         memberRidesService.autoRefreshLockStatus();
         log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
+=======
+        log.info("=====================寮�濮嬪畾鏃跺埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
+        memberRidesService.autoRefreshLockStatus();
+        log.info("=====================缁撴潫瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐�=======================");
+>>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
     }
 
 
@@ -87,7 +93,11 @@
      * 绔欑偣杞﹁締婊℃灦鐜囬璀�
      * @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