perf: 优化萤石云、海康ISC视频播放,并移除退出视频流播放接口

@@ -9,7 +9,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -91,18 +90,6 @@ public class TkVideoController extends BaseController {
       @PathVariable("entityId") String entityId) throws ThingsboardException, IOException {
     return getCameraURL(entityId, null);
   }
-
-  @GetMapping("outVideo/{entityId}")
-  @ApiOperation("退出视频流播放")
-  public void outVideo(
-          @PathVariable("entityId") String entityId) throws ThingsboardException {
-     videoService.outVideo(
-            getCurrentUser().isTenantAdmin(),
-            getCurrentUser().getCurrentUserId(),
-            getCurrentUser().getCurrentTenantId(),
-            entityId);
-  }
-
   @GetMapping("url/{entityId}/{protocolType}")
   @ApiOperation("获取平台视频流播放地址")
   public ResponseResult<Map<String, String>> getCameraPreviewURL(

@@ -9,7 +9,8 @@ import org.thingsboard.server.common.data.yunteng.utils.HttpClientUtils;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,8 +23,9 @@ public class EzvizUtils {
     private static Long expireTime;
 
     public static String getCameraPreviewURL(String appKey, String appSecret, String sn,Integer streamType) throws IOException {
+        String key = appKey+sn;
         //查询缓存中是否已有该设备的直播url
-        String videoUrl =  VideoNumbersUtils.getUrl(appKey+sn+streamType);
+        String videoUrl =  VideoUrlUtils.getUrl(key);
         if(!StringUtils.isEmpty(videoUrl)){
             return videoUrl;
         }
@@ -44,8 +46,10 @@ public class EzvizUtils {
                     }
                     throw new TkDataValidationException(message);
                 }
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                LocalDateTime expireTime = LocalDateTime.parse(json.get("expireTime").asText(), formatter);
                 //将获取到的rul放入缓存
-                VideoNumbersUtils.putVideoUrl(appKey+sn,json.get("url").textValue());
+                VideoUrlUtils.putVideoUrl(key,json.get("url").textValue(),expireTime);
                 return json.get("url").textValue();
             }else{
                 String errorCode = json.get("code").asText();
@@ -92,12 +96,4 @@ public class EzvizUtils {
             throw new TkDataValidationException(ErrorMessage.OPERATION_FAILED.getMessage());
         }
     }
-
-    public static void main(String[] args) {
-        Date date = new Date(1703235281);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        System.out.println(sdf.format(date));
-    }
-
 }

@@ -2,7 +2,6 @@ package org.thingsboard.server.common.data.yunteng.utils.tools;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import org.apache.commons.lang3.StringUtils;
@@ -11,6 +10,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -36,7 +36,8 @@ public class HikVisionArtemisPostUtils {
 
     public static String getCameraPreviewURL(String host, String appKey, String appSecret, int ssl,
                                              ProtocolType protocolType,String body,String sn ) {
-        String videoUrl =  VideoNumbersUtils.getUrl(appKey+sn);
+        String key = appKey+sn;
+        String videoUrl =  VideoUrlUtils.getUrl(key);
         if(!StringUtils.isEmpty(videoUrl)){
             return videoUrl;
         }
@@ -62,7 +63,7 @@ public class HikVisionArtemisPostUtils {
                     }
                     throw new TkDataValidationException(message);
                 }
-                VideoNumbersUtils.putVideoUrl(appKey+sn,json.get("url").textValue());
+                VideoUrlUtils.putVideoUrl(key,json.get("url").textValue(), LocalDateTime.now().plusMinutes(5));
                 return json.get("url").textValue();
             }else{
                 String errorCode = json.get("code").asText();

-package org.thingsboard.server.common.data.yunteng.utils.tools;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class VideoNumbersUtils {
-
-    private static  Map<String, Map<String,Object>> number = new HashMap<>();
-
-
-    public static void putVideoUrl(String key,String url)  {
-        Map<String,Object> newVideo = new HashMap<>();
-        newVideo.put("url",url);
-        newVideo.put("number",1);
-        number.put(key,newVideo);
-    }
-
-    public static String getUrl(String key)  {
-        //获取已有直播链接并加入人数
-        Map<String,Object> oldVideo = number.get(key);
-        if(oldVideo==null){
-            return null;
-        }
-        oldVideo.put("number",(int)oldVideo.get("number")+1);
-        return oldVideo.get("url").toString();
-    }
-
-    public static void deleteVideoNumber(String key)  {
-        //减少直播间人数
-        Map<String,Object> oldVideo = number.get(key);
-        int videoNumber = (int) oldVideo.get("number");
-        //只有一个人并且需要减少则直接删除
-        if(videoNumber==1){
-            number.remove(key);
-            return;
-        }
-        oldVideo.put("number",(int)oldVideo.get("number")-1);
-    }
-
-
-}

+package org.thingsboard.server.common.data.yunteng.utils.tools;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+public class VideoUrlUtils {
+
+    private static  Map<String, Map<String,Object>> videoUrlData = new HashMap<>();
+
+
+    public static void putVideoUrl(String key, String url, LocalDateTime expireTime)  {
+        Map<String,Object> videoUrlInfo = new HashMap<>();
+        videoUrlInfo.put("url",url);
+        videoUrlInfo.put("expireTime",expireTime);
+        videoUrlData.put(key,videoUrlInfo);
+    }
+
+    public static String getUrl(String key) {
+        Map<String,Object> videoUrlInfo = videoUrlData.get(key);
+        if(videoUrlInfo==null || videoUrlInfo.isEmpty()){
+            return null;
+        }
+        LocalDateTime expireTime = (LocalDateTime) videoUrlInfo.get("expireTime");
+        LocalDateTime nowTime = LocalDateTime.now();
+        //如果过期了返回null
+        return nowTime.isAfter(expireTime) ? null : videoUrlInfo.get("url").toString();
+    }
+}

@@ -93,16 +93,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
     @Override
     public String getCameraPreviewURL(boolean isTenantAdmin, String customerUserId, String tenantId, String entityId,
                                       ProtocolType protocolType) throws IOException {
-        if (isTenantAdmin) {
-            customerUserId = null;
-        }
-        //通过流媒体方式获取视频流的列表
-        List<TkVideoDTO> videoDTOList = baseMapper.getVideoInfosByTenantIdOrAccessModeOrId(tenantId, entityId,
-                FastIotConstants.MagicNumber.ONE, customerUserId);
-        if (videoDTOList.size() == 0) {
-            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-        }
-        TkVideoDTO videoDTO = videoDTOList.get(0);
+        TkVideoDTO videoDTO = getVideoInfo(isTenantAdmin,customerUserId,tenantId,entityId);
         TkVideoPlatformDTO videoPlatformDTO = videoDTO.getVideoPlatformDTO();
         if(videoPlatformDTO.getType()==0){//如果为海康威视
             return HikVisionArtemis(videoDTO,protocolType);
@@ -115,16 +106,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
 
     @Override
     public String controlli(boolean isTenantAdmin, String customerUserId, String tenantId, String entityId, int action, String command ) {
-        if (isTenantAdmin) {
-            customerUserId = null;
-        }
-        //通过流媒体方式获取视频流的列表
-        List<TkVideoDTO> videoDTOList = baseMapper.getVideoInfosByTenantIdOrAccessModeOrId(tenantId, entityId,
-                FastIotConstants.MagicNumber.ONE, customerUserId);
-        if (videoDTOList.size() == 0) {
-            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-        }
-        TkVideoDTO videoDTO = videoDTOList.get(0);
+        TkVideoDTO videoDTO = getVideoInfo(isTenantAdmin,customerUserId,tenantId,entityId);
 
         //组装请求参数
         ObjectNode jsonBody = JacksonUtil.newObjectNode();
@@ -172,22 +154,6 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
         }
         return null;
     }
-
-    @Override
-    public void outVideo(boolean isTenantAdmin, String customerUserId, String tenantId, String entityId) {
-        if (isTenantAdmin) {
-            customerUserId = null;
-        }
-        //通过流媒体方式获取视频流的列表
-        List<TkVideoDTO> videoDTOList = baseMapper.getVideoInfosByTenantIdOrAccessModeOrId(tenantId, entityId,
-                FastIotConstants.MagicNumber.ONE, customerUserId);
-        if (videoDTOList.size() == 0) {
-            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-        }
-        TkVideoDTO videoDTO = videoDTOList.get(0);
-        VideoNumbersUtils.deleteVideoNumber(videoDTO.getVideoPlatformDTO().getAppKey()+videoDTO.getSn());
-    }
-
     private String  HikVisionArtemis(TkVideoDTO videoDTO, ProtocolType protocolType){
         if(protocolType!=null && protocolType.equals(ProtocolType.HLS)){
             protocolType = videoDTO.getPlayProtocol() == 0 ? ProtocolType.HLS : ProtocolType.HLSS;
@@ -208,4 +174,17 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
                 videoDTO.getVideoPlatformDTO().getSsl(),protocolType,body,videoDTO.getSn());
     }
 
+    private TkVideoDTO getVideoInfo(boolean isTenantAdmin,String customerUserId, String tenantId, String entityId){
+        if (isTenantAdmin) {
+            customerUserId = null;
+        }
+        //通过流媒体方式获取视频流的列表
+        List<TkVideoDTO> videoDTOList = baseMapper.getVideoInfosByTenantIdOrAccessModeOrId(tenantId, entityId,
+                FastIotConstants.MagicNumber.ONE, customerUserId);
+        if (videoDTOList.size() == 0) {
+            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+        }
+        return videoDTOList.get(0);
+    }
+
 }

@@ -104,9 +104,4 @@ public interface TkVideoService extends BaseService<TkVideoEntity> {
    * @return 视频列表
    */
   List<TkVideoDTO> getVideoList(String organizationId, String tenantId);
-
-  void outVideo( boolean isTenantAdmin,
-                 String customerUserId,
-                 String tenantId,
-                 String entityId);
 }