From d6df1c415a1e34b6aaa2f107c2b30580992e85e3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 23 四月 2025 17:10:50 +0800 Subject: [PATCH] 修改测试bug --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java index 71f10ed..09b2e9e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java @@ -111,6 +111,22 @@ /** + * 定时保存车辆司机id + */ + @Override + public void taskSaveDriverId() { + List<Driver> driverList = driverService.list(new LambdaQueryWrapper<Driver>().eq(Driver::getStatus, 1)); + List<Car> list = this.list(new LambdaQueryWrapper<Car>().isNull(Car::getDriverId)); + for (Car car : list) { + Optional<Driver> optional = driverList.stream().filter(s -> s.getVehicleNumber().equals(car.getVehicleNumber())).findFirst(); + if (optional.isPresent()) { + car.setDriverId(optional.get().getId()); + this.updateById(car); + } + } + } + + /** * 获取车辆列表数据 * * @param carListReq @@ -136,7 +152,8 @@ if (car.getStatus() == 1) { updateWrapper.set(Car::getDownlineTime, LocalDateTime.now()); } - updateWrapper.set(Car::getStatus, 4); + updateWrapper.set(Car::getStatus, 3); + updateWrapper.eq(Car::getId, car.getId()); this.update(updateWrapper); } else { String dateTime = gnssDataVo.getDate() + " " + gnssDataVo.getTime(); @@ -146,7 +163,8 @@ if (car.getStatus() == 1) { updateWrapper.set(Car::getDownlineTime, LocalDateTime.now()); } - updateWrapper.set(Car::getStatus, 4); + updateWrapper.set(Car::getStatus, 3); + updateWrapper.eq(Car::getId, car.getId()); this.update(updateWrapper); } else { if (car.getStatus() != 1) { @@ -154,6 +172,7 @@ updateWrapper.set(Car::getOnlineTime, LocalDateTime.now()); } updateWrapper.set(Car::getStatus, 1); + updateWrapper.eq(Car::getId, car.getId()); this.update(updateWrapper); } } -- Gitblit v1.7.1