Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryVideoService.java

@@ -79,10 +79,6 @@ public class QueryVideoService {
         }
         //根据机场id查询对应正在巡检的任务
         Inspection inspection = inspectionMapper.selectInspectionByAirport(id);
-//        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
-//                .eq(Inspection::getAirportId, id)
-//                .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode())
-//                .eq(Inspection::getMark, MarkEnum.VALID.getCode()));
         if(ObjectUtils.isEmpty(inspection)){
             return JsonResult.error(QueryVideoServiceEnum.INSPECTION_IS_NOT_EXIST.getCode(), QueryVideoServiceEnum.INSPECTION_IS_NOT_EXIST.getMsg());
         }
@@ -100,6 +96,7 @@ public class QueryVideoService {
                 return JsonResult.error(QueryVideoServiceEnum.AIPULL_URL_IS_NOT_NULL.getCode(), QueryVideoServiceEnum.AIPULL_URL_IS_NOT_NULL.getMsg());
             }
             vo.setAipullUrl(liveChannel.getAipullUrl());
+            vo.setInspectionId(inspection.getId());
         }
 
         return JsonResult.success(vo);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/InspectionVideoVo.java

@@ -13,4 +13,9 @@ public class InspectionVideoVo {
      * 直播地址
      */
     private String aipullUrl;
+
+    /**
+     * 直播任务id
+     */
+    private String inspectionId;
 }