fix: 获取视频列表时，返回流媒体协议

@@ -97,8 +97,8 @@ public class TkVideoController extends BaseController {
       @PathVariable("protocolType") ProtocolType protocolType)
       @PathVariable("protocolType") ProtocolType protocolType)
       throws ThingsboardException {
       throws ThingsboardException {
     if (!protocolType.equals(ProtocolType.RTSP)
     if (!protocolType.equals(ProtocolType.RTSP)
-        || !protocolType.equals(ProtocolType.RTMP)
-        || !protocolType.equals(ProtocolType.HLS)) {
+        && !protocolType.equals(ProtocolType.RTMP)
+        && !protocolType.equals(ProtocolType.HLS)) {
       protocolType = ProtocolType.HLS;
       protocolType = ProtocolType.HLS;
     }
     }
     return getCameraURL(entityId, protocolType);
     return getCameraURL(entityId, protocolType);
@@ -115,7 +115,7 @@ public class TkVideoController extends BaseController {
 
 
   private ResponseResult<Map<String, String>> getCameraURL(
   private ResponseResult<Map<String, String>> getCameraURL(
       String entityId, ProtocolType protocolType) throws ThingsboardException {
       String entityId, ProtocolType protocolType) throws ThingsboardException {
-    if (protocolType == null) {
+      if (protocolType == null) {
       protocolType = ProtocolType.HLS;
       protocolType = ProtocolType.HLS;
     }
     }
     String url =
     String url =

@@ -29,6 +29,8 @@
             <result property="appKey" column="app_key"/>
             <result property="appKey" column="app_key"/>
             <result property="appSecret" column="app_secret"/>
             <result property="appSecret" column="app_secret"/>
             <result property="ssl" column="ssl"/>
             <result property="ssl" column="ssl"/>
+            <result property="protocolType" column="protocol_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+            <result property="remark" column="remark"/>
         </association>
         </association>
     </resultMap>
     </resultMap>
 
 
@@ -42,7 +44,7 @@
 
 
     <sql id="detailColumns">
     <sql id="detailColumns">
         <include refid="basicColumns"/>
         <include refid="basicColumns"/>
-        ,org.name AS organization_name,ivp.host,ivp.app_key,ivp.app_secret,ivp.ssl
+        ,org.name AS organization_name,ivp.host,ivp.app_key,ivp.app_secret,ivp.ssl,ivp.remark,ivp.protocol_type
     </sql>
     </sql>
     <select id="getVideoPage" resultMap="videoMap">
     <select id="getVideoPage" resultMap="videoMap">
         SELECT
         SELECT