java/ZhaoYangChuXing.git

			@@ -1,6 +1,11 @@
			package com.stylefeng.guns.modular.system.service.impl;

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.service.impl.ServiceImpl;
			import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
			import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
			import com.stylefeng.guns.modular.specialTrain.server.impl.OrderPrivateCarServiceImpl;
			import com.stylefeng.guns.modular.system.dao.DriverMapper;
			import com.stylefeng.guns.modular.system.dao.DriverServiceMapper;
			import com.stylefeng.guns.modular.system.model.Company;
			@@ -17,6 +22,10 @@
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -37,7 +46,11 @@

			@Autowired
			private ICompanyCityService companyCityService;
			@Autowired
			private OrderPrivateCarServiceImpl orderPrivateCarServiceImpl;

			@Autowired
			private IOrderPrivateCarService orderPrivateCarService;


			/**
			@@ -85,6 +98,11 @@
			List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
			List<Driver> list = new ArrayList<>();
			for(Driver driver : drivers){
			int count = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driver.getId())
			.in("state", Arrays.asList(2, 3, 4, 5, 6, 11)).eq("isDelete", 1));
			if(0 != count){
			continue;
			}
			String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
			if(null != value){
			/*Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
			@@ -113,6 +131,11 @@
			List<Driver> drivers = driverMapper.queryIdleDriverService_(type, serverCarModelId, companyId);
			List<Driver> list = new ArrayList<>();
			for(Driver driver : drivers){
			int count = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driver.getId())
			.in("state", Arrays.asList(2, 3, 4, 5, 6, 11)).eq("isDelete", 1));
			if(0 != count){
			continue;
			}
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(null != value){
			/*Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离