From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 9d69d21..28ca927 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,7 +49,7 @@
@Autowired
private MongoTemplate mongoTemplate;
- @Autowired
+ @Resource
private RedisTemplate<String, Object> redisTemplate;
@@ -157,7 +158,7 @@
List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().in("id", driverIds)
.eq("authState", 2).eq("state", 2));
collect = drivers.stream().map(driver -> {
- String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driver.getId()));
+ String value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + String.valueOf(driver.getId()));
if(ToolUtil.isNotEmpty(value)){
Optional<DriverPosition> driverPosition = driverPositions.stream().filter(position -> position.getDriverId().equals(driver.getId())).findFirst();
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.7.1