java/NTTravel.git

			@@ -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;

			/**
			* 获取给定车型且空闲的司机
			@@ -89,6 +94,11 @@

			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);//计算距离
			@@ -153,7 +163,10 @@
			baseWarpper.setName("出租车");
			break;
			case 3:
			baseWarpper.setName("直通车");
			baseWarpper.setName("跨城");
			break;
			case 7:
			baseWarpper.setName("接送机");
			break;
			}
			maps.add(baseWarpper);