Merge branch 'cherry-pick-3e7d72ec' into 'master_dev'

perf:查询视频配置去掉是否客户与客户id限制

See merge request yunteng/thingskit!318

@@ -138,8 +138,6 @@ public class TkVideoController extends BaseController {
     }
     String url =
         videoService.getCameraPreviewURL(
-            getCurrentUser().isTenantAdmin(),
-            getCurrentUser().getCurrentUserId(),
             getCurrentUser().getCurrentTenantId(),
             entityId,
             protocolType);

@@ -97,9 +97,9 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
     }
 
     @Override
-    public String getCameraPreviewURL(boolean isTenantAdmin, String customerUserId, String tenantId, String entityId,
+    public String getCameraPreviewURL(String tenantId, String entityId,
                                       ProtocolType protocolType) throws IOException {
-        TkVideoDTO videoDTO = getVideoInfo(isTenantAdmin,customerUserId,tenantId,entityId);
+        TkVideoDTO videoDTO = getVideoInfo(tenantId,entityId);
         TkVideoPlatformDTO videoPlatformDTO = videoDTO.getVideoPlatformDTO();
         if(videoPlatformDTO.getType()==0){//如果为海康威视
             return HikVisionArtemis(videoDTO,protocolType);
@@ -112,7 +112,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
 
     @Override
     public String controlli(boolean isTenantAdmin, String customerUserId, String tenantId, String entityId, int action, String command ) {
-        TkVideoDTO videoDTO = getVideoInfo(isTenantAdmin,customerUserId,tenantId,entityId);
+        TkVideoDTO videoDTO = getVideoInfo(tenantId,entityId);
 
         //组装请求参数
         ObjectNode jsonBody = JacksonUtil.newObjectNode();
@@ -180,13 +180,10 @@ 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;
-        }
+    private TkVideoDTO getVideoInfo(String tenantId, String entityId){
         //通过流媒体方式获取视频流的列表
         List<TkVideoDTO> videoDTOList = baseMapper.getVideoInfosByTenantIdOrAccessModeOrId(tenantId, entityId,
-                FastIotConstants.MagicNumber.ONE, customerUserId);
+                FastIotConstants.MagicNumber.ONE);
         if (videoDTOList.size() == 0) {
             throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         }

@@ -31,9 +31,8 @@ public interface TkVideoMapper extends BaseMapper<TkVideoEntity> {
      * @param tenantId 租户ID
      * @param id 视频ID
      * @param accessMode 流获取方式
-     * @param customerUserId 客户ID
      * @return
      */
     List<TkVideoDTO> getVideoInfosByTenantIdOrAccessModeOrId(@Param("tenantId") String tenantId, @Param("id") String id,
-                                                             @Param("accessMode") Integer accessMode, @Param("customerUserId") String customerUserId);
+                                                             @Param("accessMode") Integer accessMode);
 }

@@ -53,16 +53,12 @@ public interface TkVideoService extends BaseService<TkVideoEntity> {
   /**
    * 根据租户ID、客户ID、视频ID获取视屏流播放地址
    *
-   * @param isTenantAdmin 是否租户管理员
-   * @param customerUserId 客户ID
    * @param tenantId 租户ID
    * @param entityId 视频ID
    * @param protocolType 视频协议
    * @return 视屏流播放地址
    */
   String getCameraPreviewURL(
-      boolean isTenantAdmin,
-      String customerUserId,
       String tenantId,
       String entityId,
       ProtocolType protocolType) throws IOException;

@@ -91,9 +91,6 @@
             <if test="accessMode !=null">
                 AND base.access_mode = #{accessMode}
             </if>
-            <if test="customerUserId !=null and customerUserId !=''">
-                AND base.creator = #{customerUserId}
-            </if>
         </where>
     </select>
 </mapper>