Merge branch '2024-2-26' into 'master_dev'

fix：修改获取视频列表接口查询为sql查询获取params字段

See merge request yunteng/thingskit!346

@@ -189,14 +189,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
                 organizationIds.add(organizationId);
                 organizationIds.add(organizationId);
             }
             }
         }
         }
-        List<TkVideoEntity> list = baseMapper.selectList(new LambdaQueryWrapper<TkVideoEntity>()
-                .eq(TkVideoEntity::getTenantId, tenantId)
-                .in(!organizationIds.isEmpty(),
-                        TkVideoEntity::getOrganizationId,organizationIds));
-        if(!list.isEmpty()){
-            return list.stream().map(entity->entity.getDTO(TkVideoDTO.class)).collect(Collectors.toList());
-        }
-        return null;
+        return baseMapper.getVideoInfosByOrganizationIds(tenantId,organizationIds);
     }
     }
     private String  HikVisionArtemis(TkVideoDTO videoDTO, ProtocolType protocolType){
     private String  HikVisionArtemis(TkVideoDTO videoDTO, ProtocolType protocolType){
         if(protocolType!=null && protocolType.equals(ProtocolType.HLS)){
         if(protocolType!=null && protocolType.equals(ProtocolType.HLS)){

@@ -27,7 +27,7 @@ public interface TkVideoMapper extends BaseMapper<TkVideoEntity> {
                                    @Param("status") Boolean status, @Param("organization") List<String> organizationId);
                                    @Param("status") Boolean status, @Param("organization") List<String> organizationId);
 
 
     /**
     /**
-     * 根据租户ID、当前客户ID、视频ID、视频流获取方式，查询视频信息
+     * 根据租户ID、当前客户ID、视频ID、视频流获取方式\，查询视频信息
      * @param tenantId 租户ID
      * @param tenantId 租户ID
      * @param id 视频ID
      * @param id 视频ID
      * @param accessMode 流获取方式
      * @param accessMode 流获取方式
@@ -35,4 +35,13 @@ public interface TkVideoMapper extends BaseMapper<TkVideoEntity> {
      */
      */
     List<TkVideoDTO> getVideoInfosByTenantIdOrAccessModeOrId(@Param("tenantId") String tenantId, @Param("id") String id,
     List<TkVideoDTO> getVideoInfosByTenantIdOrAccessModeOrId(@Param("tenantId") String tenantId, @Param("id") String id,
                                                              @Param("accessMode") Integer accessMode);
                                                              @Param("accessMode") Integer accessMode);
+
+
+    /**
+     * 根据租户ID、当前客户ID、视频ID、视频流获取方式\，查询视频信息
+     * @param tenantId 租户ID
+     * @param organizationIds 组织id
+     * @return
+     */
+    List<TkVideoDTO> getVideoInfosByOrganizationIds(@Param("tenantId") String tenantId, @Param("organizationIds") List<String> organizationIds);
 }
 }

@@ -93,4 +93,24 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <select id="getVideoInfosByOrganizationIds" resultMap="videoMap">
+        SELECT
+        <include refid="detailColumns"/>
+        FROM tk_device_camera base
+        LEFT JOIN tk_organization org ON org.id = base.organization_id
+        LEFT JOIN tk_video_platform ivp ON ivp.id = base.video_platform_id
+        <where>
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}
+            </if>
+            <if test="organizationIds !=null">
+                AND base.organization_id IN
+                <foreach collection="organizationIds" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>
 </mapper>