diff --git a/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java b/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java index 841117a..f7daf0b 100644 --- a/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java +++ b/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java @@ -577,8 +577,15 @@ public class ChargingSessionServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); - queryWrapper.eq("status", ChargingSessionStatusEnum.CHARGING_STARTED.getValue()); - // 通常一个用户只有一个正在进行的会话,但为了严谨可以取最新的一个(如果有多条脏数据) + // 扩大活动会话状态的定义,以便用户能看到早期状态 + List activeStatuses = Arrays.asList( + ChargingSessionStatusEnum.REQUESTED.getValue(), + ChargingSessionStatusEnum.ROBOT_ASSIGNED.getValue(), + ChargingSessionStatusEnum.ROBOT_EN_ROUTE.getValue(), // 假设此状态会被使用 + ChargingSessionStatusEnum.ROBOT_ARRIVED.getValue(), // 假设此状态会被使用 + ChargingSessionStatusEnum.CHARGING_STARTED.getValue() + ); + queryWrapper.in("status", activeStatuses); queryWrapper.orderByDesc("create_time"); queryWrapper.last("LIMIT 1"); return this.getOne(queryWrapper);