DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -559,7 +559,7 @@ } Driver driver = driverService.selectById(uid); String accessToken=null; Object img = redisTemplate.opsForValue().get("DRIVER_WX_IMG" + uid); Object img = redisTemplate.opsForValue().get("dache:DRIVER_WX_IMG" + uid); // 获取调用凭证accessToken if(ToolUtil.isEmpty(driver.getShareLink())|| ToolUtil.isEmpty(img)){ accessToken = getAccessToken(); @@ -1810,13 +1810,13 @@ driver.setAuthState(3); driverService.updateById(driver); //开始验证当前账号是否在别处登录 String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driverId); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driverId); if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线 //开始清除redis中无效的数据 String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone()); String key = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driver.getPhone()); redisTemplate.delete(key);//删除个人信息数据 redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("DRIVER_" + driverId);//清除存储的token redisTemplate.delete("dache:DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("dache:DRIVER_" + driverId);//清除存储的token } return ResultUtil.success(); } catch (Exception e) { DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -485,7 +485,7 @@ orderLogistics.setStartServiceTime(date); orderLogistics.setBoardingTime(date); String value = (String) redisTemplate.opsForValue().get("DRIVER" + uid); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + uid); if(ToolUtil.isNotEmpty(value)){ String[] split = value.split(","); Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(split[0], split[1]); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -15,7 +15,6 @@ import com.stylefeng.guns.modular.system.dao.UserInfoMapper; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.service.impl.OpenCityServiceImpl; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.CreateTravelItineraryRequest; @@ -378,9 +377,9 @@ private Integer isPromotion(Integer userId){ UserInfo userInfo = userInfoMapper.selectById(userId); if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){ if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()>System.currentTimeMillis()){ String registAreaCode = userInfo.getRegistAreaCode(); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).last(" and between now() startTime and endTime AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); if(tDriverPromotionActivity!=null){ return userInfo.getBindDriverId(); } @@ -409,7 +408,7 @@ if(order!=null){ orders.addAll(order); } String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); order = this.baseMapper.queryOrderInfo(orderId,5,value.split(",")[0],value.split(",")[1]); if(order!=null){ orders.addAll(order); @@ -424,7 +423,7 @@ if(order!=null){ orders.addAll(order); } String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),5,value.split(",")[0],value.split(",")[1]); if(order!=null){ orders.addAll(order); @@ -458,7 +457,7 @@ orders.addAll(order); } OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId); String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); String value = redisUtil.getValue("dache:DRIVER" + String.valueOf(orderPrivateCar.getDriverId())); order = this.baseMapper.queryOrderInfo(orderId,5,value.split(",")[0],value.split(",")[1]); if(order!=null){ orders.addAll(order); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -156,7 +156,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(); @@ -173,7 +173,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(); @@ -1330,7 +1330,7 @@ String s = JwtTokenUtil.generateToken(String.valueOf(driver.getId())); redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(driver.getId()), 7, TimeUnit.DAYS); redisTemplate.opsForValue().set(driver.getPhone(), s.substring(s.length() - 32)); redisTemplate.opsForValue().set("DRIVER_" + driver.getId(), s); redisTemplate.opsForValue().set("dache:DRIVER_" + driver.getId(), s); LoginWarpper loginWarpper = new LoginWarpper(); @@ -1426,7 +1426,7 @@ String s = JwtTokenUtil.generateToken(String.valueOf(driver.getId())); redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(driver.getId()), 7, TimeUnit.DAYS); redisTemplate.opsForValue().set(driver.getPhone(), s.substring(s.length() - 32)); redisTemplate.opsForValue().set("DRIVER_" + driver.getId(), s); redisTemplate.opsForValue().set("dache:DRIVER_" + driver.getId(), s); LoginWarpper loginWarpper = new LoginWarpper(); @@ -1512,7 +1512,7 @@ String s = JwtTokenUtil.generateToken(String.valueOf(driver.getId())); redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(driver.getId()), 7, TimeUnit.DAYS); redisTemplate.opsForValue().set(driver.getPhone(), s.substring(s.length() - 32)); redisTemplate.opsForValue().set("DRIVER_" + driver.getId(), s); redisTemplate.opsForValue().set("dache:DRIVER_" + driver.getId(), s); LoginWarpper loginWarpper = new LoginWarpper(); @@ -1620,9 +1620,9 @@ Driver driver = driverMapper.selectById(id); String key = (String) redisTemplate.opsForValue().get(driver.getPhone()); redisTemplate.delete(key);//删除个人信息数据 redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("DRIVER_" + id);//清除存储的token redisTemplate.delete("DEVICE_" + id);//清除车载端登录的标识 redisTemplate.delete("dache:DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("dache:DRIVER_" + id);//清除存储的token redisTemplate.delete("dache:DEVICE_" + id);//清除车载端登录的标识 return ResultUtil.success(); } @@ -1795,16 +1795,16 @@ */ private void singlePointLogin(Integer id) { //开始验证当前账号是否在别处登录 String value = (String) redisTemplate.opsForValue().get("DRIVER_" + id); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + id); if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线（如果是车载端不需要下线） //开始清除redis中无效的数据 Driver driver = driverMapper.selectById(id); String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone()); String key = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driver.getPhone()); if(ToolUtil.isNotEmpty(key)){ redisTemplate.delete(key);//删除个人信息数据 } redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("DRIVER_" + id);//清除存储的token redisTemplate.delete("dache:DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisTemplate.delete("dache:DRIVER_" + id);//清除存储的token } } @@ -1831,8 +1831,8 @@ usernamePasswordToken, simpleAuthenticationInfo); String s = JwtTokenUtil.generateToken(String.valueOf(driver.getId())); redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(driver.getId()), 7, TimeUnit.DAYS); redisTemplate.opsForValue().set("DRIVER_" + driver.getPhone(), s.substring(s.length() - 32)); redisTemplate.opsForValue().set("DRIVER_" + driver.getId(), s); redisTemplate.opsForValue().set("dache:DRIVER_" + driver.getPhone(), s.substring(s.length() - 32)); redisTemplate.opsForValue().set("dache:DRIVER_" + driver.getId(), s); return s; }
@@ -108,7 +108,7 @@ } //查看是否有可接单的数据 String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(uid)); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(uid)); if(ToolUtil.isNotEmpty(value)){ String[] split = value.split(","); List<OrderStatusWarpper> list1 = this.searchOrder(split[0], split[1], uid); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -138,7 +138,7 @@ OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); Car car = carService.selectById(orderPrivateCar.getCarId()); String value = (String) redisTemplate.opsForValue().get("DRIVER" + orderPrivateCar.getDriverId()); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderPrivateCar.getDriverId()); JSONObject jsonObject = new JSONObject(); jsonObject.put("Address", 450204);//发起地行政区划代码 jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单编号 @@ -170,7 +170,7 @@ public void operateLogin(Integer driverId){ Driver driver = driverService.selectById(driverId); Car car = carService.selectById(driver.getCarId()); String value = (String) redisTemplate.opsForValue().get("DRIVER" + driverId); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + driverId); if(ToolUtil.isNotEmpty(value)){ JSONObject jsonObject = new JSONObject(); jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号 @@ -201,7 +201,7 @@ public void operateLogout(Integer driverId){ Driver driver = driverService.selectById(driverId); Car car = carService.selectById(driver.getCarId()); String value = (String) redisTemplate.opsForValue().get("DRIVER" + driverId); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + driverId); if(ToolUtil.isNotEmpty(value)){ JSONObject jsonObject = new JSONObject(); jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -57,7 +57,7 @@ private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器 private final String socket_uri = "http://192.168.110.111:6000"; private final String socket_uri = "http://192.168.110.85:6000"; // qyt 改派重新推单 @@ -363,7 +363,7 @@ return; } //计算预计距离和剩余时间 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; } DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -410,7 +410,7 @@ orderTaxi.setStartServiceTime(date); orderTaxi.setBoardingTime(date); String value = (String) redisTemplate.opsForValue().get("DRIVER" + uid); String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + uid); if (ToolUtil.isNotEmpty(value)) { String[] split = value.split(","); Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(split[0], split[1]);
