From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 1decda0..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,12 +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.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.Set;
/**
@@ -24,6 +24,30 @@
@Autowired
private IOrderService orderService;
+ @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();
+ }
+ }
@@ -33,7 +57,8 @@
@Scheduled(fixedRate = 1000 * 60)
public void taskMinute(){
try {
- orderService.completeCollection();
+ driverWorkService.taskDriverOffWork();
+ youTuiDriverService.editState();
} catch (Exception e) {
e.printStackTrace();
}
@@ -46,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