Pu Zhibing
2025-04-18 2d217c614073681cf14719fd201993d5c5fb5aa7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java
@@ -112,6 +112,7 @@
         }
         warn.setCreateTime(LocalDateTime.now());
         warn.setObjectId(vo.getInfoId());
         warn.setVehicleNumber(vo.getVehicleNo());
         warns.add(warn);
      }
      if (warns.size() > 0) {
@@ -119,6 +120,28 @@
      }
   }
   
   /**
    * 定时保存车辆id和司机id
    */
   @Override
   public void taskSaveCarIdAndDriverId() {
      List<Warn> list = this.list(new LambdaQueryWrapper<Warn>().isNull(Warn::getCarId).or().isNull(Warn::getDriverId));
      List<Car> carList = carService.list();
      List<Driver> driverList = driverService.list(new LambdaQueryWrapper<Driver>().eq(Driver::getStatus, 1));
      for (Warn warn : list) {
         Optional<Driver> optional = driverList.stream().filter(s -> s.getVehicleNumber().equals(warn.getVehicleNumber())).findFirst();
         if (optional.isPresent()) {
            warn.setDriverId(optional.get().getId());
            this.updateById(warn);
         }
         Optional<Car> optional1 = carList.stream().filter(s -> s.getVehicleNumber().equals(warn.getVehicleNumber())).findFirst();
         if (optional1.isPresent()) {
            warn.setCarId(optional1.get().getId());
            this.updateById(warn);
         }
      }
   }
   
   /**
    * 定时任务修改预警信息处理结果
@@ -158,7 +181,7 @@
    */
   @Override
   public PageInfo<CarWarnListResp> getCarWarnList(CarWarnListReq carWarnListReq) {
      PageInfo<CarWarnListResp> pageInfo = new PageInfo<>(carWarnListReq.getPageCurr(), carWarnListReq.getPageCurr());
      PageInfo<CarWarnListResp> pageInfo = new PageInfo<>(carWarnListReq.getPageCurr(), carWarnListReq.getPageSize());
      return this.baseMapper.getCarWarnList(pageInfo, carWarnListReq);
   }