From 59f70d9b19408d36f40ee0f418bf98232c40fb33 Mon Sep 17 00:00:00 2001 From: yanghb <yanghb> Date: 星期五, 21 四月 2023 09:41:42 +0800 Subject: [PATCH] 代码调整 --- DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java index d860977..3998f97 100644 --- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java +++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java @@ -1,6 +1,5 @@ package com.stylefeng.guns.modular.system.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.modular.system.dao.CarModelMapper; import com.stylefeng.guns.modular.system.dao.DriverMapper; @@ -10,7 +9,6 @@ import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.DateUtil; import com.stylefeng.guns.modular.system.util.ResultUtil; -import com.stylefeng.guns.modular.system.warpper.BaseWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,18 +48,6 @@ @Autowired private IDispatchService dispatchService; - - @Autowired - private IDriverServiceService driverServiceService; - - @Autowired - private IDriverWorkService driverWorkService; - - @Autowired - private ICarService carService; - - @Autowired - private ICarServiceService carServiceService; @@ -211,26 +197,5 @@ @Override public List<Driver> queryByCarId(Integer carId) throws Exception { return driverMapper.queryByCarId(carId); - } - - @Override - public List<BaseWarpper> getServerDriverList(Integer uid, String startLonLat, String endLonLat, Integer type, Integer carModelId) throws Exception { - Integer companyId = dispatchService.selectById(uid).getCompanyId(); - List<Driver> drivers = driverMapper.getServerDriverList(companyId, type); - List<BaseWarpper> list = new ArrayList<>(); - drivers.forEach(driver -> { - Car car = carService.selectById(driver.getCarId()); - if(type == 1){ - CarService carService = carServiceService.selectOne(new EntityWrapper<CarService>().eq("carId", car.getId()).eq("type", type).eq("serverCarModelId", carModelId)); - if(null == carService){ - return; - } - } - BaseWarpper baseWarpper = new BaseWarpper(); - baseWarpper.setId(driver.getId()); - baseWarpper.setName(driver.getName() + "-" + car.getCarLicensePlate()); - list.add(baseWarpper); - }); - return list; } } -- Gitblit v1.7.1