puzhibing
2025-05-30 35b0088fa28dab8a28758dcbcc056620c1ea5e2c
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
@@ -152,6 +152,7 @@
         order.setDrivingLicenseNumber(driver.getDrivingLicenseNumber());
      }
      order.setVehicleNumber(car.getVehicleNumber());
      order.setDeviceId(car.getDeviceId());
      order.setEnterpriseName(enterprise.getName());
      return R.ok(order);
   }
@@ -184,7 +185,7 @@
   public R<RealVideoResp> getOrderMonitoring(Integer id) {
      Order order = orderService.getById(id);
      if (null == order) {
         return R.fail("获取视频失败");
         return R.fail("发起实时音视频失败,可能是车辆离线导致");
      }
      Car car = carService.getById(order.getCarId());
      //手动加一次状态数据,避免定时任务结束任务线程
@@ -202,14 +203,14 @@
//         live_hls(data.getUrl(), car);
//         resp.setServerIp(hlsIp);
//         resp.setServerPort(hlsPort);
         live_flv(data.getUrl(), car.getId());
         resp.setUrl(data.getUrl());
//         live_flv(data.getUrl(), car.getId());
         resp.setServerIp(flvIp);
         resp.setServerPort(flvHttpPort);
         return R.ok(resp);
      }
      log.error("获取视频失败:{}", startupAckVoR.getMsg());
      return R.fail("获取视频失败");
      return R.fail("发起实时音视频失败,可能是车辆离线导致");
   }