wangmengzhao
2023-12-13 d8228730095cdcaccb40dd2dc290fc44779e340a
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/task/DeviceOrderTask.java
@@ -78,12 +78,12 @@
                        //当前时间——派单时间如果大于deviceorderTime表中的receive_timeout就是订单已经超时了
                        receiveTimeout = deviceOrderTimes.getReceiveTimeout();
                        finishTimeout = deviceOrderTimes.getFinishTimeout();
                        return;
                        break;
                    }
                    if (createUser_Id == userId && deviceOrderTimes.getOrderType() == 2 && deviceOrderType.equals(deviceOrderTimes.getOrderType())) {
                        receiveTimeout = deviceOrderTimes.getReceiveTimeout();
                        finishTimeout = deviceOrderTimes.getFinishTimeout();
                        return;
                        break;
                    }
                }
                if (deviceOrders.getReceiveTime() != null) {
@@ -97,12 +97,12 @@
                    if (createUser_Id == userId && deviceOrderTimes.getOrderType() == 1 && deviceOrderType.equals(deviceOrderTimes.getOrderType())) {
                        receiveTimeout = deviceOrderTimes.getReceiveTimeout();
                        finishTimeout = deviceOrderTimes.getFinishTimeout();
                        return;
                        break;
                    }
                    if (createUser_Id == userId && deviceOrderTimes.getOrderType() == 2 && deviceOrderType.equals(deviceOrderTimes.getOrderType())) {
                        receiveTimeout = deviceOrderTimes.getReceiveTimeout();
                        finishTimeout = deviceOrderTimes.getFinishTimeout();
                        return;
                        break;
                    }
                }
            }
@@ -117,7 +117,7 @@
            long assginTimeMinutes = Math.abs(durationA.toMinutes());
            if (assginTimeMinutes > finishTimeout) {
                deviceOrders.setId(deviceOrders.getId());
                deviceOrders.setReceiveTimeoutFlag(true);
                deviceOrders.setReceiveTimeoutFlag(1);
                int rows = deviceOrderMapper.updateDeviceOrder(deviceOrders);
            }
@@ -128,7 +128,7 @@
            long receiveTimeMinutes = Math.abs(durationB.toMinutes());
            if (receiveTimeMinutes > receiveTimeout) {
                deviceOrders.setId(deviceOrders.getId());
                deviceOrders.setFinishTimeoutFlag(true);
                deviceOrders.setFinishTimeoutFlag(1);
                int rows = deviceOrderMapper.updateDeviceOrder(deviceOrders);
            }
            break;