UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -521,7 +521,7 @@ } orderList = orderPrivateCarService.queryOrderInfo2(orderId, 6, null, null); if (orderInfoWarpper.getState() > 1 && orderInfoWarpper.getDriverId() != 0) { String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderInfoWarpper.getDriverId())); if (value == null || value.equals("")) { if (orderList.isEmpty()) { orderList = orderPrivateCarService.queryOrderInfo2(orderId, 5, "0", "0"); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -2102,7 +2102,7 @@ OrderCrossCity orderCrossCity = this.selectById(orderId); if(null != orderCrossCity){ //计算预计距离和剩余时间 String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderCrossCity.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderCrossCity.getDriverId())); if (null == value || "".equals(value)) { System.err.println("司机没有上传位置信息");
@@ -398,7 +398,7 @@ JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent()); //判断时间 if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) { String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId())); // Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString()); // Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString()); @@ -668,7 +668,7 @@ JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent()); //判断时间 if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) { String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId())); // Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString()); // Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString()); @@ -860,7 +860,7 @@ JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent()); //判断时间 if (orderPrivateCar.getTravelTime().getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && orderPrivateCar.getTravelTime().getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) { String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(order.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(order.getDriverId())); // Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1).get("distance").toString()); // Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString()); // TODO: 2023/11/4 已改成计算直线距离 @@ -1302,7 +1302,7 @@ return orderTaxiService.queryOrderServer(orderId, uid); } //计算预计距离和剩余时间 String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); if(null == value || "".equals(value)){ System.err.println("司机没有上传位置信息");
@@ -54,7 +54,7 @@ List<Driver> drivers = driverMapper.queryIdleDriver(type, companyId); List<Driver> list = new ArrayList<>(); for(Driver driver : drivers){ String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driver.getId())); if(null != value){ Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value); double d = Double.valueOf(distance1.get("WGS84")).doubleValue(); @@ -83,7 +83,7 @@ List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId); List<Driver> list = new ArrayList<>(); for(Driver driver : drivers){ String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driver.getId())); if(null != value){ Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value); double d = Double.valueOf(distance1.get("WGS84")).doubleValue(); @@ -100,7 +100,7 @@ List<Driver> drivers = driverMapper.queryIdleDriver1(type, companyId); List<Driver> list = new ArrayList<>(); for(Driver driver : drivers){ String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driver.getId())); if(null != value){ Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value); double d = Double.valueOf(distance1.get("WGS84")).doubleValue(); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -29,7 +29,7 @@ @Component public class PushUtil { private final String socket_uri = "http://192.168.110.111:6000"; private final String socket_uri = "http://192.168.110.85:6000"; @Autowired private IOrderTaxiService orderTaxiService; @@ -243,7 +243,7 @@ } //计算预计距离和剩余时间 String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driverId)); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driverId)); if (null == value || "".equals(value)) { return; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1959,7 +1959,7 @@ //计算预计距离和剩余时间 String value = null; if (null != orderTaxi.getDriverId()) { value = (String) redisTemplate.opsForValue().get("DRIVER" + orderTaxi.getDriverId()); value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderTaxi.getDriverId()); if (null == value || "".equals(value)) { System.err.println("司机没有上传位置信息");
