From bcfeaf551a586ab6898bf6dc5c5995e2e03a4f11 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 30 六月 2026 09:02:35 +0800
Subject: [PATCH] 跨城改派fix
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/task/ReassignTimeoutTask.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/task/ReassignTimeoutTask.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/task/ReassignTimeoutTask.java
index ce0a719..d754caf 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/task/ReassignTimeoutTask.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/task/ReassignTimeoutTask.java
@@ -3,15 +3,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.modular.system.model.Reassign;
import com.stylefeng.guns.modular.system.service.IReassignService;
-import com.stylefeng.guns.modular.system.util.JGPushUtil;
+import com.stylefeng.guns.modular.system.util.PushUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 改派超时检查定时任务
@@ -24,7 +22,7 @@
private IReassignService reassignService;
@Autowired
- private JGPushUtil jgPushUtil;
+ private PushUtil pushUtil;
/**
* 每30秒检查一次超时的改派申请
@@ -63,16 +61,16 @@
}
/**
- * 通知原司机改派超时
+ * 通知原司机改派超时（使用Socket推送）
*/
private void pushReassignTimeout(Reassign reassign) {
try {
- Map<String, String> data = new HashMap<>();
- data.put("type", "REASSIGN_TIMEOUT");
- data.put("reassignId", String.valueOf(reassign.getId()));
- data.put("orderId", String.valueOf(reassign.getOrderId()));
-
- jgPushUtil.push(2, "改派申请已超时，请重新选择", "改派超时", data, "DRIVER" + reassign.getOriginalDriverId());
+ pushUtil.pushReassignTimeout(
+ reassign.getOriginalDriverId(),
+ reassign.getId(),
+ reassign.getOrderId(),
+ reassign.getOrderType()
+ );
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1