修改bug

Pu Zhibing

17 小时以前 821fc2f632f8b974a2c0fc37630e13c5fbe6086c

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -225,9 +225,10 @@
                PushOrder pushOrder = pushOrderService.querys(1, 1, company.getId()).get(0);
                //获取空闲司机
                List<Driver> list = driverService.queryIdleDriver(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
                System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list));
                System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派空闲司机：" + JSON.toJSONString(list));
                drivers = list.stream().filter(d -> !d.getId().equals(orderPrivateCar.getDriverId())).collect(Collectors.toList());
                if(drivers.size() > 0) {//有司机，直接指派给司机
                    System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派候选司机：" + JSON.toJSONString(drivers));
                    Driver dr = null;
                    if (drivers.size() > 1) {
                        List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
@@ -269,10 +270,11 @@
                    } else {
                        dr = drivers.get(0);
                    }
                    System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派司机：" + JSON.toJSONString(dr));
                    Driver driver1 = driverService.selectById(dr.getId());
                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())
                            .eq("state", 1).like("type", "1"));
                    if(driver.getState() == 2 && null != driverWork) {
                    if(driver1.getState() == 2 && null != driverWork) {
                        String text = "";
                        reassign.setState(3);
                        reassign.setNowDriverId(driver1.getId());
@@ -307,7 +309,7 @@
                            public void run() {
                                try {
                                    // 使用Runtime执行命令
                                    Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
                                    Process process = Runtime.getRuntime().exec("sudo rm -rf /data/nginx/html/files/audio/" + fileName);
                                    // 读取命令的输出
                                    BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                                    String line;
@@ -326,8 +328,7 @@
                    
                        orderPrivateCar.setDriverId(driver1.getId());
                        orderPrivateCar.setCarId(driver1.getCarId());
                        orderPrivateCar.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
                                driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
                        orderPrivateCar.setCompanyId(driver1.getCompanyId());
                        orderPrivateCar.setSnatchOrderTime(new Date());
                        orderPrivateCar.setState(orderPrivateCar.getOldState());
                        orderPrivateCar.setOldState(null);
@@ -571,9 +572,10 @@
                PushOrder pushOrder1 = pushOrderService.querys(1, 1, company1.getId()).get(0);
                //获取空闲司机
                List<Driver> list1 = driverService.queryIdleDriver(orderLogistics.getUserId(), orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder1.getPushDistance(), null);//所有附近空闲司机
                System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list1));
                System.err.println("【" + orderLogistics.getId() + "】订单改派-指派空闲司机：" + JSON.toJSONString(list1));
                drivers = list1.stream().filter(d -> !d.getId().equals(orderLogistics.getDriverId())).collect(Collectors.toList());
                if(drivers.size() > 0){//有司机，直接指派给司机
                    System.err.println("【" + orderLogistics.getId() + "】订单改派-指派候选司机：" + JSON.toJSONString(drivers));
                    Driver dr = null;
                    if(drivers.size() > 1){
                        List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
@@ -615,7 +617,7 @@
                    }else{
                        dr = drivers.get(0);
                    }
                
                    System.err.println("【" + orderLogistics.getId() + "】订单改派-指派司机：" + JSON.toJSONString(dr));
                    Driver driver1 = driverService.selectById(dr.getId());
                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
                            .eq("state", 1).like("type", "4"));
@@ -654,7 +656,7 @@
                            public void run() {
                                try {
                                    // 使用Runtime执行命令
                                    Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
                                    Process process = Runtime.getRuntime().exec("sudo rm -rf /data/nginx/html/files/audio/" + fileName);
                                    // 读取命令的输出
                                    BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                                    String line;
@@ -674,8 +676,7 @@
                    
                        orderLogistics.setDriverId(driver1.getId());
                        orderLogistics.setCarId(driver1.getCarId());
                        orderLogistics.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
                                driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
                        orderLogistics.setCompanyId(driver1.getCompanyId());
                        orderLogistics.setState(orderLogistics.getOldState());
                        orderLogistics.setOldState(null);
                        orderLogistics.setSnatchOrderTime(new Date());
@@ -962,7 +963,7 @@
                Map<String, String> map = new HashMap<>();
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
@@ -1024,7 +1025,7 @@
                        Map<String, String> map = new HashMap<>();
                        map.put("orderId", reassign.getOrderId().toString());
                        map.put("orderType", reassign.getOrderType().toString());
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                        for(Dispatch dispatch : dispatches){
                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                        }
@@ -1116,7 +1117,7 @@
                Map<String, String> map = new HashMap<>();
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }