Merge branch 'local_dev_latest' into 'main_dev'

perf(src/packages/external/Informations): 修改摄像头支持gbt28181播放

See merge request yunteng/thingskit-view!204

@@ -2,7 +2,8 @@ import { defHttp } from "@/utils/external/http/axios";
 import { useGlobSetting } from '@/hooks/external/setting';
 enum Api {
   OPEN_FLV = '/rtsp/openFlv',
-  CLOSE_FLV = '/rtsp/closeFlv'
+  CLOSE_FLV = '/rtsp/closeFlv',
+  GET_VIDEO_CONTROL_START = '/video/control/start',
 }
 
 export const getOpenFlvPlayUrl = (url: string, browserId: string) => {
@@ -19,3 +20,17 @@ export const closeFlvPlay = (url: string, browserId: string) => {
     }
   });
 };
+
+//gbt28181,获取flv地址
+export const getVideoControlStart = ({
+  deviceId,
+  channelId,
+}: Record<'deviceId' | 'channelId', string>) => {
+  return defHttp.get<Recordable>(
+    {
+      url: `${Api.GET_VIDEO_CONTROL_START}/${deviceId}/${channelId}`,
+      timeout: 30 * 1000,
+    },
+    {}
+  );
+};

@@ -23,6 +23,14 @@ export interface videoListInterface {
   label: string
   value: string
   sn: string
+  channelId: string
+  params: GBT28181Params
+}
+
+export interface GBT28181Params {
+  channelNo: string
+  deviceId: string
+  deviceName: string
 }
 
 export enum AccessMode {
@@ -37,7 +45,7 @@ export const option = {
   poster: '',
   sourceType: 'custom',
   organization: '',
-  videoId : ''
+  videoId: ''
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -61,6 +61,7 @@ import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/Ch
 import { NTreeSelect } from 'naive-ui'
 import { getOrganizationList, getVideoList, getVideoUrl } from '@/api/external/common/index'
 import { TKUpload } from '@/components/external/Common/TKUpload'
+import { getVideoControlStart } from '@/api/external/flvPlay'
 
 const props = defineProps({
   optionData: {
@@ -100,14 +101,14 @@ const getVideoLists = async (organizationId: string) => {
   const res = await getVideoList({ organizationId })
   if (!res) return
   videoOptions.value = res?.data?.map((item: videoListInterface) => {
-    if(item.accessMode === AccessMode.GBT28181) return 0;
     return {
       label: item.name,
-      value: item.accessMode === AccessMode.Streaming ? item.id : item.videoUrl,
+      value: item.accessMode === AccessMode.Streaming ? item.id : item.accessMode === AccessMode.ManuallyEnter ? item.videoUrl : item?.params?.deviceId,
       id: item.id,
-      accessMode: item.accessMode
-   }
-  }).filter(Boolean)
+      accessMode: item.accessMode,
+      channelId: item.accessMode === AccessMode.GBT28181 ? item?.params?.channelNo :''
+    }
+  })
 }
 
 const getVideoUrlById = async (id: string) => {
@@ -126,19 +127,27 @@ const handleChecked = (value: string) => {
   }
 }
 
-const handleSelect = (_: string, e: videoListInterface) => {
-  const { accessMode, id, value } = e
-  //1表示，需要从服务端调取接口换取播放的地址，0则不需要
+const handleSelect = async (_: string, e: videoListInterface) => {
+  const { accessMode, id, value , channelId } = e
+  //流媒体，需要从服务端调取接口换取播放的地址
   if (accessMode === AccessMode.Streaming) {
     getVideoUrlById(id)
     url.value = id
     props.optionData.videoId = id
+  } else if (accessMode === AccessMode.GBT28181) {
+    //gbt28181，需要调用接口获取flv播放地址
+    if(!value) return
+    const { data: { flv } } = await getVideoControlStart({
+      deviceId: value,
+      channelId
+    })
+    props.optionData.dataset = flv || ''
   } else {
     props.optionData.dataset = value as string
   }
 }
 
-onMounted(async() => {
+onMounted(async () => {
   if (props.optionData.sourceType === sourceTypeEnum.PLATFORM) {
     getOriginationList()
     if (props.optionData.organization) {