From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
index fb16d56..b6c0c4d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
@@ -1,13 +1,12 @@
 package com.supersavedriving.driver.modular.system.util;
 
 
-import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
-import com.supersavedriving.driver.modular.system.service.IOrderService;
-import com.supersavedriving.driver.modular.system.service.IYouTuiDriverService;
+import com.supersavedriving.driver.modular.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
+import java.util.Set;
 
 
 /**
@@ -28,6 +27,27 @@
     @Autowired
     private IYouTuiDriverService youTuiDriverService;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Autowired
+    private IDriverWorkService driverWorkService;
+
+
+    /**
+     * 5秒推送
+     */
+    @Scheduled(fixedRate = 1000 * 5)
+    public void task5Seconds(){
+        try {
+            Set<String> orderServices = redisUtil.getSetAllValue("orderService");
+            for (String s : orderServices) {
+                orderService.pushOrderInfo(Long.valueOf(s));//开始推送订单数据
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 
 
@@ -37,7 +57,7 @@
     @Scheduled(fixedRate = 1000 * 60)
     public void taskMinute(){
         try {
-            orderService.completeCollection();
+            driverWorkService.taskDriverOffWork();
             youTuiDriverService.editState();
         } catch (Exception e) {
             e.printStackTrace();
@@ -51,6 +71,7 @@
     @Scheduled(cron = "0 0 0 * * *")
     public void taskDay(){
         try {
+            orderService.completeCollection();
             accountChangeDetailService.deductionInsurance();
         }catch (Exception e){
             e.printStackTrace();

--
Gitblit v1.7.1