查询回放视频根据报警ID修改

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -663,8 +663,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        cameraUtil.streamConversion(one.getCameraCode());
-        return new AjaxResult(200, "ok", one.getRtspUrl());
+        return new AjaxResult(200, "ok", one.getUrl());
     }
 
     @ApiOperation("视频邀约")
@@ -720,14 +719,13 @@ public class BaseCameraManagementController extends BaseController {
             lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
         }
         lw.eq(BaseCameraManagement::getLineDir, msgAlarm.getLineDir());
-        lw.eq(BaseCameraManagement::getOnline, 2);
+//        lw.eq(BaseCameraManagement::getOnline, 2);
         lw.eq(BaseCameraManagement::getEnableOrNot, 1);
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
         BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
         if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
             baseCameraManagement = baseCameraManagementList.get(0);
-            cameraUtil.streamConversion(baseCameraManagement.getCameraCode());
-            return new AjaxResult(200, "ok", baseCameraManagement.getRtspUrl());
+            return new AjaxResult(200, "ok", baseCameraManagement.getUrl());
         } else {
             return AjaxResult.error("报警里程范围内：" + msgAlarm.getAlarmMile() + "没有可查看的相机！");
         }