Merge branch '2023-12-28' into 'master_dev'

feat:萤石获取链接增加视频格式选项

See merge request yunteng/thingskit!302

@@ -47,10 +47,10 @@ public class TkVideoDTO extends TenantDTO {
   @ApiModelProperty(value = "平台ID")
   @ApiModelProperty(value = "平台ID")
   private String videoPlatformId;
   private String videoPlatformId;
 
 
-  @ApiModelProperty(value = "码流：0主码流 1子码流(萤石高清) 2第三码流(萤石流畅)")
+  @ApiModelProperty(value = "码流：0主码流 1子码流 (或萤石高清) 2第三码流(或萤石流畅)")
   private Integer streamType;
   private Integer streamType;
 
 
-  @ApiModelProperty(value = "播放协议：0 http 1 https")
+  @ApiModelProperty(value = "海康ISC：0 http 1 https（用于判断HLS/HLSS） 萤石云：2(萤石云hls) 4(萤石云flv) ")
   private Integer playProtocol;
   private Integer playProtocol;
 
 
   @ApiModelProperty(value = "流媒体平台基础信息")
   @ApiModelProperty(value = "流媒体平台基础信息")

@@ -22,7 +22,7 @@ public class EzvizUtils {
     private static String accessToken;
     private static String accessToken;
     private static Long expireTime;
     private static Long expireTime;
 
 
-    public static String getCameraPreviewURL(String appKey, String appSecret, String sn,Integer streamType) throws IOException {
+    public static String getCameraPreviewURL(String appKey, String appSecret, String sn,Integer streamType,Integer playProtocol) throws IOException {
         String key = appKey+sn;
         String key = appKey+sn;
         //查询缓存中是否已有该设备的直播url
         //查询缓存中是否已有该设备的直播url
         String videoUrl =  VideoUrlUtils.getUrl(key);
         String videoUrl =  VideoUrlUtils.getUrl(key);
@@ -31,7 +31,7 @@ public class EzvizUtils {
         }
         }
         getAccessTokenByUrl(appKey,appSecret);
         getAccessTokenByUrl(appKey,appSecret);
         String cameraPreviewURL  = url+"v2/live/address/get?accessToken="+accessToken+
         String cameraPreviewURL  = url+"v2/live/address/get?accessToken="+accessToken+
-                "&deviceSerial="+sn+"&protocol=4&quality="+streamType;
+                "&deviceSerial="+sn+"&protocol="+playProtocol+"&quality="+streamType;
         //调用接口
         //调用接口
         String result =  HttpClientUtils.sendPOST(cameraPreviewURL,"");
         String result =  HttpClientUtils.sendPOST(cameraPreviewURL,"");
         //返回url地址
         //返回url地址

@@ -99,7 +99,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
             return HikVisionArtemis(videoDTO,protocolType);
             return HikVisionArtemis(videoDTO,protocolType);
         }
         }
         if (videoPlatformDTO.getType()==1){
         if (videoPlatformDTO.getType()==1){
-            return EzvizUtils.getCameraPreviewURL(videoPlatformDTO.getAppKey(),videoPlatformDTO.getAppSecret(),videoDTO.getSn(),videoDTO.getStreamType());
+            return EzvizUtils.getCameraPreviewURL(videoPlatformDTO.getAppKey(),videoPlatformDTO.getAppSecret(),videoDTO.getSn(),videoDTO.getStreamType(),videoDTO.getPlayProtocol());
         }
         }
         return null;
         return null;
     }
     }