From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 228c68e..b0bbf4a 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -1,6 +1,9 @@
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.crossCity.model.OrderCrossCity;
+import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.system.dao.DriverMapper;
import com.stylefeng.guns.modular.system.dao.DriverServiceMapper;
import com.stylefeng.guns.modular.system.model.Company;
@@ -69,6 +72,8 @@
return list;
}
+ @Autowired
+ private IOrderCrossCityService crossCityService;
/**
* 获取给定车型且空闲的司机
@@ -83,9 +88,17 @@
*/
@Override
public List<Driver> queryIdleDriver(Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
+ System.err.println("type"+type+"serverCarModelId"+serverCarModelId);
List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
+ System.err.println("当前获取的司机："+drivers);
+
List<Driver> list = new ArrayList<>();
for(Driver driver : drivers){
+ List<OrderCrossCity> orderCrossCities = crossCityService.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 2).eq("driverId", driver.getId()));
+ if (orderCrossCities!=null&& !orderCrossCities.isEmpty()){
+ continue;
+ }
+
String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
if(null != value){
// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
@@ -96,6 +109,7 @@
}
}
}
+ System.err.println("符合距离的司机："+list);
return list;
}
@@ -149,7 +163,10 @@
baseWarpper.setName("出租车");
break;
case 3:
- baseWarpper.setName("直通车");
+ baseWarpper.setName("跨城");
+ break;
+ case 7:
+ baseWarpper.setName("接送机");
break;
}
maps.add(baseWarpper);
--
Gitblit v1.7.1