Merge branch 'master_dev' into 'master'

fix:云台控制传参参数错误

See merge request yunteng/thingskit!353

@@ -92,6 +92,10 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common.transport</groupId>
+            <artifactId>gbt28181</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common.transport</groupId>
             <artifactId>http</artifactId>
         </dependency>
         <dependency>

+--更新区域表的名称
+update sys_area
+set name ='澳门特别行政区'
+where code = 820000
+  and "level" = 'PROVINCE';
+update sys_area
+set name ='香港特别行政区'
+where code = 810000
+  and "level" = 'PROVINCE';
+UPDATE "public"."sys_area"
+SET "name"  = '香港特别行政区',
+    "level" = 'CITY'
+WHERE "code" = 810000
+  AND "parent_id" = 810000;
+
+UPDATE "public"."sys_area"
+SET "name"  = '澳门特别行政区',
+    "level" = 'CITY'
+WHERE "code" = 820000
+  AND "parent_id" = 820000;
+ALTER TABLE tk_device_camera ALTER COLUMN name TYPE varchar(128);
+DROP TABLE IF EXISTS "public"."tk_media_server";
+CREATE TABLE "public"."tk_media_server"
+(
+    "id"                  varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
+    "ip"                  varchar(20) COLLATE "pg_catalog"."default",
+    "hook_ip"             varchar(20) COLLATE "pg_catalog"."default",
+    "sdp_ip"              varchar(20) COLLATE "pg_catalog"."default",
+    "stream_ip"           varchar(20) COLLATE "pg_catalog"."default",
+    "http_port"           int4,
+    "http_ssl_port"       int4,
+    "rtmp_port"           int4,
+    "rtmp_ssl_port"       int4,
+    "rtp_proxy_port"      int4,
+    "rtsp_port"           int4,
+    "rtsp_ssl_port"       int4,
+    "secret"              varchar(50) COLLATE "pg_catalog"."default",
+    "rtp_enable"          bool,
+    "rtp_port_range"      varchar(20) COLLATE "pg_catalog"."default",
+    "send_rtp_port_range" varchar(20) COLLATE "pg_catalog"."default",
+    "record_assist_port"  int4,
+    "status"              int2,
+    "tenant_id"           varchar(36) COLLATE "pg_catalog"."default",
+    "creator"             char(36) COLLATE "pg_catalog"."default",
+    "create_time"         timestamp(6),
+    "updater"             char(36) COLLATE "pg_catalog"."default",
+    "update_time"         timestamp(6),
+    "remark"              varchar(255) COLLATE "pg_catalog"."default",
+    "default_server"      bool,
+    "media_server_id"     varchar(36) COLLATE "pg_catalog"."default",
+    "auto_config"         bool,
+    "hook_alive_interval" float4
+)
+;
+COMMENT
+ON COLUMN "public"."tk_media_server"."id" IS '主键ID';
+COMMENT
+ON COLUMN "public"."tk_media_server"."ip" IS 'IP';
+COMMENT
+ON COLUMN "public"."tk_media_server"."hook_ip" IS 'zlmediakit访问平台的IP';
+COMMENT
+ON COLUMN "public"."tk_media_server"."sdp_ip" IS 'SDP IP';
+COMMENT
+ON COLUMN "public"."tk_media_server"."stream_ip" IS '流IP';
+COMMENT
+ON COLUMN "public"."tk_media_server"."http_port" IS 'zlmediakit的HTTP端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."http_ssl_port" IS 'zlmediakit的HTTPS端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtmp_port" IS 'zlmediakit的RTMP端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtmp_ssl_port" IS 'zlmediakit的RTMPS端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtp_proxy_port" IS 'RTP收流端口（单端口模式有用）';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtsp_port" IS 'zlmediakit的RTSP端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtsp_ssl_port" IS 'zlmediakit的RTSPS端口';
+COMMENT
+ON COLUMN "public"."tk_media_server"."secret" IS 'zlmediakit的鉴权参数';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtp_enable" IS '是否使用多端口模式';
+COMMENT
+ON COLUMN "public"."tk_media_server"."rtp_port_range" IS '多端口RTP收流端口范围';
+COMMENT
+ON COLUMN "public"."tk_media_server"."send_rtp_port_range" IS '多端口RTP发流端口范围';
+COMMENT
+ON COLUMN "public"."tk_media_server"."record_assist_port" IS '录像辅助端口：0代表未使用';
+COMMENT
+ON COLUMN "public"."tk_media_server"."status" IS '流媒体服务状态：0离线 1在线';
+COMMENT
+ON COLUMN "public"."tk_media_server"."tenant_id" IS '租户ID';
+COMMENT
+ON COLUMN "public"."tk_media_server"."creator" IS '创建用户';
+COMMENT
+ON COLUMN "public"."tk_media_server"."create_time" IS '创建时间';
+COMMENT
+ON COLUMN "public"."tk_media_server"."updater" IS '更新用户';
+COMMENT
+ON COLUMN "public"."tk_media_server"."update_time" IS '更新时间';
+COMMENT
+ON COLUMN "public"."tk_media_server"."remark" IS '备注';
+COMMENT
+ON COLUMN "public"."tk_media_server"."default_server" IS '是否系统默认服务';
+COMMENT
+ON COLUMN "public"."tk_media_server"."media_server_id" IS '流媒体ID';
+COMMENT
+ON COLUMN "public"."tk_media_server"."auto_config" IS '是否开启自动配置ZLM';
+COMMENT
+ON COLUMN "public"."tk_media_server"."hook_alive_interval" IS 'keepalive hook触发间隔,单位秒';
+COMMENT
+ON TABLE "public"."tk_media_server" IS '流媒体表（ZLMediakit）GBT28181';
+
+-- ----------------------------
+-- Primary Key structure for table tk_media_server
+-- ----------------------------
+ALTER TABLE "public"."tk_media_server"
+    ADD CONSTRAINT "tk_media_server_pkey" PRIMARY KEY ("id");
+
+
+DROP TABLE IF EXISTS "public"."tk_video_channel";
+CREATE TABLE "public"."tk_video_channel"
+(
+    "id"           varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
+    "name"         varchar(36) COLLATE "pg_catalog"."default",
+    "camera_code"  varchar(50) COLLATE "pg_catalog"."default",
+    "manufacturer" varchar(50) COLLATE "pg_catalog"."default",
+    "model"        varchar(36) COLLATE "pg_catalog"."default",
+    "owner"        varchar(36) COLLATE "pg_catalog"."default",
+    "civil_code"   varchar(50) COLLATE "pg_catalog"."default",
+    "address"      varchar(255) COLLATE "pg_catalog"."default",
+    "parental"     int2,
+    "safety_way"   int2 DEFAULT 0,
+    "register_way" int2 DEFAULT 1,
+    "cert_num"     varchar(50) COLLATE "pg_catalog"."default",
+    "certifiable"  int2 DEFAULT 0,
+    "error_code"   int2 DEFAULT 1,
+    "end_time"     timestamp(6),
+    "secrecy"      int2 DEFAULT 0,
+    "ip_address"   varchar(36) COLLATE "pg_catalog"."default",
+    "port"         int4,
+    "password"     varchar(128) COLLATE "pg_catalog"."default",
+    "status"       varchar(20) COLLATE "pg_catalog"."default",
+    "tenant_id"    varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
+    "creator"      char(36) COLLATE "pg_catalog"."default",
+    "create_time"  timestamp(6),
+    "updater"      char(36) COLLATE "pg_catalog"."default",
+    "update_time"  timestamp(6),
+    "remark"       varchar(255) COLLATE "pg_catalog"."default",
+    "channel_id"   varchar(50) COLLATE "pg_catalog"."default",
+    "stream_id"    varchar(50) COLLATE "pg_catalog"."default",
+    "device_id"    varchar(36) COLLATE "pg_catalog"."default"
+)
+;
+COMMENT
+ON COLUMN "public"."tk_video_channel"."id" IS '视频通道编码ID';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."name" IS '视频通道名称';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."camera_code" IS '设备国标编号';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."manufacturer" IS '制造厂商';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."model" IS '型号';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."owner" IS '设备归属';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."civil_code" IS '行政区域';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."address" IS '安装地址';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."parental" IS '是否有子设备: 0没有 1有';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."safety_way" IS '信令安全模式缺省为0; 0:不采用;2:S/MIME 签名方式;3:S/
+MIME加密签名同时采用方式;4:数字摘要方式';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."register_way" IS '注册方式缺省为1;1:符合IETFRFC3261标准的认证注册模
+式;2:基于口令的双向认证注册模式;3:基于数字证书的双向认证注册模式';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."cert_num" IS '证书序列号';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."certifiable" IS '证书有效标识(有证书的设备必选)缺省为0;证书有效标识:0:无效 1:
+有效';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."error_code" IS '无效原因码';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."end_time" IS '证书终止有效期';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."secrecy" IS '保密属性缺省为0;0:不涉密,1:涉密';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."ip_address" IS '系统IP地址';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."port" IS '端口';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."password" IS '密码';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."status" IS '通道状态：ON 在线 OFF 离线，使用枚举值';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."tenant_id" IS '租户ID';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."creator" IS '创建人';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."create_time" IS '创建时间';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."updater" IS '更新人';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."update_time" IS '更新时间';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."remark" IS '备注';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."channel_id" IS '视频通道编码ID';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."stream_id" IS '流唯一编号，存在表示正在直播';
+COMMENT
+ON COLUMN "public"."tk_video_channel"."device_id" IS '通道所属设备ID';
+COMMENT
+ON TABLE "public"."tk_video_channel" IS '摄像头通道信息表（字段来源于GBT28181）';
+
+-- ----------------------------
+-- Primary Key structure for table tk_video_channel
+-- ----------------------------
+ALTER TABLE "public"."tk_video_channel"
+    ADD CONSTRAINT "tk_video_channel_pkey" PRIMARY KEY ("id");
+
+DROP TABLE IF EXISTS "public"."tk_device_access_information";
+CREATE TABLE "public"."tk_device_access_information"
+(
+    "id"               varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+    "intranet_ip"      varchar(100) COLLATE "pg_catalog"."default",
+    "intranet_port"    varchar(100) COLLATE "pg_catalog"."default",
+    "outer_net_ip"     varchar(100) COLLATE "pg_catalog"."default",
+    "outer_net_port"   varchar(100) COLLATE "pg_catalog"."default",
+    "device_agreement" varchar(100) COLLATE "pg_catalog"."default",
+    "sip_extend"       varchar COLLATE "pg_catalog"."default",
+    "creator"          char(64) COLLATE "pg_catalog"."default",
+    "create_time"      timestamp(0),
+    "updater"          char(64) COLLATE "pg_catalog"."default",
+    "update_time"      timestamp(0),
+    "tenant_id"        varchar(64) COLLATE "pg_catalog"."default"
+)
+;
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."intranet_ip" IS '内网ip';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."intranet_port" IS '内网端口';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."outer_net_ip" IS '外网IP';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."outer_net_port" IS '外网端口';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."device_agreement" IS '设备接入协议';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."sip_extend" IS 'sip扩展信息 serverId服务器id  serverRegion服务器域 password';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."creator" IS '创建人';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."create_time" IS '创建时间';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."updater" IS '更新人';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."update_time" IS '更新时间';
+COMMENT
+ON COLUMN "public"."tk_device_access_information"."tenant_id" IS '租户id';
+COMMENT
+ON TABLE "public"."tk_device_access_information" IS '设备接入信息表';
+
+-- ----------------------------
+-- Primary Key structure for table tk_device_access_information
+-- ----------------------------
+ALTER TABLE "public"."tk_device_access_information"
+    ADD CONSTRAINT "tk_device_access_information_pkey" PRIMARY KEY ("id");
+
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('638bdb47-81bd-4982-bcf7-54ef6239f697', '73d5d8b1-0ac8-475e-97f7-709dd4125ccd', '个人中心', 'system:personal_center:view', NULL, 1, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-01-24 11:43:40.971602', NULL, NULL);
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('b963cf7c-bed8-4719-86a0-82d1530c2f1b', '6d53709b-d5b6-4b5e-b9e1-0a55e6c8f9f5', '设备接入信息编辑', 'api:yt:device_profile:access_information:update', NULL, 16, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-02-22 18:51:34.10582', NULL, NULL);
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('9129d75f-d9e7-4351-bf1c-1664c292c8d9', '6d53709b-d5b6-4b5e-b9e1-0a55e6c8f9f5', '设备接入信息删除', 'api:yt:device_profile:access_information:delete', NULL, 15, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-02-21 14:52:52.907144', NULL, NULL);
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('b17b1559-8f42-44d5-92d4-122e9f70cb50', 'c5183b83-eb2a-4111-959b-5c7c7e668d94', '设备接入信息', 'deviceManager:deviceAccess:list', NULL, 1, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-02-19 10:29:24.048745', '80808080-8080-8080-8080-808080808080', '2024-02-19 10:29:39.684479');
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('c8f7c6d5-4cd2-4c82-87cf-c6d2facecf77', '6d53709b-d5b6-4b5e-b9e1-0a55e6c8f9f5', '设备接入信息新增', 'api:yt:device_profile:access_information:post', NULL, 14, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-02-21 14:52:12.462541', '80808080-8080-8080-8080-808080808080', '2024-02-21 14:53:15.150577');
+
+INSERT INTO "public"."sys_dict_item"("id", "dict_id", "item_text", "item_value", "description", "sort", "status", "tenant_id", "creator", "create_time", "updater", "update_time") VALUES ('f8c06892-f637-4c31-aac4-f935728cf625', 'c5183b83-eb2a-4111-959b-5c7c7e668d94', '个人中心', 'system:personal_center:view', NULL, 1, 1, '13814000-1dd2-11b2-8080-808080808080', '80808080-8080-8080-8080-808080808080', '2024-01-24 11:41:18.521978', NULL, NULL);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('00fccddb-cbdc-4abd-9a1f-1c4f049e6ba2', '38b9a21a-aaf5-42fc-a85f-4381bca3303c', NULL, 'SYSADMIN', 'api:yt:device_profile:access_information:delete', '80808080-8080-8080-8080-808080808080', '2024-02-19 16:44:56.138043', '80808080-8080-8080-8080-808080808080', '2024-02-21 11:28:44.753107', '删除', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"删除","menuType":"2","status":"0"}', 4);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('38b9a21a-aaf5-42fc-a85f-4381bca3303c', '885ef223-94b1-4b39-89a8-94584183c0be', '/device/deviceaccess', 'SYSADMIN', 'deviceManager:deviceAccess:list', '80808080-8080-8080-8080-808080808080', '2024-02-19 10:24:45.968051', '80808080-8080-8080-8080-808080808080', '2024-02-20 15:42:57.492133', '设备接入信息', '13814000-1dd2-11b2-8080-808080808080', '/device/deviceaccess/index', NULL, NULL, NULL, '{"icon":"ant-design:branches-outlined","title":"设备接入信息","isLink":false,"menuType":"1","ignoreKeepAlive":false,"hideMenu":false,"status":"0"}', 5);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('44f65518-2d9e-4fd5-aa3f-8baf816d912f', '38b9a21a-aaf5-42fc-a85f-4381bca3303c', NULL, 'SYSADMIN', 'api:yt:device_profile:access_information:get', '80808080-8080-8080-8080-808080808080', '2024-02-19 16:43:38.877863', '80808080-8080-8080-8080-808080808080', '2024-02-21 11:28:31.362367', '详情', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"详情","menuType":"2","status":"0"}', 3);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('68da3a6d-75e8-49f7-a27f-a4ff6bf822db', '815b9cb0-dbdd-4e57-a1c5-2820741d8e5f', NULL, 'SYSADMIN', 'api:yt:video:control:play', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:51:53.607779', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:52:07.960339', '视频点播', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"视频点播","menuType":"2","status":"0"}', 12);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('68da3a6d-75e8-49f7-a27f-a4ff6bf832db', '815b9cb0-dbdd-4e57-a1c5-2820741d8e5f', NULL, 'SYSADMIN', 'api:yt:video:control:channel', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:51:53.607779', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:52:07.960339', '视频通道同步', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"视频通道同步","menuType":"2","status":"0"}', 12);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('68da3a6d-75e8-49f7-a27f-a4ff6bf833db', '815b9cb0-dbdd-4e57-a1c5-2820741d8e5f', NULL, 'SYSADMIN', 'api:yt:video:control:control', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:51:53.607779', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:52:07.960339', '摄像头控制', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"摄像头控制","menuType":"2","status":"0"}', 12);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('966b3dbb-37c7-4cf0-95d1-7d66511f0a3a', '815b9cb0-dbdd-4e57-a1c5-2820741d8e5f', NULL, 'SYSADMIN', 'api:yt:video:control:stop', '80808080-8080-8080-8080-808080808080', '2024-02-21 17:52:44.156915', NULL, NULL, '视频停止点播', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"视频停止点播","menuType":"2","status":"0"}', 13);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('b47acbb6-ef7f-4c8a-9ab7-17098b5f3b63', '38b9a21a-aaf5-42fc-a85f-4381bca3303c', NULL, 'SYSADMIN', 'api:yt:device_profile:access_information:post', '80808080-8080-8080-8080-808080808080', '2024-02-19 16:42:38.723093', '80808080-8080-8080-8080-808080808080', '2024-02-21 11:27:57.643463', '新增', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"新增","menuType":"2","status":"0"}', 1);
+
+INSERT INTO "public"."sys_menu"("id", "parent_id", "path", "type", "permission", "creator", "create_time", "updater", "update_time", "name", "tenant_id", "component", "redirect", "alias", "case_sensitive", "meta", "sort") VALUES ('dac55d7f-4359-4a4f-99f5-4cb728c1efee', '38b9a21a-aaf5-42fc-a85f-4381bca3303c', NULL, 'SYSADMIN', 'api:yt:device_profile:access_information:update', '80808080-8080-8080-8080-808080808080', '2024-02-21 15:34:25.935524', NULL, NULL, '编辑', '13814000-1dd2-11b2-8080-808080808080', NULL, NULL, NULL, NULL, '{"title":"编辑","menuType":"2","status":"0"}', 2);
+
+UPDATE "public"."tk_data_view_interface" SET "interface_name" = '设备历史轨迹（适合设备历史轨迹地图）', "request_content_type" = 0, "request_origin_url" = 'localhost', "request_http_type" = 'GET', "request_url" = '/api/plugins/telemetry/{entityType}/{entityId}/values/timeseries{?agg,endTs,interval,keys,limit,orderBy,startTs,endTs,useStrictDataTypes}', "request_params" = '{"requestSQLContent":{},"Params":[{"key":"scope","value":"entityType","mores":null,"editDisabled":false,"required":true},{"key":"date_range","value":"startTs,endTs","mores":true,"editDisabled":true,"required":false},{"key":"deviceProfileId,organizationId,entityId,keys","value":"","mores":null,"editDisabled":true,"required":false}],"Header":[{"key":"ContentType","value":"none","required":false}]}', "state" = 1, "creator" = '80808080-8080-8080-8080-808080808080', "create_time" = '2023-12-26 14:36:44.891373', "updater" = '80808080-8080-8080-8080-808080808080', "update_time" = '2024-01-03 14:48:27.96855', "tenant_id" = '13814000-1dd2-11b2-8080-808080808080', "remark" = NULL, "interface_type" = 'SYSTEM', "filter" = 'const longKey = ''longitude''
+const latKey = ''latitude''
+const allKeys = Object.keys(res)
+
+let list = []
+
+//不是结构体
+if (allKeys.includes(longKey)) {
+  res[longKey].forEach((longItem, longIndex) => {
+    list.push([
+      Number(longItem.value),
+      Number(res[latKey][longIndex].value),
+    ])
+  })
+} else {
+  //为结构体
+  const values = Object.values(res)
+  list = values[0].reduce((acc, curr)=> {
+    const serializeValue = JSON.parse(curr.value)
+    const {
+      longitude, latitude
+    } = serializeValue
+    acc.push([longitude, latitude])
+    return acc
+  }, [])
+}
+return list.reverse()' WHERE "id" = 'f65d5637-3e60-48d7-b3cc-6791fb3883fd';
+
+INSERT INTO "public"."tk_device_access_information"("id", "intranet_ip", "intranet_port", "outer_net_ip", "outer_net_port", "device_agreement", "sip_extend", "creator", "create_time", "updater", "update_time", "tenant_id") VALUES ('ff1edbc3-0cfd-4263-ae50-cf9f11f9a88d', '127.0.0.1', '5060', '127.0.0.1', '5060', 'GBT28181', '{"serverId":"51010700599000000001","serverDomain":"5101070059","serverPassword":"61332286"}', '80808080-8080-8080-8080-808080808080                            ', '2024-02-29 15:29:54', NULL, NULL, '13814000-1dd2-11b2-8080-808080808080');
\ No newline at end of file

@@ -74,7 +74,7 @@ public class ThingsboardSecurityConfiguration extends WebSecurityConfigurerAdapt
 
     //Thingskit function
     public static final String CODE_BASED_LOGIN_ENTRY_POINT = "/api/yt/auth/code/login";
-    public static final String[] YT_NOT_AUTH_API = new String[]{"/api/yt/auth/code/login","/api/yt/third/bind","/api/yt/third/login/*","/api/yt/third/login/id/*", "/api/yt/third/authorize","/api/yt/platform/get","/api/yt/app_design/get", "/api/yt/noauth/**"};
+    public static final String[] YT_NOT_AUTH_API = new String[]{"/api/yt/auth/code/login","/api/yt/third/bind","/api/yt/third/login/*","/api/yt/third/login/id/*", "/api/yt/third/authorize","/api/yt/platform/get","/api/yt/app_design/get", "/api/yt/noauth/**","/api/index/hook/**"};
 
     public static final String PUBLIC_LOGIN_ENTRY_POINT = "/api/auth/login/public";
     public static final String TOKEN_REFRESH_ENTRY_POINT = "/api/auth/token";

@@ -82,7 +82,7 @@ public class ThingsKitExceptionHandler {
       SecurityUser currentUser = getCurrentUser();
 
       Asset entity = new Asset();
-      entity.setName(e.getMessage());
+      entity.setName(e.getClass().getName());
 
       // 请求相关信息
       SysLogOperateDTO additionalInfo = new SysLogOperateDTO();

 package org.thingsboard.server.controller.yunteng;
 
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,91 +29,87 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
-
 @RequestMapping("api/yt/homepage")
 @Api(tags = {"首页"})
 @RequiredArgsConstructor
 @RestController
 public class HomePageController extends BaseController {
 
-    private final HomePageService homePageService;
+  private final HomePageService homePageService;
 
-    @GetMapping("left/top")
-    @ApiOperation(value = "获取左侧顶部信息")
-    public HomePageLeftTopDTO getLeftTopInfo()
-            throws ThingsboardException, ExecutionException, InterruptedException {
-        return homePageService.getHomePageLeftTopInfo(
-                getCurrentUser().isPtSysadmin(),
-                getCurrentUser().isPtAdmin(),
-                getCurrentUser().isPtTenantAdmin(),
-                getCurrentUser().getCurrentTenantId(),
-                getCurrentUser().getCurrentUserId());
-    }
+  @GetMapping("left/top")
+  @ApiOperation(value = "获取左侧顶部信息")
+  public HomePageLeftTopDTO getLeftTopInfo()
+      throws ThingsboardException, ExecutionException, InterruptedException {
+    return homePageService.getHomePageLeftTopInfo(
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtAdmin(),
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId());
+  }
 
-    @GetMapping("right/overdue")
-    @ApiOperation(value = "获取右侧过期租户信息")
-    @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
-    public ResponseEntity<TkPageData<TenantDTO>> getRightTopInfo(
-            @RequestParam(PAGE) int page, @RequestParam(PAGE_SIZE) int pageSize) {
-        HashMap<String, Object> queryMap = new HashMap<>();
-        queryMap.put(PAGE_SIZE, pageSize);
-        queryMap.put(PAGE, page);
-        return ResponseEntity.ok(homePageService.getHomePageRightInfo(queryMap));
-    }
+  @GetMapping("right/overdue")
+  @ApiOperation(value = "获取右侧过期租户信息")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
+  public ResponseEntity<TkPageData<TenantDTO>> getRightTopInfo(
+      @RequestParam(PAGE) int page, @RequestParam(PAGE_SIZE) int pageSize) {
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    return ResponseEntity.ok(homePageService.getHomePageRightInfo(queryMap));
+  }
 
-    @GetMapping("right/top10")
-    @ApiOperation(value = "获取右侧Top10")
-    @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
-    public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
-        return homePageService.getTop10();
-    }
+  @GetMapping("right/top10")
+  @ApiOperation(value = "获取右侧Top10")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
+  public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
+    return homePageService.getTop10();
+  }
 
-    @GetMapping("left/bottom")
-    @ApiOperation(value = "获取左侧底部信息")
-    @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER'},{})")
-    public DeferredResult<List<TkTsValue>> getLeftBottomInfo(
-            @RequestParam(value = "startTs") long startTs,
-            @RequestParam("endTs") long endTs,
-            @RequestParam("interval") long interval,
-            @RequestParam("trend") TrendType trend)
-            throws ThingsboardException {
-        String customerId;
-        if (getCurrentUser().isPtAdmin()) {
-            customerId = getCurrentUser().getCurrentTenantId();
-        } else {
-            customerId = getCurrentUser().getCustomerId().getId().toString();
-        }
-        boolean isCustomer = getCurrentUser().isCustomerUser();
-        if (TrendType.CUSTOMER_MESSAGE_STATISTICAL == trend
-                || TrendType.CUSTOMER_ALARM_STATISTICAL == trend) {
-            if (!isCustomer) {
-                throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-            }
-        }
-        if (TrendType.TENANT_TREND == trend || TrendType.CUSTOMER_TREND == trend) {
-            if (isCustomer) {
-                throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-            }
-        }
-        return homePageService.getHomePageLeftBottomInfo(
-                customerId, startTs, endTs, interval, trend, isCustomer);
+  @GetMapping("left/bottom")
+  @ApiOperation(value = "获取左侧底部历史数据")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER'},{})")
+  public DeferredResult<List<TkTsValue>> getLeftBottomInfo(
+      @RequestParam(value = "startTs") long startTs,
+      @RequestParam("endTs") long endTs,
+      @RequestParam("interval") long interval,
+      @RequestParam("trend") TrendType trend)
+      throws ThingsboardException {
+    SecurityUser currentUser = getCurrentUser();
+    boolean isCustomer = currentUser.isCustomerUser();
+    if (TrendType.CUSTOMER_MESSAGE_STATISTICAL == trend
+        || TrendType.CUSTOMER_ALARM_STATISTICAL == trend) {
+      if (!isCustomer) {
+        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+    }
+    if (TrendType.TENANT_TREND == trend || TrendType.CUSTOMER_TREND == trend) {
+      if (isCustomer) {
+        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
     }
+    return homePageService.getHomePageLeftBottomInfo(
+        currentUser.getTenantId(), currentUser.getCustomerId(), startTs, endTs, interval, trend);
+  }
 
-    @GetMapping("app")
-    @ApiOperation(value = "小程序首页统计信息")
-    public ResponseEntity<HomePageAppDTO> appStatistics(@ApiParam(value = "只取告警数据") @RequestParam("login") Boolean login)
-            throws ThingsboardException{
-        SecurityUser user = getCurrentUser();
-        if(user == null){
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-        }
-        HomePageAppDTO app = homePageService.app(login,user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
-        return ResponseEntity.ok(app);
+  @GetMapping("app")
+  @ApiOperation(value = "小程序首页统计信息")
+  public ResponseEntity<HomePageAppDTO> appStatistics(
+      @ApiParam(value = "只取告警数据") @RequestParam("login") Boolean login)
+      throws ThingsboardException {
+    SecurityUser user = getCurrentUser();
+    if (user == null) {
+      return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
     }
+    HomePageAppDTO app =
+        homePageService.app(
+            login,
+            user.isPtSysadmin(),
+            user.isPtAdmin(),
+            user.isPtTenantAdmin(),
+            user.getTenantId(),
+            user.getCustomerId());
+    return ResponseEntity.ok(app);
+  }
 }

@@ -22,19 +22,18 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.thingsmodel.ImportThingsModelDTO;
-import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.ImportEnum;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
+import org.thingsboard.server.utils.ImportModbusUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,6 +41,7 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -234,16 +234,221 @@ public class ThingsModelController extends BaseController {
     return thingsModelService.saveOrUpdate(thingsModelDTO);
   }
 
+  @GetMapping("/download/template")
+  @ApiOperation("excel模板下载")
+  public ResponseEntity<Resource> downloadTemplate(String type) throws IOException {
+    String name = "template"+ File.separator;
+    if(StringUtils.isNotEmpty(type)&&type.equals("modbus")){
+      name = name +"modbusTemplates.xls";
+    }else{
+      name = name+"template.xls";
+    }
+    InputStream inputStream =  this.getClass().getClassLoader().getResourceAsStream(name);
+    if(inputStream!=null){
+      HttpHeaders headers = new HttpHeaders();
+      headers.add(HttpHeaders.CONTENT_DISPOSITION,"attachment;filename=物模型属性导入模板.xls");
+      return  ResponseEntity.ok()
+              .headers(headers)
+              .contentType(MediaType.APPLICATION_OCTET_STREAM)
+              .body(new InputStreamResource(inputStream));
+    }else {
+      return null;
+    }
+  }
+
+
+  @PostMapping("/batch/get_tsl")
+  @ApiOperation("获取多个产品的物模型数据")
+  public ResponseEntity<List<BatchDeviceProfileInfoDTO>> getDeviceProfilesTSL(@RequestBody DeviceProfileTSLDTO profileTSLDTO)
+          throws ThingsboardException {
+    if(null == profileTSLDTO.getDeviceProfileIds() || null == profileTSLDTO.getFunctionTypeEnum() ||
+    profileTSLDTO.getDeviceProfileIds().isEmpty()){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(thingsModelService.getDeviceProfileTSLInfoByIds(getCurrentUser().getCurrentTenantId(),
+            profileTSLDTO.getDeviceProfileIds(),profileTSLDTO.getFunctionTypeEnum()));
+  }
+
   @ApiOperation(value = "通过excel导入物模型")
   @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:things_model:excel_import'})")
   @PostMapping("/csvImport")
-  public ResponseResult<String> csvImport(String deviceProfileId, String categoryId,
+  public ResponseResult<String> csvImport(String deviceProfileId, String categoryId,String type,
                                           @RequestPart("file") MultipartFile file) throws Exception {
     if(file.isEmpty()){
-      return null;
+     throw new ThingsKitException(ErrorMessage.INVALID_PARAMETER);
     }
+    try{
     Workbook work = WorkbookFactory.create(file.getInputStream());
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    if(type.equals("modbus")){
+      return  importModbus(deviceProfileId,categoryId,file,tenantId,work);
+    }else{
+      return  importModel(deviceProfileId,categoryId,file,tenantId,work);
+    }
+    }catch (Exception e){
+      throw new TkDataValidationException(ErrorMessage.IMPORT_ERROR.getMessage());
+    }
+  }
+
+
+  ResponseResult<String> importModbus(String deviceProfileId, String categoryId,MultipartFile file,String tenantId, Workbook work) throws IOException {
+
+     Sheet sheet = work.getSheetAt(0);
+     int succeed = 0;//成功数量
+     int failed =0;//失败数量
+     StringBuffer failedString = new StringBuffer();
+     String excel =  sheet.getRow(0).getCell(2).toString();
+     if(!excel.equals("MODBUS_RTU操作类型*")){
+       throw new TkDataValidationException(ErrorMessage.IMPORT_ERROR.getMessage());
+     }
+     for(int i = 1; i<=sheet.getPhysicalNumberOfRows(); i++) {
+       Row row = sheet.getRow(i);
+       if(row!=null){
+         String functionName = row.getCell(0).toString();//功能名称
+         if(StringUtils.isEmpty(functionName)){
+           failed++;
+           failedString.append("第"+i+"条，功能名称未填；");
+           continue;
+         }
+         String identifier = row.getCell(1).toString();//标识符*
+         if(StringUtils.isEmpty(identifier)){
+           failed++;
+           failedString.append("第"+i+"条，标识符未填；");
+           continue;
+         }
+         Boolean identifierState = thingsModelService.getByIdentifier(tenantId,deviceProfileId,categoryId,identifier);
+         if(!identifierState){
+           failed++;
+           failedString.append("第"+i+"条，标识符已存在；");
+           continue;
+         }
+         ThingsModelDTO dto = new ThingsModelDTO();
+
+         String extensionJson ="";
+         String json ="";
+
+         if(identifier.equals("source")){
+           dto.setAccessMode("r");
+           extensionJson ="{\"writeOnly\":true}";
+           json ="{\"dataType\":{\"type\":\"STRING\",\"specs\":{}}}";
+         }else{
+           String operationType = row.getCell(2).toString();//MODBUS_RTU操作类型*
+           if(StringUtils.isEmpty(operationType)){
+             failed++;
+             failedString.append("第"+i+"条，MODBUS_RTU操作类型未填；");
+             continue;
+           }
+           String originalDataType = row.getCell(3).toString();//MODBUS_RTU数据类型*
+           if(StringUtils.isEmpty(originalDataType)){
+             failed++;
+             failedString.append("第"+i+"条，MODBUS_RTU数据类型未填；");
+             continue;
+           }
+           operationType =OperationTypeEnum.getName(operationType);
+           originalDataType = AttributeSourceDataTypeEnum.getName(originalDataType);
+           if(!ImportModbusUtils.operationTypeAndOriginalDataTypeStatus(operationType, originalDataType)){
+             failed++;
+             failedString.append("第"+i+"条，操作类型与数据类型不匹配；");
+             continue;
+           }
+
+
+           String registerType = row.getCell(5).toString();//寄存器类型
+           String registerAddress =row.getCell(6).toString();//寄存器地址
+           if(StringUtils.isEmpty(registerType)){
+             failed++;
+             failedString.append("第"+i+"条，寄存器类型未填；");
+             continue;
+           }
+           //转换校验输入的字符
+           if(registerType.equals("HEX")){
+             String hexPattern="^[0-9A-Fa-f]+$";
+             if(!Pattern.matches(hexPattern,registerAddress)){
+               failedString.append("第"+i+"条，寄存器地址格式不正确；");
+               continue;
+             }
+           }
+           if(registerType.equals("DEC")){
+             try{
+               registerAddress = Integer.toHexString(Integer.parseInt(registerAddress));
+             } catch (NumberFormatException e) {
+               failedString.append("第"+i+"条，寄存器地址格式不正确；");
+               continue;
+             }
+           }
+
+           String bitMask = row.getCell(7)==null?null:row.getCell(7).toString();//比特位*
+           if(originalDataType.equals("位")&&StringUtils.isEmpty(bitMask)){
+             failed++;
+             failedString.append("第"+i+"条，比特位置(数据类型为位时必填)；");
+             continue;
+           }
+           if(StringUtils.isEmpty(bitMask)){
+             bitMask="7";
+           }
+
+           String scaling = row.getCell(8)==null?"1":row.getCell(8).toString();//缩放因子
+           String registerCount = row.getCell(9)==null?"":row.getCell(9).toString();//寄存器个数
+
+           if(originalDataType.equals("字符串")&&StringUtils.isEmpty(registerCount)){
+             failed++;
+             failedString.append("第"+i+"条，寄存器个数(数据类型为字符串时必填)；");
+             continue;
+           }
+
+
+           String unit ="";
+           String valueRange ="";
+           String dataType = ImportModbusUtils.getOriginalDataTypeIsDateType(originalDataType);
+           String cell4 = row.getCell(4)==null?null:row.getCell(4).toString();//单位
+           if(cell4!=null){
+             String[] dws = cell4.split("/");
+             unit = "\"unit\":\""+dws[1]+"\",\"unitName\":\""+cell4+"\"";
+           }
+           if(unit.equals("")){
+             valueRange = ImportModbusUtils.getOriginalDataTypeIsValueRange(originalDataType);
+           }else{
+             valueRange = ","+ImportModbusUtils.getOriginalDataTypeIsValueRange(originalDataType);
+           }
+           json ="{\"dataType\":{\"type\":\""+dataType+"\",\"specs\":{"+unit+valueRange+"}}}";
+           extensionJson =
+                   "{\"writeOnly\":"+ImportModbusUtils.getOperationTypeIsWriteOnly(operationType)+
+                           ",\"bitMask\":"+bitMask+",\"operationType\":\""+operationType+"\",\"originalDataType\":\""+originalDataType+
+                           "\",\"registerAddress\":\""+registerAddress+"\",\"scaling\":"+scaling+"}";
+           if(!registerCount.equals("")){
+             extensionJson = extensionJson+",\"registerCount\":"+registerCount;
+           }
+           dto.setAccessMode(ImportModbusUtils.getOperationTypeIsRw(operationType));
+         }
+
+         dto.setDeviceProfileId(deviceProfileId);
+         dto.setCategoryId(categoryId);
+         dto.setFunctionType(FunctionTypeEnum.properties);
+         dto.setFunctionName(functionName);
+         dto.setIdentifier(identifier);
+         JsonNode functionJson = JacksonUtil.toJsonNode(json);
+         JsonNode extensionDesc = JacksonUtil.toJsonNode(extensionJson);
+         dto.setFunctionJson(functionJson);
+         dto.setExtensionDesc(extensionDesc);
+         dto.setRemark(row.getCell(10)==null?null:row.getCell(10).toString());
+         dto.setTenantId(tenantId);
+         if(dto.getCategoryId()!=null){
+           thingsModelService.categorySaveOrUpdate(dto);
+         }else{
+           thingsModelService.saveOrUpdate(dto);
+         }
+         succeed++;
+       }
+     }
+     return ResponseResult.success("操作成功，导入"+succeed+"条;失败"+failed+"条;失败原因："+failedString);
+   }
+
+  ResponseResult<String> importModel(String deviceProfileId, String categoryId,MultipartFile file,String tenantId, Workbook work) throws IOException {
     Sheet sheet = work.getSheetAt(0);
+    String excel =  sheet.getRow(0).getCell(2).toString();
+    if(!excel.equals("数据类型*")){
+      return ResponseResult.failed(500,"操作失败,请使用下载模板excel重新导入");
+    }
     int succeed = 0;//成功数量
     int failed =0;//失败数量
     StringBuffer failedString = new StringBuffer();
@@ -253,41 +458,39 @@ public class ThingsModelController extends BaseController {
         String functionName = row.getCell(0).toString();//功能名称
         if(StringUtils.isEmpty(functionName)){
           failed++;
-          failedString.append("第"+i+"条，功能名称未填\r\n");
+          failedString.append("第"+i+"条，功能名称未填；");
           continue;
         }
         String identifier = row.getCell(1).toString();//标识符*
         if(StringUtils.isEmpty(identifier)){
           failed++;
-          failedString.append("第"+i+"条，标识符未填\r\n");
+          failedString.append("第"+i+"条，标识符未填；");
           continue;
         }
         String dataType = row.getCell(2).toString();//数据类型*
         if(StringUtils.isEmpty(dataType)){
           failed++;
-          failedString.append("第"+i+"条，数据类型未填\r\n");
+          failedString.append("第"+i+"条，数据类型未填；");
           continue;
         }
         String accessMode = row.getCell(7).toString();//读写类型*
         if(StringUtils.isEmpty(accessMode)){
           failed++;
-          failedString.append("第"+i+"条，读写类型未填\r\n");
+          failedString.append("第"+i+"条，读写类型未填；");
           continue;
         }
         Cell dataJons = row.getCell(9);//Josn对象
         if(dataType.equals("struct(结构体)")){
           if(StringUtils.isEmpty(dataJons.toString())){
             failed++;
-            failedString.append("第"+i+"条，如果数据类型选为结构体则必填Json对象，请填入\r\n");
+            failedString.append("第"+i+"条，如果数据类型选为结构体则必填Json对象，请填入；");
             continue;
           }
         }
-
-        String tenantId = getCurrentUser().getCurrentTenantId();
         Boolean identifierState = thingsModelService.getByIdentifier(tenantId,deviceProfileId,categoryId,identifier);
         if(!identifierState){
           failed++;
-          failedString.append("第"+i+"条，标识符已存在\r\n");
+          failedString.append("第"+i+"条，标识符已存在；");
           continue;
         }
         ThingsModelDTO dto = new ThingsModelDTO();
@@ -349,32 +552,4 @@ public class ThingsModelController extends BaseController {
     }
     return ResponseResult.success("操作成功，导入"+succeed+"条;失败"+failed+"条;失败原因："+failedString.toString());
   }
-
-  @GetMapping("/downloadTemplate")
-  @ApiOperation("excel模板下载")
-  public ResponseEntity<Resource> downloadTemplate() throws IOException {
-    InputStream inputStream =  this.getClass().getClassLoader().getResourceAsStream("template"+ File.separator +"template.xls");
-    if(inputStream!=null){
-      HttpHeaders headers = new HttpHeaders();
-      headers.add(HttpHeaders.CONTENT_DISPOSITION,"attachment;filename=物模型属性导入模板.xls");
-      return  ResponseEntity.ok()
-              .headers(headers)
-              .contentType(MediaType.APPLICATION_OCTET_STREAM)
-              .body(new InputStreamResource(inputStream));
-    }else {
-      return null;
-    }
-  }
-
-  @PostMapping("/batch/get_tsl")
-  @ApiOperation("获取多个产品的物模型数据")
-  public ResponseEntity<List<BatchDeviceProfileInfoDTO>> getDeviceProfilesTSL(@RequestBody DeviceProfileTSLDTO profileTSLDTO)
-          throws ThingsboardException {
-    if(null == profileTSLDTO.getDeviceProfileIds() || null == profileTSLDTO.getFunctionTypeEnum() ||
-    profileTSLDTO.getDeviceProfileIds().isEmpty()){
-      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
-    return ResponseEntity.ok(thingsModelService.getDeviceProfileTSLInfoByIds(getCurrentUser().getCurrentTenantId(),
-            profileTSLDTO.getDeviceProfileIds(),profileTSLDTO.getFunctionTypeEnum()));
-  }
 }

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -65,7 +64,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @PostMapping
   @ApiOperation("新增")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<TkDataViewInterfaceDTO> save(
       @Validated({AddGroup.class}) @RequestBody TkDataViewInterfaceDTO tkDataViewInterfaceDTO)
       throws ThingsboardException {
@@ -77,7 +75,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @PutMapping
   @ApiOperation("修改")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<TkDataViewInterfaceDTO> update(
       @Validated({UpdateGroup.class}) @RequestBody TkDataViewInterfaceDTO TkDataViewInterfaceDTO)
       throws ThingsboardException {
@@ -88,7 +85,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @DeleteMapping
   @ApiOperation("删除")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> delete(
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
@@ -98,7 +94,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/publish/{id}")
   @ApiOperation("发布")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> publishInterface(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.ok(
@@ -107,7 +102,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/cancel_publish/{id}")
   @ApiOperation("取消发布")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> cancelPublishInterface(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.ok(
@@ -116,7 +110,6 @@ public class TkDataViewInterfaceController extends BaseController {
   }
 
   @ApiOperation("根据接口ID，获得接口详情")
-  @PreAuthorize("@check.checkPermissions({},{})")
   @RequestMapping(
       value = "/get_interface_details",
       params = {"ids"},
@@ -130,7 +123,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/filter_by_interface_type/{type}")
   @ApiOperation("根据接口类型过滤数据")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> filterByInterfaceType(@PathVariable("type") String type)
       throws ThingsboardException {
     return tkDataViewInterfaceService.filterByInterfaceType(
@@ -139,7 +131,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/find_all_interface/{state}")
   @ApiOperation("查询所有接口")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> findAll(@PathVariable("state") String state)
       throws ThingsboardException {
     return tkDataViewInterfaceService.findAll(state, getCurrentUser().getCurrentTenantId());
@@ -147,7 +138,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/find/can_use_interfaces")
   @ApiOperation("查询当前用户可使用的接口")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> findCanUseInterfaces() throws ThingsboardException {
     boolean isSysAdminOrPtAdmin = getCurrentUser().isPtAdmin() || getCurrentUser().isSystemAdmin();
     return tkDataViewInterfaceService.findCanUseInterfaces(

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccessInformationDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/device_profile/access_information")
+@Api(tags = {"设备接入信息管理"})
+public class TkDeviceAccessInformationController extends BaseController {
+
+  private final TkDeviceAccessInformationService service;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public TkPageData<TkDeviceAccessInformationDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "intranetIp", required = false) String intranetIp,
+      @RequestParam(value = "intranetPort", required = false) String intranetPort,
+      @RequestParam(value = "outerNetIp", required = false) String outerNetIp,
+      @RequestParam(value = "outerNetPort", required = false) String outerNetPort,
+      @RequestParam(value = "deviceAgreement", required = false) String deviceAgreement,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy) {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("intranetIp", intranetIp);
+    queryMap.put("intranetPort", intranetPort);
+    queryMap.put("outerNetIp", outerNetIp);
+    queryMap.put("outerNetPort", outerNetPort);
+    queryMap.put("deviceAgreement", deviceAgreement);
+
+    return service.page(queryMap);
+  }
+
+  @PostMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:post'})")
+  public ResponseResult<TkDeviceAccessInformationDTO> saveAccessInfo(
+      @Validated({AddGroup.class}) @RequestBody TkDeviceAccessInformationDTO dto)
+      throws ThingsboardException {
+    if (!StringUtils.isEmpty(dto.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return saveOrUpdate(dto);
+  }
+
+  @PutMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:update'})")
+  public ResponseResult<TkDeviceAccessInformationDTO> updateAccessInfo(
+      @Validated({UpdateGroup.class}) @RequestBody TkDeviceAccessInformationDTO dto)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(dto.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return saveOrUpdate(dto);
+  }
+
+  @DeleteMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:delete'})")
+  public ResponseResult<String> deleteSysDict(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return service.delete(deleteDTO)
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  private ResponseResult<TkDeviceAccessInformationDTO> saveOrUpdate(
+      TkDeviceAccessInformationDTO dto) throws ThingsboardException {
+    dto.setTenantId(getCurrentUser().getCurrentTenantId());
+    TkDeviceAccessInformationDTO newDTO = service.saveOrUpdate(dto);
+    return ResponseResult.success(newDTO);
+  }
+}

@@ -33,10 +33,7 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
-import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
@@ -225,7 +222,7 @@ public class TkDeviceController extends BaseController {
 
   @GetMapping("{id}")
   @ApiOperation("详情")
-  @PreAuthorize("@check.checkPermissions({},{'api:yt:device:get'})")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:device:get'})")
   public ResponseEntity<DeviceDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.of(tkdeviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
@@ -239,7 +236,7 @@ public class TkDeviceController extends BaseController {
     return ResponseEntity.of(tkdeviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
   }
 
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
   @PostMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("查询")
   public TkPageData<DeviceDTO> pageDevice(
@@ -265,7 +262,7 @@ public class TkDeviceController extends BaseController {
     return tkdeviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
 
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
   @GetMapping(
       path = {"/relation"},
       params = {PAGE_SIZE, PAGE})
@@ -383,14 +380,16 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
           String deviceLabel,
       @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
-          String deviceProfileId)
+          String deviceProfileId,
+      @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false)
+      TransportTypeEnum transportType)
       throws ThingsboardException {
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType,
         getCurrentUser().getCurrentTenantId(),
         organizationId,
         deviceLabel,
-        deviceProfileId);
+        deviceProfileId,transportType);
   }
 
 
@@ -539,6 +538,12 @@ public class TkDeviceController extends BaseController {
     tbDevice.setName(deviceDTO.getName());
     tbDevice.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     tbDevice.setTenantId(tenantId);
+    tbDevice.setFirmwareId(
+        StringUtils.isEmpty(deviceDTO.getFirmwareId()) ? null :
+                new OtaPackageId(UUID.fromString(deviceDTO.getFirmwareId())));
+    tbDevice.setSoftwareId(
+        StringUtils.isEmpty(deviceDTO.getSoftwareId()) ? null :
+                new OtaPackageId(UUID.fromString(deviceDTO.getSoftwareId())));
     return tbDevice;
   }
 

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -119,16 +120,16 @@ public class TkDeviceProfileController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   public ResponseEntity listDeviceProfile(
           @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
-          DeviceTypeEnum deviceType)
+          DeviceTypeEnum deviceType,DeviceTransportType transportType)
           throws ThingsboardException {
     List<DeviceProfileDTO> results;
     String tenantId = getCurrentUser().getCurrentTenantId();
     if (getCurrentUser().isTenantAdmin()) {
-      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
+      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType,transportType);
     } else {
       results =
               tkDeviceProfileService.findCustomerDeviceProfiles(
-                      tenantId, getCurrentUser().getCustomerId(),deviceType);
+                      tenantId, getCurrentUser().getCustomerId(),deviceType,transportType);
     }
 
     return ResponseEntity.ok(results);
@@ -257,6 +258,12 @@ public class TkDeviceProfileController extends BaseController {
 
     tbDeviceProfile.setProfileData(
             buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData()));
+    tbDeviceProfile.setFirmwareId(
+            StringUtils.isEmpty(deviceProfileDTO.getFirmwareId()) ? null :
+                    new OtaPackageId(UUID.fromString(deviceProfileDTO.getFirmwareId())));
+    tbDeviceProfile.setSoftwareId(
+            StringUtils.isEmpty(deviceProfileDTO.getSoftwareId()) ? null :
+                    new OtaPackageId(UUID.fromString(deviceProfileDTO.getSoftwareId())));
     return tbDeviceProfile;
   }
 }

@@ -114,7 +114,7 @@ public class TkDeviceScriptController extends BaseController {
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页查询")
-    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     public TkPageData<TkDeviceScriptDTO> pageDeviceScript(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
@@ -209,7 +209,7 @@ public class TkDeviceScriptController extends BaseController {
 
 
 
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @PostMapping("/modbus")
     @ApiOperation("生成Modbus指令")
     public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams)

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+
+import java.util.HashMap;
+import java.util.List;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequestMapping("api/yt/video/channel")
+@Api(tags = {"视频通道"})
+@RequiredArgsConstructor
+public class TkVideoChannelController extends BaseController {
+
+    private final TkVideoChannelService tkVideoChannelService;
+    private final TkDeviceService tkDeviceService;
+    private final DeviceMapper deviceMapper;
+
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public TkPageData<VideoChanelDTO> pageData(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
+      @ApiParam(value = "通道所属设备ID(tbDeviceId)")
+      @RequestParam(value = "tbDeviceId") String tbDeviceId,
+      @ApiParam(value = "视频通道名称")
+      @RequestParam(value = "name", required = false) String name,
+      @ApiParam(value = "设备状态")
+      @RequestParam(value = "status", required = false) StatusEnum status,
+      @ApiParam(value = "国标编号")
+      @RequestParam(value = "cameraCode", required = false) String cameraCode) throws ThingsboardException {
+      HashMap<String, Object> queryMap = new HashMap<>();
+      if(StringUtils.isNotEmpty(name)){
+          queryMap.put("name",name);
+      }
+      if(StringUtils.isNotEmpty(cameraCode)){
+          queryMap.put("cameraCode",cameraCode);
+      }
+      if(status!=null){
+          queryMap.put("status",status);
+      }
+      String tenantId = getCurrentUser().getCurrentTenantId();
+      if(StringUtils.isEmpty(tbDeviceId)){
+          throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      if(getCurrentUser().isCustomerUser()){
+          DeviceDTO deviceDTO = deviceMapper.findDeviceByTbDeviceIdAndCustomerId(
+                  tenantId,tbDeviceId,getCurrentUser().getCustomerId().toString());
+          if(null == deviceDTO){
+              throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_CUSTOMER.getMessage());
+          }
+      }
+      queryMap.put("tbDeviceId",tbDeviceId);
+      queryMap.put(PAGE_SIZE, pageSize);
+      queryMap.put(PAGE, page);
+      queryMap.put(ORDER_FILED, orderBy);
+      if (orderType != null) {
+          queryMap.put(ORDER_TYPE, orderType.name());
+      }
+      return tkVideoChannelService.page(tenantId, queryMap);
+  }
+
+    @GetMapping("/list")
+    @ApiOperation("选项列表")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    public List<VideoChanelDTO> listDeviceProfile(
+            @ApiParam(value = "设备Id") @RequestParam(value = "deviceId", required = false) String deviceId)
+            throws ThingsboardException {
+        String tenantId = getCurrentUser().getCurrentTenantId();
+        return tkVideoChannelService.getListByDeviceId(deviceId,tenantId);
+    }
+}

@@ -11,6 +11,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 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.dto.TkVideoGbtDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ProtocolType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
@@ -30,7 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/video")
 @Api(tags = {"视频流"})
 @RequiredArgsConstructor
-@PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
 public class TkVideoController extends BaseController {
 
   private final TkVideoService videoService;
@@ -68,6 +69,17 @@ public class TkVideoController extends BaseController {
     return videoService.saveOrUpdate(dto);
   }
 
+  @PostMapping("/add/gbt28181")
+  @ApiOperation("新增国标视频")
+  @PreAuthorize(
+          "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:post','api:yt:video:update'})")
+  public TkVideoGbtDTO saveOrUpdateAlarmProfile(@Validated @RequestBody TkVideoGbtDTO dto)
+          throws ThingsboardException {
+    dto.setTenantId(getCurrentUser().getCurrentTenantId());
+    return videoService.saveGbt(dto);
+  }
+
+
   @DeleteMapping
   @ApiOperation("删除")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:delete'})")
@@ -138,8 +150,6 @@ public class TkVideoController extends BaseController {
     }
     String url =
         videoService.getCameraPreviewURL(
-            getCurrentUser().isTenantAdmin(),
-            getCurrentUser().getCurrentUserId(),
             getCurrentUser().getCurrentTenantId(),
             entityId,
             protocolType);

+package org.thingsboard.server.controller.yunteng.media;
+
+import com.google.common.util.concurrent.MoreExecutors;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.curator.shaded.com.google.common.util.concurrent.FutureCallback;
+import org.apache.curator.shaded.com.google.common.util.concurrent.Futures;
+import org.apache.curator.shaded.com.google.common.util.concurrent.ListenableFuture;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.sip.StreamContentDTO;
+import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
+
+@RestController
+@RequestMapping("api/yt/video/control")
+@Api(tags = {"视频控制管理"})
+@RequiredArgsConstructor
+@Slf4j
+public class TkVideoControlController extends BaseController {
+
+  private final TkVideoControlService tkVideoControlService;
+
+  @GetMapping("/start/{deviceId}/{channelId}")
+  @ApiOperation(value = "视频点播/预览")
+//  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:control:play'})")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN','CUSTOMER_USER')")
+  public DeferredResult<ResponseResult<StreamContentDTO>> startPlay(
+          @PathVariable("deviceId") String tbDeviceId, @PathVariable("channelId") String channelId)
+          throws ThingsboardException {
+    if (StringUtils.isEmpty(tbDeviceId) || StringUtils.isEmpty(channelId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    DeferredResult<ResponseResult<StreamContentDTO>> response = new DeferredResult<>();
+    ListenableFuture<StreamContentDTO> future =
+            tkVideoControlService.startPlay(getCurrentUser(),tbDeviceId, channelId);
+    Futures.addCallback(
+            future,
+            new FutureCallback<>() {
+              @Override
+              public void onSuccess(@Nullable StreamContentDTO streamContentDTO) {
+                response.setResult(ResponseResult.success(streamContentDTO));
+              }
+
+              @Override
+              public void onFailure(@NotNull Throwable throwable) {
+                response.setResult(ResponseResult.failed(throwable.getMessage()));
+              }
+            },
+            MoreExecutors.directExecutor());
+    return response;
+  }
+  @GetMapping("/sync/{deviceId}")
+  @ApiOperation(value = "摄像头通道同步")
+  @PreAuthorize(
+          "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:control:channel'})")
+  public DeferredResult<ResponseResult<String>> freshChannel(
+          @PathVariable("deviceId") String tbDeviceId)
+          throws ThingsboardException {
+    if (StringUtils.isEmpty(tbDeviceId) ) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    DeferredResult<ResponseResult<String>> response = new DeferredResult<>();
+    ListenableFuture<String> future =
+            tkVideoControlService.freshChannel(getCurrentUser(),tbDeviceId);
+    Futures.addCallback(
+            future,
+            new FutureCallback<>() {
+              @Override
+              public void onSuccess(@Nullable String result) {
+                response.setResult(ResponseResult.success(result));
+              }
+
+              @Override
+              public void onFailure(@NotNull Throwable throwable) {
+                response.setResult(ResponseResult.failed(throwable.getMessage()));
+              }
+            },
+            MoreExecutors.directExecutor());
+    return response;
+  }
+
+  @ApiOperation(value = "停止点播")
+  @GetMapping("/stop/{deviceId}/{channelId}")
+  @PreAuthorize(
+          "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:control:stop'})")
+  public ResponseResult playStop(
+      @ApiParam(value = "设备ID", required = true) @PathVariable("deviceId") String tbDeviceId,
+      @ApiParam(value = "通道ID", required = true) @PathVariable("channelId") String channelId)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(tbDeviceId) || StringUtils.isEmpty(channelId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(
+        tkVideoControlService.stopPlay(getCurrentUser(),tbDeviceId, channelId));
+  }
+
+  @ApiOperation(value = "云台控制")
+  @Parameter(name = "tbDeviceId", description = "TB设备ID", required = true)
+  @Parameter(name = "channelId", description = "通道国标编号", required = true)
+  @Parameter(
+      name = "command",
+      description =
+          "控制指令,允许值: LEFT, RIGHT, UP, DOWN, UP_LEFT, UPRIGHT, DOWN_LEFT, DOWN_RIGHT, ZOOM_IN, ZOOM_OUT, STOP",
+      required = true)
+  @Parameter(name = "horizonSpeed", description = "水平速度", required = true)
+  @Parameter(name = "verticalSpeed", description = "垂直速度", required = true)
+  @Parameter(name = "zoomSpeed", description = "缩放速度", required = true)
+  @GetMapping("/control/{tbDeviceId}/{channelId}")
+  @PreAuthorize(
+          "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:control:control'})")
+  public void ptzControl(
+      @PathVariable String tbDeviceId,
+      @PathVariable String channelId,
+      PTZCommandEnum command,
+      int horizonSpeed,
+      int verticalSpeed,
+      int zoomSpeed)
+      throws ThingsboardException {
+    ResponseResult.success(
+            tkVideoControlService.control(getCurrentUser(),tbDeviceId, channelId,command,horizonSpeed,verticalSpeed,zoomSpeed));
+  }
+}

+package org.thingsboard.server.controller.yunteng.media;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.*;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService;
+import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
+
+/** ZLMediaServer的hook事件监听 */
+@RestController
+@RequestMapping("api/index/hook")
+@Api(tags = {"ZLMediaServer的hook事件监听"})
+@RequiredArgsConstructor
+@Slf4j
+public class ZLMediaKitHookController extends BaseController {
+  private final TkMediaServerService tkMediaServerService;
+  private final TkVideoChannelService tkVideoChannelService;
+  private final TkVideoControlService controlService;
+
+  @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
+  @ApiOperation(value = "保持流媒体服务器的心跳")
+  public HookResult onServerKeepalive(@RequestBody OnServerKeepaliveHookParam param) {
+    //    log.error("ZLMediaKitHook保持流媒体服务器的心跳【on_server_keepalive】，API参数【{}】",
+    // JacksonUtil.toString(param));
+    return tkMediaServerService.zlmOnServerKeepalive(param);
+  }
+
+  @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
+  @ApiOperation(value = "播放器鉴权事件")
+  public HookResult onPlay(@RequestBody BaseParam param) {
+    return tkMediaServerService.zlmOnPlay(param);
+  }
+
+  @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
+  @ApiOperation(value = "rtsp/rtmp/rtp推流鉴权事件")
+  public HookResultForOnPublish onPublish(@RequestBody BaseParam param) {
+    return tkMediaServerService.onPublish(param);
+  }
+
+  @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
+  @ApiOperation(value = "rtsp/rtmp流注册或注销时触发此事件；此事件对回复不敏感")
+  public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
+    return tkMediaServerService.zlmOnStreamChanged(param);
+  }
+
+  @ResponseBody
+  @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
+  @ApiOperation(value = "流无人观看时事件，用户可以通过此事件选择是否关闭无人看的流")
+  public JsonNode onStreamNoneReader(@RequestBody OnStreamNoneReaderHookParam param) throws ThingsboardException {
+    JsonNode result = tkMediaServerService.zlmOnStreamNoneReader(param);
+    if(result.has(FastIotConstants.ZLMediaBody.CHANNEL_ID) &&result.has(FastIotConstants.ZLMediaBody.CAMERA_CODE)){
+      String channelId = result.get(FastIotConstants.ZLMediaBody.CHANNEL_ID).asText();
+      String cameraCode = result.get(FastIotConstants.ZLMediaBody.CAMERA_CODE).asText();
+      VideoChanelDTO chanelDTO = tkVideoChannelService.findVideoChannelById(cameraCode,channelId, null);
+      controlService.byeCmdInSsrcTransaction(chanelDTO.getTenantId(),
+              false,
+              chanelDTO.getDeviceId(),
+              cameraCode,channelId,result.get(FastIotConstants.ZLMediaBody.SSRCINFO_STREAM).asText(),
+              fromDeviceRpcResponse->{
+
+              });
+      tkVideoChannelService.updateVideoChannelStreamId(null, cameraCode, channelId);//storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+    }
+    return result;
+  }
+}

@@ -15,6 +15,9 @@
  */
 package org.thingsboard.server.service.transport;
 
+import static org.thingsboard.server.service.transport.BasicCredentialsValidationResult.PASSWORD_MISMATCH;
+import static org.thingsboard.server.service.transport.BasicCredentialsValidationResult.VALID;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -23,8 +26,18 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.ByteString;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.zookeeper.Op;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cache.ota.OtaPackageDataCache;
@@ -60,9 +73,14 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.data.yunteng.common.media.VideoStreamSessionManager;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
-import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
+import org.thingsboard.server.common.data.yunteng.dto.sip.SipDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.SsrcTransactionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.VideoCmdEnum;
 import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
@@ -77,8 +95,11 @@ import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.dao.yunteng.entities.TkVideoChannelEntity;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerNodeService;
+import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.GetDeviceCredentialsRequestMsg;
@@ -105,19 +126,6 @@ import org.thingsboard.server.service.install.DefaultSystemDataLoaderService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.resource.TbResourceService;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
-
-import static org.thingsboard.server.service.transport.BasicCredentialsValidationResult.PASSWORD_MISMATCH;
-import static org.thingsboard.server.service.transport.BasicCredentialsValidationResult.VALID;
-
 /**
  * Created by ashvayka on 05.10.18.
  */
@@ -135,6 +143,10 @@ public class DefaultTransportApiService implements TransportApiService {
     private final DeviceService deviceService;
     private final TkDeviceService ytDeviceService;
     private final TkDeviceScriptService scriptService;
+    private final TkVideoChannelService channelService;
+    private final TkMediaServerNodeService mediaServerNodeService;
+    private final VideoStreamSessionManager videoStreamSessionManager;
+
     private final RelationService relationService;
     private final DeviceCredentialsService deviceCredentialsService;
     private final DbCallbackExecutorService dbCallbackExecutorService;
@@ -192,6 +204,9 @@ public class DefaultTransportApiService implements TransportApiService {
         else if (transportApiRequestMsg.hasScript()) {
             result = handle(transportApiRequestMsg.getScript());
         }
+        else if (transportApiRequestMsg.hasGbt28181RequestMsg()) {
+            result = handleGbt(transportApiRequestMsg.getGbt28181RequestMsg());
+        }
 
 
         return Futures.transform(Optional.ofNullable(result).orElseGet(this::getEmptyTransportApiResponseFuture),
@@ -685,20 +700,76 @@ public class DefaultTransportApiService implements TransportApiService {
     private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.ScriptProto requestMsg) {
         List<TkDeviceScriptDTO> allScriptes = scriptService.getScriptes();
         TransportApiResponseMsg.Builder responseBuilder = TransportApiResponseMsg.newBuilder();
-    allScriptes.forEach(
-        item -> {
-          UUID tenantId = UUID.fromString(item.getTenantId());
-          UUID id = UUID.fromString(item.getId());
-          responseBuilder.addScriptsResponseMsg(
-              TransportProtos.ScriptProto.newBuilder()
-                  .setConvertJs(item.getConvertJs())
-                  .setTenantIdLSB(tenantId.getLeastSignificantBits())
-                  .setTenantIdMSB(tenantId.getMostSignificantBits())
-                  .setScriptIdLSB(id.getLeastSignificantBits())
-                  .setScriptIdMSB(id.getMostSignificantBits())
-                  .setFunctionType(item.getScriptType().name())
-                  .setStatus(item.getStatus()));
-        });
+        allScriptes.forEach(
+                item -> {
+                    UUID tenantId = UUID.fromString(item.getTenantId());
+                    UUID id = UUID.fromString(item.getId());
+                    responseBuilder.addScriptsResponseMsg(
+                            TransportProtos.ScriptProto.newBuilder()
+                                    .setConvertJs(item.getConvertJs())
+                                    .setTenantIdLSB(tenantId.getLeastSignificantBits())
+                                    .setTenantIdMSB(tenantId.getMostSignificantBits())
+                                    .setScriptIdLSB(id.getLeastSignificantBits())
+                                    .setScriptIdMSB(id.getMostSignificantBits())
+                                    .setFunctionType(item.getScriptType().name())
+                                    .setStatus(item.getStatus()));
+                });
         return Futures.immediateFuture(responseBuilder.build());
     }
+    private ListenableFuture<TransportApiResponseMsg> handleGbt(TransportProtos.Gbt28181RequestMsg requestMsg) {
+        TransportProtos.Gbt28181ResponseMsg.Builder responseMsgBuilder =TransportProtos.Gbt28181ResponseMsg.newBuilder();
+        String tenantId = new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB()).toString();
+        String tbDeviceId = new UUID(requestMsg.getEntityIdMSB(), requestMsg.getEntityIdLSB()).toString();
+        String type = requestMsg.getContextType();
+        switch (VideoCmdEnum.valueOf(type)){
+            case DeviceInfo:
+                Optional<SipDeviceDTO> camera = dataDecodingEncodingService.decode(requestMsg.getContext().toByteArray());
+                camera.ifPresent(sip ->{
+                    ytDeviceService.updateDeviceInfo(tenantId,tbDeviceId, FastIotConstants.DeviceAdditional.SIP,JacksonUtil.valueToTree(sip));
+                });
+
+                break;
+            case Catalog:
+                Optional<List<VideoChanelDTO>> allChannel = dataDecodingEncodingService.decode(requestMsg.getContext().toByteArray());
+                allChannel.ifPresent(d->{
+                    channelService.clearDeviceChannel(d.get(0).getCameraCode());
+                    List<TkVideoChannelEntity> chanel= d.stream().map(item -> item.getEntity(TkVideoChannelEntity.class)).collect(Collectors.toList());
+                    channelService.insertBatch(chanel,chanel.size());
+                });
+                break;
+            default:
+                release(tenantId,tbDeviceId);
+
+        }
+//        byte[] channaelMsgBytes = dataDecodingEncodingService.encode(channelDTO);
+//        responseMsgBuilder.setContext(ByteString.copyFrom(channaelMsgBytes));
+        return Futures.immediateFuture(TransportApiResponseMsg.newBuilder().setGbt28181ResponseMsg(responseMsgBuilder.build()).build());
+    }
+    private void release(String tenantId,String tbDeviceId){
+        DeviceDTO device = ytDeviceService.findDeviceInfoByTbDeviceId(tenantId,tbDeviceId);
+        Optional.ofNullable(device).ifPresent(dev->{
+            JsonNode sip = dev.getDeviceInfo().get(FastIotConstants.DeviceAdditional.SIP);
+            if(!sip.isEmpty() && sip.has(FastIotConstants.ZLMediaBody.CAMERA_CODE)){
+                String cameraCode = sip.get(FastIotConstants.ZLMediaBody.CAMERA_CODE).asText();
+                Optional<Set<String>> ssrcKeys =
+                        videoStreamSessionManager.getSsrcTransactionCamaraKey(cameraCode);
+                ssrcKeys.ifPresent(all ->{
+                    all.forEach(fullKey->{
+                        videoStreamSessionManager.getSsrcTransaction(fullKey).ifPresent(ssrcTransaction -> {
+                            mediaServerNodeService.releaseSsrc(
+                                    ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
+                            mediaServerNodeService.closeRTPServer(
+                                    ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
+                            videoStreamSessionManager.remove(
+                                    cameraCode, ssrcTransaction.getChannelId(),
+                                    ssrcTransaction.getStream());
+                        });
+
+                    });
+                });
+            }
+        });
+
+
+    }
 }

+package org.thingsboard.server.service.yunteng.media;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.curator.shaded.com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.sip.*;
+import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum;
+import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import java.util.function.Consumer;
+
+public interface TkVideoControlService {
+
+  /**
+   * 视频点播
+   *
+   * @param deviceId 设备ID
+   * @param channelId 通道ID
+   * @return 视频流播放地址内容
+   */
+  ListenableFuture<StreamContentDTO> startPlay(
+      SecurityUser currentUser, String deviceId, String channelId);
+
+  /**
+   * 摄像头通道同步
+   *
+   * @param deviceId 设备ID
+   * @return 视频流播放地址内容
+   */
+  ListenableFuture<String> freshChannel(SecurityUser currentUser, String deviceId);
+
+  /**
+   * 当点播时的推送处理程序
+   *
+   * @param mediaServerItem 流媒体信息
+   * @param response 响应
+   * @param deviceId 点播设备ID
+   * @param channelId 点播设备通道ID
+   */
+  StreamInfoDTO onPublishHandlerForPlay(
+      MediaServerDTO mediaServerItem, JsonNode response, String deviceId, String channelId);
+
+  /**
+   * 通过设备ID和通道ID暂停播放
+   *
+   * @param tbDeviceId TB设备的ID
+   * @param channelId 通道ID
+   * @return 暂停播放结果 true成功 false失败
+   */
+  boolean stopPlay(SecurityUser currentUser, String tbDeviceId, String channelId)
+      throws ThingsboardException;
+
+  /**
+   * 摄像头控制
+   *
+   * @param currentUser 登录用户
+   * @param tbDeviceId 设备ID
+   * @param channelId 设备通道
+   * @param command 控制指令
+   * @param horizonSpeed 水平速度
+   * @param verticalSpeed 垂直速度
+   * @param zoomSpeed 缩放速度
+   * @return
+   */
+  boolean control(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      String channelId,
+      PTZCommandEnum command,
+      int horizonSpeed,
+      int verticalSpeed,
+      int zoomSpeed)
+      throws ThingsboardException;
+
+  StreamInfoDTO play(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      MediaServerDTO mediaServerItem,
+      SsrcInfoDTO ssrcInfo,
+      SipDeviceDTO device,
+      String channelId);
+
+  public void byeCmdInSsrcTransaction(
+      String tenantId,
+      boolean oneWay,
+      String tbDeviceId,
+      String cameraCode,
+      String channelId,
+      String streamId,
+      Consumer<FromDeviceRpcResponse> responseConsumer)
+      throws ThingsboardException;
+}

+package org.thingsboard.server.service.yunteng.media;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.Vector;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import javax.sdp.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.curator.shaded.com.google.common.util.concurrent.Futures;
+import org.apache.curator.shaded.com.google.common.util.concurrent.ListenableFuture;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
+import org.thingsboard.server.common.data.yunteng.common.media.VideoStreamSessionManager;
+import org.thingsboard.server.common.data.yunteng.common.media.ZlmHttpHookSubscribe;
+import org.thingsboard.server.common.data.yunteng.config.media.UserSetting;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.*;
+import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.HookSubscribeForStreamChange;
+import org.thingsboard.server.common.data.yunteng.enums.*;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.ZLMediaKitRestFulUtils;
+import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
+import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
+import org.thingsboard.server.dao.util.yunteng.ZLMediaKitTaskUtils;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.media.*;
+import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkVideoControlServiceImpl implements TkVideoControlService {
+
+  private final TkMediaServerService tkMediaServerService;
+  private final TkMediaServerNodeService tkMediaServerNodeService;
+  private final TkDeviceService tkDeviceService;
+  private final TkVideoChannelService tkVideoChannelService;
+  private final TkCacheStorageService tkCacheStorageService;
+  private final ZLMediaKitTaskUtils zlMediaKitTaskUtils;
+  private final UserSetting userSetting;
+  private final ZlmHttpHookSubscribe subscribe;
+  private final VideoStreamSessionManager videoStreamSessionManager;
+  private final ZLMediaKitRestFulUtils zlMediaKitRestFulUtils;
+  private final TbCoreDeviceRpcService deviceRpcService;
+
+  @Override
+  public ListenableFuture<StreamContentDTO> startPlay(
+      SecurityUser currentUser, String deviceId, String channelId) {
+    String tenantId = currentUser.getCurrentTenantId();
+    // 判断设备、通道是否存在
+    DeviceDTO deviceDTO = tkDeviceService.checkDeviceByTenantIdAndId(tenantId, deviceId, true);
+    SipDeviceDTO sipDeviceDTO =
+        JacksonUtil.convertValue(
+            deviceDTO.getDeviceInfo().get(FastIotConstants.DeviceAdditional.SIP),
+            SipDeviceDTO.class);
+    // 获取设备的附加信息
+    if (null == sipDeviceDTO) {
+      throw new TkDataValidationException(ErrorMessage.FOUND_VIDEO_DEVICE_FAILED.getMessage());
+    }
+    VideoChanelDTO videoChanelDTO =
+        tkVideoChannelService.findVideoChannelById(
+            sipDeviceDTO.getCameraCode(), channelId, tenantId);
+    if (null == videoChanelDTO) {
+      throw new TkDataValidationException(ErrorMessage.VIDEO_CHANNEL_NOT_FOUND.getMessage());
+    }
+    // 找到可以使用的流媒体
+    MediaServerDTO mediaServer =
+        tkMediaServerService.getMediaServerForPlay(tenantId, sipDeviceDTO.getMediaServerId());
+    if (null == mediaServer) {
+      throw new TkDataValidationException(
+          ErrorMessage.NOT_FOUND_MEDIA_SERVER_FOR_PLAY.getMessage());
+    }
+    // 根据设备ID和通道ID,找到对应的流信息
+    Optional<StreamInfoDTO> result =
+        tkCacheStorageService.queryPlayStreamByChannel(sipDeviceDTO.getCameraCode(), channelId);
+    if (result.isPresent()) {
+      StreamInfoDTO streamInfoDTO = result.get();
+      String streamId = streamInfoDTO.getStream();
+      if (StringUtils.isNotEmpty(streamId)) {
+        String mediaServerId = streamInfoDTO.getMediaServerId();
+        Optional<MediaServerDTO> mediaServerDTO = tkMediaServerNodeService.getOne(mediaServerId);
+        if (mediaServerDTO.isPresent()) {
+          if (checkRTPServerExist(mediaServerDTO.get(), streamInfoDTO, tenantId)) {
+            log.debug(String.format("缓存的【流媒体播放信息】内容【%s】", streamInfoDTO));
+            return Futures.immediateFuture(new StreamContentDTO(streamInfoDTO));
+          }
+        }
+      }
+    }
+
+    StreamInfoDTO streamInfoDTO =
+        deviceFirstPlay(
+            currentUser, deviceDTO.getTbDeviceId(), mediaServer, sipDeviceDTO, videoChanelDTO);
+    if (Optional.ofNullable(streamInfoDTO).isPresent()) {
+      return Futures.immediateFuture(new StreamContentDTO(streamInfoDTO));
+    } else {
+      return Futures.immediateFuture(new StreamContentDTO(null));
+    }
+  }
+
+  @Override
+  public ListenableFuture<String> freshChannel(SecurityUser currentUser, String deviceId) {
+    String tenantId = currentUser.getCurrentTenantId();
+    // 判断设备、通道是否存在
+    Optional<DeviceDTO> device = Optional.ofNullable(tkDeviceService.checkDeviceByTenantIdAndId(tenantId, deviceId, true));
+    if(device.isEmpty()){
+      return Futures.immediateFuture(ErrorMessage.DEVICE_NOT_EXTIED.getMessage());
+    }
+    DeviceDTO deviceDTO = device.get();
+    if (!deviceDTO.getDeviceState().equals(DeviceState.ONLINE)) {
+      return Futures.immediateFuture(ErrorMessage.DEVICE_NOT_ONLINE.getMessage());
+    }
+    SipDeviceDTO sipDeviceDTO =
+        JacksonUtil.convertValue(
+            deviceDTO.getDeviceInfo().get(FastIotConstants.DeviceAdditional.SIP),
+            SipDeviceDTO.class);
+    // 获取设备的附加信息
+    if (null == sipDeviceDTO) {
+      throw new TkDataValidationException(ErrorMessage.FOUND_VIDEO_DEVICE_FAILED.getMessage());
+    }
+    CountDownLatch timeoutLatch = new CountDownLatch(1);
+    AtomicReference<String> result = new AtomicReference<>();
+    // 进行命令发送
+
+
+      ObjectNode paramJson = JacksonUtil.newObjectNode();
+    paramJson.put(FastIotConstants.ZLMediaBody.MSG_TYPE, VideoXmlEnum.Query.name());
+    int sn = (int) ((Math.random() * 9 + 1) * 100000);
+    paramJson.put(FastIotConstants.ZLMediaBody.MSG_CONTEXT, sn);
+
+    try {
+      cameraCommonCmd(
+          currentUser.getCurrentTenantId(),
+          paramJson,
+          sipDeviceDTO.getCameraCode(),
+          VideoMethodEnum.MESSAGE,
+          false,
+          deviceId,
+          fromDeviceRpcResponse -> {
+            log.warn(
+                "【流媒体SIP】收到【视频点播】结果=异常【{}】+数据【{}】",
+                fromDeviceRpcResponse.getError(),
+                fromDeviceRpcResponse.getResponse());
+            fromDeviceRpcResponse
+                .getResponse()
+                .ifPresent(
+                    jsonStr -> {
+                      JsonNode responseJson = JacksonUtil.toJsonNode(jsonStr);
+                      if (fromDeviceRpcResponse.getError().isEmpty()) {
+                        result.set(jsonStr);
+                      } else {
+                        result.set(fromDeviceRpcResponse.getError().get().name());
+                      }
+                    });
+            timeoutLatch.countDown();
+          });
+    } catch (ThingsboardException  e) {
+      Futures.immediateFailedFuture(e);
+    }
+      return Futures.immediateFuture(result.get());
+
+  }
+
+  @Override
+  public StreamInfoDTO onPublishHandlerForPlay(
+      MediaServerDTO mediaServerItem, JsonNode response, String deviceCode, String channelId) {
+    StreamInfoDTO streamInfo = onPublishHandler(mediaServerItem, response, deviceCode, channelId);
+    VideoChanelDTO videoChanel =
+        tkVideoChannelService.findVideoChannelById(
+            deviceCode, channelId, mediaServerItem.getTenantId());
+    if (videoChanel != null) {
+      videoChanel.setStreamId(streamInfo.getStream());
+      tkVideoChannelService.updateVideoChannelStreamId(
+          streamInfo.getStream(), deviceCode, channelId);
+    }
+    tkCacheStorageService.cacheStreamInfoByStartPlay(streamInfo);
+    return streamInfo;
+  }
+
+  @Override
+  public boolean stopPlay(SecurityUser currentUser, String tbDeviceId, String channelId)
+      throws ThingsboardException {
+    String tenantId = currentUser.getCurrentTenantId();
+    DeviceDTO deviceDTO = tkDeviceService.findDeviceInfoByTbDeviceId(tenantId, tbDeviceId);
+    if (null == deviceDTO
+        || !deviceDTO.getDeviceInfo().has(FastIotConstants.DeviceAdditional.SIP)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    String cameraCode =
+        deviceDTO
+            .getDeviceInfo()
+            .get(FastIotConstants.DeviceAdditional.SIP)
+            .get(FastIotConstants.ZLMediaBody.CAMERA_CODE)
+            .asText();
+
+    Optional<StreamInfoDTO> streamInfoDTO =
+        tkCacheStorageService.queryPlayStreamByChannel(cameraCode, channelId);
+    if (streamInfoDTO.isEmpty()) {
+      throw new TkDataValidationException(ErrorMessage.STREAM_INFO_NOT_FOUND_FOR_PLAY.getMessage());
+    }
+    byeCmdInSsrcTransaction(
+        currentUser.getCurrentTenantId(),
+        false,
+        tbDeviceId,
+        cameraCode,
+        channelId,
+        streamInfoDTO.get().getStream(),
+        fromDeviceRpcResponse -> {});
+
+    tkCacheStorageService.deleteCacheStreamInfoByStopPlay(
+        streamInfoDTO.get()); // redisCatchStorage.stopPlay(streamInfo);
+    return tkVideoChannelService.updateVideoChannelStreamId(
+        null,
+        cameraCode,
+        channelId); // storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+  }
+
+  @Override
+  public StreamInfoDTO play(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      MediaServerDTO mediaServerDTO,
+      SsrcInfoDTO ssrcInfoDTO,
+      SipDeviceDTO sipDeviceDTO,
+      String channelId) {
+    HookSubscribeForStreamChange hookSubscribe =
+        new HookSubscribeForStreamChange(
+            "rtp", ssrcInfoDTO.getStream(), true, "rtsp", mediaServerDTO.getMediaServerId());
+    CountDownLatch timeoutLatch = new CountDownLatch(1);
+    // 定时任务超时KEY
+    String timeOutTaskKey = UUID.randomUUID().toString();
+    zlMediaKitTaskUtils.startCronTaskDelay(
+        timeOutTaskKey,
+        () -> {
+          log.debug(
+              "[点播超时] 收流超时 deviceId: {}, channelId: {}，端口：{}, SSRC: {}",
+              sipDeviceDTO.getCameraCode(),
+              channelId,
+              ssrcInfoDTO.getPort(),
+              ssrcInfoDTO.getSsrc());
+          // 点播超时回复BYE 同时释放ssrc以及此次点播的资源
+          try {
+            //        cmder.streamByeCmd(device, channelId, ssrcInfo.getStream(), null);
+            // TODO 回复Bye命令
+          } catch (Exception e) {
+            log.error("[点播超时]， 发送BYE失败 {}", e.getMessage());
+          } finally {
+            //            timeoutCallback.run(1, "收流超时");
+            // 释放SSRC
+            tkMediaServerNodeService.releaseSsrc(
+                mediaServerDTO.getMediaServerId(), ssrcInfoDTO.getSsrc());
+            //        streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+            // 关闭RTP服务
+            tkMediaServerNodeService.closeRTPServer(
+                Optional.of(mediaServerDTO), ssrcInfoDTO.getStream());
+            // 取消订阅消息监听
+            subscribe.removeSubscribe(hookSubscribe);
+          }
+        },
+        userSetting.getPlayTimeout());
+    // 获取端口信息失败,则不发送点播指令
+    if (ssrcInfoDTO.getPort() <= FastIotConstants.MagicNumber.ZERO) {
+      zlMediaKitTaskUtils.stop(timeOutTaskKey);
+      // 释放SSRC
+      tkMediaServerNodeService.releaseSsrc(
+          mediaServerDTO.getMediaServerId(), ssrcInfoDTO.getSsrc());
+      videoStreamSessionManager.remove(
+          sipDeviceDTO.getCameraCode(), channelId, ssrcInfoDTO.getStream());
+      throw new TkDataValidationException(
+          String.format(ErrorMessage.GET_PLAY_PORT_FAILED.getMessage(), mediaServerDTO.getIp()));
+    }
+    // 进行命令发送
+    AtomicReference<StreamInfoDTO> result = new AtomicReference<>();
+    try {
+
+      log.debug(
+          String.format(
+              "视频流【%s】的流媒体服务器信息=流媒体服务ID【%s】+流媒体服务端口【%s】+SDP(会话)IP【%s】",
+              ssrcInfoDTO.getStream(),
+              mediaServerDTO.getMediaServerId(),
+              ssrcInfoDTO.getPort(),
+              mediaServerDTO.getSdpIp()));
+      ObjectNode paramJson = JacksonUtil.newObjectNode();
+      paramJson.set(FastIotConstants.ZLMediaBody.MEDIA, JacksonUtil.valueToTree(mediaServerDTO));
+      //
+      // paramJson.put(FastIotConstants.ZLMediaBody.MEDIA_ID,mediaServerDTO.getMediaServerId());
+      //      paramJson.put(FastIotConstants.ZLMediaBody.MEDIA_SDP_IP,mediaServerDTO.getSdpIp());
+      paramJson.put(FastIotConstants.ZLMediaBody.SSRCINFO_STREAM, ssrcInfoDTO.getStream());
+      paramJson.put(FastIotConstants.ZLMediaBody.SSRCINFO_PORT, ssrcInfoDTO.getPort());
+      paramJson.put(FastIotConstants.ZLMediaBody.SSRCINFO_SSRC, ssrcInfoDTO.getSsrc());
+      paramJson.put(FastIotConstants.ZLMediaBody.CHANNEL_ID, channelId);
+      // TODO: 2023/12/28 收到流改变事件后，视频点播的业务逻辑。
+      subscribe.addSubscribe(
+          hookSubscribe,
+          (MediaServerDTO mediaServerItemInUse, JsonNode response) -> {
+            log.debug(
+                "处理订阅消息：主题【{}】流媒体信息【{}】收到的内容【{}】",
+                hookSubscribe.getHookType().name(),
+                mediaServerItemInUse,
+                response);
+            zlMediaKitTaskUtils.stop(timeOutTaskKey);
+
+            subscribe.removeSubscribe(hookSubscribe);
+            result.set(
+                steamImage(
+                    ssrcInfoDTO.getStream(),
+                    sipDeviceDTO.getCameraCode(),
+                    channelId,
+                    mediaServerItemInUse,
+                    response));
+            timeoutLatch.countDown();
+          });
+      cameraCommonCmd(
+          currentUser.getCurrentTenantId(),
+          paramJson,
+          sipDeviceDTO.getCameraCode(),
+          VideoMethodEnum.INVITE,
+          false,
+          tbDeviceId,
+          fromDeviceRpcResponse -> {
+            log.warn(
+                "【流媒体SIP】收到【视频点播】结果=异常【{}】+数据【{}】",
+                fromDeviceRpcResponse.getError(),
+                fromDeviceRpcResponse.getResponse());
+            fromDeviceRpcResponse
+                .getResponse()
+                .ifPresent(
+                    jsonStr -> {
+                      JsonNode responseJson = JacksonUtil.toJsonNode(jsonStr);
+                      if (fromDeviceRpcResponse.getError().isEmpty()) {
+                        playSuccess(
+                            currentUser,
+                            tbDeviceId,
+                            mediaServerDTO,
+                            responseJson,
+                            ssrcInfoDTO,
+                            sipDeviceDTO,
+                            channelId,
+                            timeOutTaskKey);
+                      } else {
+                        zlMediaKitTaskUtils.stop(timeOutTaskKey);
+                        tkMediaServerNodeService.closeRTPServer(
+                            mediaServerDTO, ssrcInfoDTO.getStream(), null);
+                        // 释放ssrc
+                        tkMediaServerNodeService.releaseSsrc(
+                            mediaServerDTO.getMediaServerId(), ssrcInfoDTO.getSsrc());
+                        videoStreamSessionManager.remove(
+                            sipDeviceDTO.getCameraCode(), channelId, ssrcInfoDTO.getStream());
+                        //                  errorEvent.response(event);
+                      }
+                    });
+          });
+      timeoutLatch.await(userSetting.getPlayTimeout(), TimeUnit.MILLISECONDS);
+    } catch (Exception e) {
+      zlMediaKitTaskUtils.stop(timeOutTaskKey);
+      tkMediaServerNodeService.closeRTPServer(
+          Optional.of(mediaServerDTO), ssrcInfoDTO.getStream());
+      // 释放ssrc
+      tkMediaServerNodeService.releaseSsrc(mediaServerDTO.getId(), ssrcInfoDTO.getSsrc());
+
+      videoStreamSessionManager.remove(
+          sipDeviceDTO.getCameraCode(), channelId, ssrcInfoDTO.getStream());
+
+      //      SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+      //      eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+      //      eventResult.statusCode = -1;
+      //      eventResult.msg = "命令发送失败";
+      //      errorEvent.response(eventResult);
+    }
+    log.debug(String.format("最新的【流媒体播放信息】内容【%s】", result.get()));
+    return result.get();
+  }
+
+  /**
+   * 调用流媒体接口获取视频流封面图，并触发后续业务
+   *
+   * @param ssrcStream
+   * @param cameraCode
+   * @param channelId
+   * @param mediaServerItemInUse
+   * @param response
+   */
+  private StreamInfoDTO steamImage(
+      String ssrcStream,
+      String cameraCode,
+      String channelId,
+      MediaServerDTO mediaServerItemInUse,
+      JsonNode response) {
+    // hook响应
+    StreamInfoDTO streamInfoDTO =
+        onPublishHandlerForPlay(mediaServerItemInUse, response, cameraCode, channelId);
+    String streamUrl;
+    if (mediaServerItemInUse.getRtspPort() != 0) {
+      streamUrl =
+          String.format(
+              "rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInUse.getRtspPort(), "rtp", ssrcStream);
+    } else {
+      streamUrl =
+          String.format(
+              "http://127.0.0.1:%s/%s/%s.live.mp4",
+              mediaServerItemInUse.getHttpPort(), "rtp", ssrcStream);
+    }
+    String path = "snap";
+    String fileName = cameraCode + "_" + channelId + ".jpg";
+    // 请求截图
+    log.debug("[请求截图]: " + fileName);
+    zlMediaKitRestFulUtils.getSnap(mediaServerItemInUse, streamUrl, 15, 1, path, fileName);
+    return streamInfoDTO;
+  }
+
+  /**
+   * 构建视频点播的流媒体信息
+   *
+   * @param mediaServerItem
+   * @param response
+   * @param deviceCode
+   * @param channelId
+   * @return
+   */
+  private StreamInfoDTO onPublishHandler(
+      MediaServerDTO mediaServerItem, JsonNode response, String deviceCode, String channelId) {
+    String streamId = response.get("stream").asText();
+    JsonNode tracks = response.get("tracks");
+    StreamInfoDTO streamInfo =
+        tkMediaServerService.getStreamInfoByAppAndStream(
+            mediaServerItem, "rtp", streamId, tracks, null);
+    streamInfo.setCameraCode(deviceCode);
+    streamInfo.setChannelId(channelId);
+    return streamInfo;
+  }
+
+  private StreamInfoDTO deviceFirstPlay(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      MediaServerDTO mediaServerDTO,
+      SipDeviceDTO sipDeviceDTO,
+      VideoChanelDTO videoChanelDTO) {
+    // 进行点播时，需要的参数包含：schema、vhost、app、stream
+    String streamId = null;
+    // 是否开启了多端口模式
+    if (mediaServerDTO.isRtpEnable()) {
+      streamId =
+          String.format("%s_%s", sipDeviceDTO.getCameraCode(), videoChanelDTO.getChannelId());
+    }
+    // 开启收流服务
+    SsrcInfoDTO ssrcInfoDTO =
+        tkMediaServerNodeService.openRTPServer(
+            mediaServerDTO,
+            streamId,
+            null,
+            sipDeviceDTO.isSsrcCheck(),
+            false,
+            0,
+            false,
+            sipDeviceDTO.getStreamModeForParam());
+    if (null == ssrcInfoDTO) {
+      throw new TkDataValidationException(ErrorMessage.RECEIVE_STREAM_FAILED.getMessage());
+    }
+    // 开始进行点播
+    return play(
+        currentUser,
+        tbDeviceId,
+        mediaServerDTO,
+        ssrcInfoDTO,
+        sipDeviceDTO,
+        videoChanelDTO.getChannelId());
+  }
+
+  private boolean checkRTPServerExist(
+      MediaServerDTO mediaServerDTO, StreamInfoDTO streamInfo, String tenantId) {
+    String streamId = streamInfo.getStream();
+    JsonNode rtpInfo = zlMediaKitRestFulUtils.getRtpInfo(mediaServerDTO, streamId);
+    if (rtpInfo.get("code").asInt() == 0 && rtpInfo.get("exist").asBoolean()) {
+      int localPort = rtpInfo.get("local_port").asInt();
+      if (localPort == 0) {
+        throw new TkDataValidationException("点播已经在进行中，请稍候重试");
+      }
+      return true;
+    } else {
+      String deviceId = streamInfo.getCameraCode();
+      String channelId = streamInfo.getChannelId();
+      tkCacheStorageService.deleteCacheStreamInfoByStopPlay(streamInfo);
+      tkVideoChannelService.updateVideoChannelStreamId(null, deviceId, channelId);
+      return false;
+    }
+  }
+
+  @Value("${server.rest.server_side_rpc.min_timeout:5000}")
+  protected long minTimeout;
+
+  @Value("${server.rest.server_side_rpc.default_timeout:10000}")
+  protected long defaultTimeout;
+
+  /**
+   * 公用的命令下发接口
+   *
+   * @param tenantId
+   * @param paramJson
+   * @param oneWay
+   * @param deviceId TB的设备ID
+   * @param responseConsumer
+   * @throws ThingsboardException
+   */
+  public void cameraCommonCmd(
+      String tenantId,
+      ObjectNode paramJson,
+      String cameraCode,
+      VideoMethodEnum method,
+      boolean oneWay,
+      String deviceId,
+      Consumer<FromDeviceRpcResponse> responseConsumer)
+      throws ThingsboardException {
+    try {
+
+      paramJson.put(FastIotConstants.ZLMediaBody.CAMERA_CODE, cameraCode);
+      paramJson.put(FastIotConstants.ZLMediaBody.METHOD_TYPE, method.name());
+      ToDeviceRpcRequestBody body =
+          new ToDeviceRpcRequestBody("cameraMethod", JacksonUtil.toString(paramJson));
+      long timeout = defaultTimeout;
+      long expTime = System.currentTimeMillis() + Math.max(minTimeout, timeout);
+      UUID rpcRequestUUID = UUID.randomUUID();
+      boolean persisted = false;
+      ToDeviceRpcRequest rpcRequest =
+          new ToDeviceRpcRequest(
+              rpcRequestUUID,
+              new TenantId(UUID.fromString(tenantId)),
+              new DeviceId(UUID.fromString(deviceId)),
+              oneWay,
+              expTime,
+              body,
+              persisted,
+              null,
+              null);
+      deviceRpcService.processRestApiRpcRequest(rpcRequest, responseConsumer, null);
+    } catch (IllegalArgumentException ioe) {
+      throw new ThingsboardException(
+          "Invalid request body", ioe, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+    }
+  }
+
+  /**
+   * 点播关闭命令下发
+   *
+   * @param oneWay
+   * @param tbDeviceId TB的设备ID
+   * @param responseConsumer
+   * @throws ThingsboardException
+   */
+  @Override
+  public void byeCmdInSsrcTransaction(
+      String tenantId,
+      boolean oneWay,
+      String tbDeviceId,
+      String cameraCode,
+      String channelId,
+      String streamId,
+      Consumer<FromDeviceRpcResponse> responseConsumer)
+      throws ThingsboardException {
+    Optional<SsrcTransactionDTO> transactionDTO =
+        videoStreamSessionManager.getSsrcTransaction(cameraCode, channelId, streamId);
+    if (transactionDTO.isEmpty()) {
+      throw new TkDataValidationException(ErrorMessage.STREAM_INFO_NOT_FOUND_FOR_PLAY.getMessage());
+    }
+    SsrcTransactionDTO ssrc = transactionDTO.get();
+    cameraByeCmd(
+        tenantId,
+        ssrc.getSipTransactionInfo(),
+        oneWay,
+        true,
+        tbDeviceId,
+        cameraCode,
+        channelId,
+        streamId,
+        ssrc.getSsrc(),
+        ssrc.getMediaServerId(),
+        responseConsumer);
+  }
+
+  public void byeCmdInSendRtp(
+      SecurityUser currentUser,
+      boolean oneWay,
+      String tbDeviceId,
+      String cameraCode,
+      String channelId,
+      String streamId,
+      Consumer<FromDeviceRpcResponse> responseConsumer)
+      throws ThingsboardException {
+
+    //    SendRtpItemDTO sendRtpItem =null;
+    //    SipMessageHeaderDTO sipTransactionInfo =
+    //        SipMessageHeaderDTO.builder()
+    //            .toTag(sendRtpItem.getToTag())
+    //            .fromTag(sendRtpItem.getFromTag())
+    //            .callId(sendRtpItem.getCallId())
+    //            .build();
+    //    MediaServerDTO mediaServer =
+    // tkMediaServerService.getMediaServerByMediaServerId(sendRtpItem.getMediaServerId());
+    //    cameraByeCmd(
+    //            currentUser,ssrc.getSipTransactionInfo(),oneWay,mediaServer != null,tbDeviceId,
+    //
+    // cameraCode,sendRtpItem.getChannelId(),streamId,ssrc.getSsrc(),ssrc.getMediaServerId(),
+    //            responseConsumer);
+  }
+
+  public void cameraByeCmd(
+      String currentUser,
+      SipMessageHeaderDTO messageHeaderDTO,
+      boolean oneWay,
+      boolean mediaOnline,
+      String tbDeviceId,
+      String cameraCode,
+      String channelId,
+      String streamId,
+      String ssrc,
+      String mediaServerId,
+      Consumer<FromDeviceRpcResponse> responseConsumer)
+      throws ThingsboardException {
+    if (mediaOnline) {
+      tkMediaServerNodeService.releaseSsrc(mediaServerId, ssrc);
+      tkMediaServerNodeService.closeRTPServer(mediaServerId, streamId);
+    }
+    videoStreamSessionManager.remove(cameraCode, channelId, streamId);
+    ObjectNode paramJson = JacksonUtil.newObjectNode();
+    paramJson.put(FastIotConstants.ZLMediaBody.CHANNEL_ID, channelId);
+    paramJson.set(
+        FastIotConstants.ZLMediaBody.MSG_HEADER, JacksonUtil.valueToTree(messageHeaderDTO));
+    cameraCommonCmd(
+        currentUser,
+        paramJson,
+        cameraCode,
+        VideoMethodEnum.BYE,
+        oneWay,
+        tbDeviceId,
+        responseConsumer);
+  }
+
+  /**
+   * 点播成功后，流媒体的业务逻辑
+   *
+   * @param currentUser
+   * @param tbDeviceId
+   * @param mediaServerDTO
+   * @param responseJson
+   * @param ssrcInfo
+   * @param sipDeviceDTO
+   * @param channelId
+   * @param timeOutTaskKey
+   */
+  private void playSuccess(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      MediaServerDTO mediaServerDTO,
+      JsonNode responseJson,
+      SsrcInfoDTO ssrcInfo,
+      SipDeviceDTO sipDeviceDTO,
+      String channelId,
+      String timeOutTaskKey) {
+    String cameraCode = sipDeviceDTO.getCameraCode();
+    String callId = responseJson.get(FastIotConstants.ZLMediaBody.CALL_ID).asText();
+    JsonNode msgHeader = responseJson.get(FastIotConstants.ZLMediaBody.MSG_HEADER);
+    SipMessageHeaderDTO sipMessage = JacksonUtil.convertValue(msgHeader, SipMessageHeaderDTO.class);
+    String sessionType = responseJson.get(FastIotConstants.ZLMediaBody.SESSION_TYPE).asText();
+    String streamId = ssrcInfo.getStream();
+    videoStreamSessionManager.put(
+        cameraCode,
+        channelId,
+        callId,
+        streamId,
+        ssrcInfo.getSsrc(),
+        sipMessage,
+        mediaServerDTO.getMediaServerId(),
+        SessionTypeEnum.valueOf(sessionType));
+    // 获取ssrc
+    String contentString = responseJson.get(FastIotConstants.ZLMediaBody.MSG_CONTEXT).asText();
+    int ssrcIndex = contentString.indexOf("y=");
+    // 检查是否有y字段
+    if (ssrcIndex >= 0) {
+      // ssrc规定长度为10字节，不取余下长度以避免后续还有“f=”字段 TODO 后续对不规范的非10位ssrc兼容
+      String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12).trim();
+      // 查询到ssrc不一致且开启了ssrc校验则需要针对处理
+      if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
+        if (sipDeviceDTO.getStreamMode().equalsIgnoreCase("TCP-ACTIVE")) {
+          String substring = contentString.substring(0, contentString.indexOf("y="));
+          try {
+            SessionDescription sdp = SdpFactory.getInstance().createSessionDescription(substring);
+            int port = -1;
+            Vector mediaDescriptions = sdp.getMediaDescriptions(true);
+            for (Object description : mediaDescriptions) {
+              MediaDescription mediaDescription = (MediaDescription) description;
+              Media media = mediaDescription.getMedia();
+
+              Vector mediaFormats = media.getMediaFormats(false);
+              if (mediaFormats.contains("96")) {
+                port = media.getMediaPort();
+                break;
+              }
+            }
+            log.debug(
+                "[点播-TCP主动连接对方] deviceId: {}, channelId: {}, 连接对方的地址：{}:{}, 收流模式：{}, SSRC: {}, SSRC校验：{}",
+                sipDeviceDTO.getCameraCode(),
+                channelId,
+                sdp.getConnection().getAddress(),
+                port,
+                sipDeviceDTO.getStreamMode(),
+                ssrcInfo.getSsrc(),
+                sipDeviceDTO.isSsrcCheck());
+            JsonNode jsonNode =
+                zlMediaKitRestFulUtils.connectRtpServer(
+                    mediaServerDTO, sdp.getConnection().getAddress(), port, streamId);
+            log.debug("[点播-TCP主动连接对方] 结果： {}", jsonNode);
+          } catch (SdpException e) {
+            log.error(
+                "[点播-TCP主动连接对方] deviceId: {}, channelId: {}, 解析200OK的SDP信息失败",
+                sipDeviceDTO.getCameraCode(),
+                channelId,
+                e);
+          }
+        }
+        return;
+      }
+      log.debug("[点播消息] 收到invite 200, 发现下级自定义了ssrc: {}", ssrcInResponse);
+      if (!mediaServerDTO.isRtpEnable() || sipDeviceDTO.isSsrcCheck()) {
+        log.debug("[点播消息] SSRC修正 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
+
+        // 释放不被使用的ssrc
+        tkMediaServerNodeService.releaseSsrc(mediaServerDTO.getMediaServerId(), ssrcInfo.getSsrc());
+        // 单端口模式streamId也有变化，需要重新设置监听
+        if (!mediaServerDTO.isRtpEnable()) {
+          // 添加订阅
+          HookSubscribeForStreamChange hookSubscribe =
+              new HookSubscribeForStreamChange(
+                  "rtp", streamId, true, "rtsp", mediaServerDTO.getMediaServerId());
+          subscribe.removeSubscribe(hookSubscribe);
+          hookSubscribe
+              .getContent()
+              .put("stream", String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase());
+          subscribe.addSubscribe(
+              hookSubscribe,
+              (MediaServerDTO mediaServerItemInUse, JsonNode response) -> {
+                log.debug(
+                    "处理订阅消息：主题【{}】流媒体信息【{}】收到的内容【{}】",
+                    hookSubscribe.getHookType().name(),
+                    mediaServerItemInUse,
+                    response);
+                zlMediaKitTaskUtils.stop(timeOutTaskKey);
+                // hook响应
+                onPublishHandlerForPlay(mediaServerItemInUse, response, cameraCode, channelId);
+                //            hookEvent.response(mediaServerItemInUse, response);
+              });
+        }
+
+        // 关闭rtp server
+        tkMediaServerNodeService.closeRTPServer(
+            mediaServerDTO,
+            streamId,
+            result -> {
+              if (result) {
+                // 重新开启ssrc server
+                tkMediaServerNodeService.openRTPServer(
+                    mediaServerDTO,
+                    streamId,
+                    ssrcInResponse,
+                    sipDeviceDTO.isSsrcCheck(),
+                    false,
+                    ssrcInfo.getPort(),
+                    true,
+                    sipDeviceDTO.getStreamModeForParam());
+              } else {
+                try {
+                  log.warn("[停止点播] {}/{}", cameraCode, channelId);
+                  byeCmdInSsrcTransaction(
+                      currentUser.getCurrentTenantId(),
+                      false,
+                      tbDeviceId,
+                      cameraCode,
+                      channelId,
+                      streamId,
+                      fromDeviceRpcResponse -> {});
+                } catch (Exception e) {
+                  log.error("[命令发送失败] 停止点播， 发送BYE: {}", e.getMessage());
+                }
+                zlMediaKitTaskUtils.stop(timeOutTaskKey);
+                videoStreamSessionManager.remove(cameraCode, channelId, streamId);
+                //            event.msg = "下级自定义了ssrc,重新设置收流信息失败";
+                //            event.statusCode = 500;
+                //            errorEvent.response(event);
+              }
+            });
+      }
+    }
+  }
+
+  @Override
+  public boolean control(
+      SecurityUser currentUser,
+      String tbDeviceId,
+      String channelId,
+      PTZCommandEnum command,
+      int horizonSpeed,
+      int verticalSpeed,
+      int zoomSpeed)
+      throws ThingsboardException {
+
+    if (PTZCommandEnum.STOP.equals(command)) {
+      horizonSpeed = 0;
+      verticalSpeed = 0;
+      zoomSpeed = 0;
+    }
+    DeviceDTO deviceDTO =
+        tkDeviceService.checkDeviceByTenantIdAndId(
+            currentUser.getCurrentTenantId(), tbDeviceId, true);
+    if (null == deviceDTO) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    SipDeviceDTO sipDeviceDTO =
+        JacksonUtil.convertValue(
+            deviceDTO.getDeviceInfo().get(FastIotConstants.DeviceAdditional.SIP),
+            SipDeviceDTO.class);
+    if (null == sipDeviceDTO) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    PTZCmdDTO ptzCmdDTO = new PTZCmdDTO();
+    ptzCmdDTO.setCommand(command);
+    ptzCmdDTO.setHorizonSpeed(horizonSpeed);
+    ptzCmdDTO.setVerticalSpeed(verticalSpeed);
+    ptzCmdDTO.setZoomSpeed(zoomSpeed);
+    ObjectNode requestJson = JacksonUtil.newObjectNode();
+    requestJson.put(FastIotConstants.ZLMediaBody.CHANNEL_ID, channelId);
+    requestJson.put(FastIotConstants.ZLMediaBody.MSG_TYPE, VideoXmlEnum.Control.name());
+    requestJson.set(
+        FastIotConstants.ZLMediaBody.MSG_CONTEXT, JacksonUtil.valueToTree(ptzCmdDTO));
+    cameraCommonCmd(
+        currentUser.getCurrentTenantId(),
+        requestJson,
+        sipDeviceDTO.getCameraCode(),
+        VideoMethodEnum.MESSAGE,
+        false,
+        tbDeviceId,
+        fromDeviceRpcResponse -> {});
+    return false;
+  }
+}

+package org.thingsboard.server.service.yunteng.media;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.yunteng.config.media.ZLMediaKitServerConfig;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.ZLMediaKitRestFulUtils;
+import org.thingsboard.server.dao.util.yunteng.ZLMediaKitTaskUtils;
+import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerNodeService;
+import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService;
+import org.thingsboard.server.common.data.yunteng.config.media.MediaConfig;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component("ZLMediaKitState")
+@TbCoreComponent
+@ConditionalOnExpression(
+        "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
+@Slf4j
+public class ZLMediaKitStateRunner {
+  private final ZLMediaKitRestFulUtils zlMediaKitRestFulUtils;
+  private final TkMediaServerNodeService tkMediaServerNodeService;
+  private final TkMediaServerService tkMediaServerService;
+  private final MediaConfig mediaConfig;
+  private final ZLMediaKitTaskUtils zlMediaKitTaskUtils;
+  private final Map<String, Boolean> startGetMedia;
+
+  @Value("${media.defaultStateCheckIntervalInSec}")
+  @Getter
+  private int defaultStateCheckIntervalInSec;
+
+  public ZLMediaKitStateRunner(
+      ZLMediaKitRestFulUtils zlMediaKitRestFulUtils,
+      TkMediaServerNodeService tkMediaServerNodeService,
+      TkMediaServerService tkMediaServerService,
+      MediaConfig mediaConfig,
+      ZLMediaKitTaskUtils zlMediaKitTaskUtils,
+      Map<String, Boolean> startGetMedia) {
+    this.zlMediaKitRestFulUtils = zlMediaKitRestFulUtils;
+    this.tkMediaServerNodeService = tkMediaServerNodeService;
+    this.tkMediaServerService = tkMediaServerService;
+    this.mediaConfig = mediaConfig;
+    this.zlMediaKitTaskUtils = zlMediaKitTaskUtils;
+    this.startGetMedia = startGetMedia;
+  }
+
+  @PostConstruct
+  public void init() {
+    updateDefaultMediaServer();
+    // 从数据库获取所有的流媒体信息
+    List<MediaServerDTO> dtoList = tkMediaServerService.getAllMediaKit();
+
+    Optional.ofNullable(dtoList).ifPresent( all ->{
+      all.forEach(dto ->{
+        String key = dto.getMediaServerId();
+        startGetMedia.put(key, true);
+        zlMediaKitTaskUtils.startCronTask(
+                key,
+                () -> {
+                  ZLMediaKitServerConfig zlMediaKitServerConfig = getMediaServerConfig(dto);
+                  if (null != zlMediaKitServerConfig) {
+                    startGetMedia.remove(dto.getMediaServerId());
+                    zlMediaKitTaskUtils.stop(key);
+                    zlMediaKitServerConfig.setIp(dto.getIp());
+                    zlMediaKitServerConfig.setHttpPort(dto.getHttpPort());
+                    zlMediaKitServerConfig.setTenantId(dto.getTenantId());
+                    // 进行上线操作
+                    tkMediaServerNodeService.zlmServerOnline(zlMediaKitServerConfig);
+                  }
+                },
+                defaultStateCheckIntervalInSec);
+      });
+    });
+  }
+
+  private void updateDefaultMediaServer() {
+    // 默认流媒体服务器
+    MediaServerDTO oldMediaServer = tkMediaServerService.findDefaultMediaServer();
+    MediaServerDTO defaultConfig = mediaConfig.getMediaSerItem();
+    if (oldMediaServer == null) {
+      defaultConfig.setTenantId(EntityId.NULL_UUID.toString());
+    }else{
+      defaultConfig.setId(oldMediaServer.getId());
+      defaultConfig.setTenantId(oldMediaServer.getTenantId());
+    }
+    tkMediaServerService.saveOrUpdateMediaServer(defaultConfig);
+  }
+
+  /**
+   * 调用流媒体API接口获取流媒体配置
+   * @param mediaServerItem
+   * @return
+   */
+  private ZLMediaKitServerConfig getMediaServerConfig(MediaServerDTO mediaServerItem) {
+    log.error("启动流媒体【ZLMedia】验证，流媒体编号【{}】",mediaServerItem.getMediaServerId());
+    if (startGetMedia == null) {
+      return null;
+    }
+    if (!mediaServerItem.isDefaultServer()
+        && tkMediaServerNodeService.getOne(mediaServerItem.getMediaServerId()).isEmpty()) {
+      return null;
+    }
+    if (startGetMedia.get(mediaServerItem.getMediaServerId()) == null
+        || !startGetMedia.get(mediaServerItem.getMediaServerId())) {
+      return null;
+    }
+    JsonNode responseJson = zlMediaKitRestFulUtils.getMediaServerConfig(mediaServerItem);
+    if(responseJson == null){
+      log.error("流媒体【{}】服务地址【{}:{}】无法访问",mediaServerItem.getMediaServerId(),mediaServerItem.getIp(),mediaServerItem.getHttpPort());
+      return null;
+    }
+    JsonNode data = responseJson.get(FastIotConstants.ZLMediaBody.DATA);
+    if (data != null && !data.isEmpty()) {
+      log.error("流媒体【{}:{}】调用成功，响应内容【{}】",mediaServerItem.getIp(),mediaServerItem.getHttpPort(),data);
+      return JacksonUtil.convertValue(data.get(0), ZLMediaKitServerConfig.class);
+    }
+    log.error("流媒体【{}:{}】调用失败，失败原因【{}】",mediaServerItem.getIp(),mediaServerItem.getHttpPort(),responseJson.get(FastIotConstants.ZLMediaBody.MSG));
+    return null;
+  }
+}

+package org.thingsboard.server.utils;
+
+import org.thingsboard.server.common.data.yunteng.enums.AttributeSourceDataTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.OperationTypeEnum;
+
+public class ImportModbusUtils {
+
+    public static Boolean operationTypeAndOriginalDataTypeStatus(String operationType, String OriginalDataType){
+        if((operationType.equals(OperationTypeEnum.inputStatus_r_02.name())||
+                operationType.equals(OperationTypeEnum.coilStatus_r_01.name())||
+                operationType.equals(OperationTypeEnum.coilStatus_rw_01_05.name())||
+                operationType.equals(OperationTypeEnum.coilStatus_rw_01_0F.name())||
+                operationType.equals(OperationTypeEnum.coilStatus_w_05.name())||
+                operationType.equals(OperationTypeEnum.coilStatus_w_0F.name()))&&!OriginalDataType.equals(AttributeSourceDataTypeEnum.BOOLEAN.name())){
+            return false;
+        }
+        if((operationType.equals(OperationTypeEnum.holdingRegister_rw_03_06.name())||
+                operationType.equals(OperationTypeEnum.holdingRegister_w_06.name()))&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.INT16_AB.name())&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.INT16_BA.name())&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT16_AB.name())&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT16_BA.name())&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.BOOLEAN.name())&&
+                !OriginalDataType.equals(AttributeSourceDataTypeEnum.BITS.name())
+        ){
+            return false;
+        }
+        return true;
+    }
+
+
+    public static  String getOriginalDataTypeIsDateType(String  OriginalDataType){
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.FLOAT_AB_CD.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.FLOAT_CD_AB.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.FLOAT_BA_DC.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.FLOAT_DC_BA.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.DOUBLE.name())){
+            return "DOUBLE";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.BOOLEAN.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.BITS.name())){
+            return "BOOLEAN";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.STRING.name())){
+            return "STRING";
+        }
+        return "INT";
+    }
+
+    public static  String getOriginalDataTypeIsValueRange(String  OriginalDataType){
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.INT16_AB.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.INT16_BA.name())){
+            return "\"valueRange\":{\"min\":-32768,\"max\":32767}";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT16_AB.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT16_BA.name())){
+            return "\"valueRange\":{\"min\":0,\"max\":65535}";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT32_AB_CD.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT32_CD_AB.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT32_BA_DC.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.UINT32_DC_BA.name())){
+            return "\"valueRange\":{\"min\":0,\"max\":4294967295}";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.STRING.name())){
+            return "";
+        }
+        if(OriginalDataType.equals(AttributeSourceDataTypeEnum.BOOLEAN.name())||
+                OriginalDataType.equals(AttributeSourceDataTypeEnum.BITS.name())){
+            return "\"valueRange\":{\"min\":0,\"max\":1}";
+        }
+        return "\"valueRange\":{\"min\":-2147483648,\"max\":2147483647}";
+    }
+
+    public static String getOperationTypeIsRw(String operationType){
+        String []rw = operationType.split("_");
+        return rw[1].equals("r")?"r":"rw";
+    }
+
+    public static Boolean getOperationTypeIsWriteOnly(String operationType){
+        String rw =  getOperationTypeIsRw(operationType);
+        if(rw.equals("r")){//只读为false
+            return false;
+        }
+        return true;
+    }
+}

@@ -451,6 +451,12 @@ caffeine:
     sceneReact:
       timeToLiveInMinutes: "${CACHE_SPECS_SCENE_TTL:1440}"
       maxSize: "${CACHE_SPECS_SCENE_MAX_SIZE:10000}"
+    tkSipCacheName:
+      timeToLiveInMinutes: "${CACHE_SPECS_TK_SIP_TTL:1440}"
+      maxSize: "${CACHE_SPECS_TK_SIP_MAX_SIZE:10000}"
+    tkMediaServerCacheName:
+      timeToLiveInMinutes: "${CACHE_SPECS_TK_MEDIA_SERVER_TTL:1440}"
+      maxSize: "${CACHE_SPECS_TK_MEDIA_SERVER_MAX_SIZE:10000}"
 redis:
   # standalone or cluster
   connection:
@@ -476,7 +482,7 @@ redis:
   # db index
   db: "${REDIS_DB:0}"
   # db password
-  password: "${REDIS_PASSWORD:}"
+  password: "${REDIS_PASSWORD:redis@6379}"
   # pool config
   pool_config:
     maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
@@ -712,6 +718,9 @@ transport:
       # Skip certificate validity check for client certificates.
       skip_validity_check_for_client_cert: "${MQTT_SSL_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT:false}"
   # Local CoAP transport parameters
+  gbt28181:
+    # Enable/disable gbt28181 transport protocol.
+    enabled: "${GBT28181_ENABLED:false}"
   tcp:
     # Enable/disable tcp transport protocol.
     enabled: "${TCP_ENABLED:true}"
@@ -1218,3 +1227,45 @@ logging:
 frp:
   server:
     address: ${FRP_SERVER_ADDRESS:http://127.0.0.1}
+sip:
+  # [必须修改] 本机的IP，对应你的网卡，监听什么ip就是使用什么网卡，
+  # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
+  # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
+  # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
+  ip: ${GBT28181_SIP_IP:127.0.0.1}
+  # [可选] 28181服务监听的端口
+  port: ${GBT28181_SIP_PORT:5060}
+  #[可选]
+  id: ${GBT28181_SIP_ID:51010700599000000001}
+  # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
+  # 后两位为行业编码，定义参照附录D.3
+  # 标识四川成都武侯下区 信息行业接入
+  # [可选]
+  domain: ${GBT28181_SIP_DOMAIN:5101070059}
+  #[可选]
+  password: ${GBT28181_SIP_PASSWORD:61332286}
+#zlm 默认服务器配置
+media:
+  id: ${GBT28181_MEDIA_GENERAL_ID:D2okJWKKaQ5bX7Va}
+  # [必须修改] zlm服务器的内网IP
+  ip: ${GBT28181_MEDIA_IP:127.0.0.1}
+  # [必须修改] zlm服务器的http.port
+  http-port: ${GBT28181_MEDIA_HTTP_PORT:28080}
+  # [可选] zlm服务器的hook.admin_params=secret
+  secret: ${GBT28181_MEDIA_API_SECRET:QhrTN7k6HcDnt0YyeolwHwiVYDgIHPMZ}
+  # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
+  rtp:
+    # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
+    enable: true
+    # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
+    port-range: ${GBT28181_MEDIA_RTP_PORT_RANGE:30000,30500} # 端口范围
+    # [可选] 国标级联在此范围内选择端口发送媒体流,
+    send-port-range: ${GBT28181_MEDIA_RTP_PORT_RANGE:30000,30500} # 端口范围
+  # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
+  record-assist-port: 0
+  defaultStateCheckIntervalInSec: "${DEFAULT_STATE_CHECK_INTERVAL:10}"
+
+thingskit:
+  release:
+    version: v1.1.1 Release
+    date: 20230630

@@ -8,7 +8,7 @@
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,in
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -130,10 +130,7 @@ message SessionEventMsg {
   SessionEvent event = 2;
 }
 
-//thingskit
-message PostEventMsg {
-  repeated KeyValueProto kv = 1;
-}
+
 message PostTelemetryMsg {
   repeated TsKvListProto tsKvList = 1;
 }
@@ -682,6 +679,7 @@ message TransportApiRequestMsg {
 
   //Thingskit function
   ScriptProto script = 14;
+  Gbt28181RequestMsg gbt28181RequestMsg = 15;
 }
 
 /* Response from ThingsBoard Core Service to Transport Service */
@@ -699,6 +697,7 @@ message TransportApiResponseMsg {
 
   //Thingskit function
   repeated ScriptProto scriptsResponseMsg = 11;
+  Gbt28181ResponseMsg gbt28181ResponseMsg = 12;
 }
 
 /* Messages that are handled by ThingsBoard Core Service */
@@ -795,3 +794,37 @@ message ScriptProto{
   string convertJs = 6;
   int32 status = 7;
 }
+//thingskit function 设备上报的物模型事件
+message PostEventMsg {
+  repeated KeyValueProto kv = 1;
+}
+message Gbt28181RequestMsg{
+  bytes context = 1;
+  string contextType = 2;
+  string callId = 3;
+  string fromTag = 4;
+  string toTag = 5;
+  string viaTag = 6;
+  string viaBranch = 7;
+  int32 sn = 8;
+  int64 tenantIdMSB = 9;
+  int64 tenantIdLSB = 10;
+  int64 entityIdMSB = 11;
+  int64 entityIdLSB = 12;
+}
+message Gbt28181ResponseMsg{
+  bytes context = 1;
+  string contextType = 2;
+  string callId = 3;
+  string fromTag = 4;
+  string toTag = 5;
+  string viaTag = 6;
+  string viaBranch = 7;
+  int32 sn = 8;
+  int64 tenantIdMSB = 9;
+  int64 tenantIdLSB = 10;
+  int64 entityIdMSB = 11;
+  int64 entityIdLSB = 12;
+}
+
+

@@ -48,6 +48,8 @@ public class DataConstants {
     public static final String HTTP_TRANSPORT_NAME = "HTTP";
     public static final String SNMP_TRANSPORT_NAME = "SNMP";
 
+    public static final String GBT_28181 = "GBT28181";
+
 
     public static final String[] allScopes() {
         return new String[]{CLIENT_SCOPE, SHARED_SCOPE, SERVER_SCOPE};

@@ -21,5 +21,6 @@ public enum DeviceTransportType {
     TCP,
     COAP,
     LWM2M,
-    SNMP
+    SNMP,
+    GBT28181
 }

@@ -34,6 +34,7 @@ import java.io.Serializable;
         @JsonSubTypes.Type(value = DefaultDeviceTransportConfiguration.class, name = "DEFAULT"),
         @JsonSubTypes.Type(value = MqttDeviceTransportConfiguration.class, name = "MQTT"),
         @JsonSubTypes.Type(value = TkTcpDeviceTransportConfiguration.class, name = "TCP"),
+        @JsonSubTypes.Type(value = TkGBTDeviceTransportConfiguration.class, name = "GBT28181"),
         @JsonSubTypes.Type(value = CoapDeviceTransportConfiguration.class, name = "COAP"),
         @JsonSubTypes.Type(value = Lwm2mDeviceTransportConfiguration.class, name = "LWM2M"),
         @JsonSubTypes.Type(value = SnmpDeviceTransportConfiguration.class, name = "SNMP")})

+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.device.data;
+import lombok.Data;
+import org.thingsboard.server.common.data.DeviceTransportType;
+
+@Data
+public class TkGBTDeviceTransportConfiguration implements DeviceTransportConfiguration {
+    @Override
+    public DeviceTransportType getType() {
+        return DeviceTransportType.GBT28181;
+    }
+
+}

@@ -32,6 +32,7 @@ import java.io.Serializable;
         @JsonSubTypes.Type(value = DefaultDeviceProfileTransportConfiguration.class, name = "DEFAULT"),
         @JsonSubTypes.Type(value = MqttDeviceProfileTransportConfiguration.class, name = "MQTT"),
         @JsonSubTypes.Type(value = TkTcpDeviceProfileTransportConfiguration.class, name = "TCP"),
+        @JsonSubTypes.Type(value = TkGBT28181DeviceProfileTransportConfiguration.class, name = "GBT28181"),
         @JsonSubTypes.Type(value = Lwm2mDeviceProfileTransportConfiguration.class, name = "LWM2M"),
         @JsonSubTypes.Type(value = CoapDeviceProfileTransportConfiguration.class, name = "COAP"),
         @JsonSubTypes.Type(value = SnmpDeviceProfileTransportConfiguration.class, name = "SNMP")

+package org.thingsboard.server.common.data.device.profile;
+
+import lombok.Data;
+import org.thingsboard.server.common.data.DeviceTransportType;
+
+@Data
+public class TkGBT28181DeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
+    @Override
+    public DeviceTransportType getType() {
+        return DeviceTransportType.GBT28181;
+    }
+
+
+}

@@ -3,6 +3,7 @@ package org.thingsboard.server.common.data.device.profile;
 import lombok.Data;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.validation.NoXss;
+import org.thingsboard.server.common.data.yunteng.enums.ProtocolAnalysisEnum;
 
 @Data
 public class TkTcpDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
@@ -26,6 +27,12 @@ public class TkTcpDeviceProfileTransportConfiguration implements DeviceProfileTr
     @NoXss
     private String downScriptId;
 
+    /**
+     * 协议: 默认自定义
+     */
+    @NoXss
+    private ProtocolAnalysisEnum protocol = ProtocolAnalysisEnum.CUSTOM;
+
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.TCP;

 package org.thingsboard.server.common.data.yunteng.common;
 
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
 
 public interface TkCommonService {
   /**
@@ -11,6 +12,4 @@ public interface TkCommonService {
    * @return 返回字典Item表
    */
   SysDictItemDTO getDictValueByCodeAndText(String dictCode, String codeValue);
-
-
 }

+package org.thingsboard.server.common.data.yunteng.common.media;
+
+public interface CommonCallback<T>{
+    void run(T t);
+}

+package org.thingsboard.server.common.data.yunteng.common.media;
+
+import java.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.yunteng.config.media.UserSetting;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
+import org.thingsboard.server.common.data.yunteng.dto.sip.SipMessageHeaderDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.SsrcTransactionDTO;
+import org.thingsboard.server.common.data.yunteng.enums.SessionTypeEnum;
+
+/** 视频流session管理器，管理视频预览、预览回放的通信句柄 */
+@Component
+@Slf4j
+public class VideoStreamSessionManager {
+
+  @Autowired private UserSetting userSetting;
+  @Autowired private CacheUtils cacheUtils;
+  private final String cacheName = FastIotConstants.MediaServerKey.MEDIA_SERVER_CACHE_NAME;
+
+  /**
+   * 添加一个点播/回放的事务信息 后续可以通过流Id/callID
+   *
+   * @param cameraCode 设备ID
+   * @param channelId 通道ID
+   * @param callId 一次请求的CallID
+   * @param stream 流名称
+   * @param mediaServerId 所使用的流媒体ID
+   */
+  public void put(
+      String cameraCode,
+      String channelId,
+      String callId,
+      String stream,
+      String ssrc,
+      SipMessageHeaderDTO sipMessage,
+      String mediaServerId,
+      SessionTypeEnum type) {
+
+    SsrcTransactionDTO ssrcTransaction = new SsrcTransactionDTO();
+    ssrcTransaction.setCameraCode(cameraCode);
+    ssrcTransaction.setChannelId(channelId);
+    ssrcTransaction.setStream(stream);
+    ssrcTransaction.setSipTransactionInfo(sipMessage);
+    ssrcTransaction.setCallId(callId);
+    ssrcTransaction.setSsrc(ssrc);
+    ssrcTransaction.setMediaServerId(mediaServerId);
+    ssrcTransaction.setType(type);
+    String fullKey = buildTransactionFullKey(cameraCode, channelId, callId, stream);
+    String channelKey = buildTransactionChannelKey(cameraCode, channelId, stream);
+    String streamKey = buildTransactionStreamKey(stream);
+    String cameraKey = buildTransactionCameraKey(cameraCode);
+
+    freshTransactionKey(cameraKey, fullKey, false);
+    freshTransactionKey(streamKey, fullKey, false);
+    freshTransactionKey(channelKey, fullKey, false);
+    cacheUtils.put(cacheName, fullKey, ssrcTransaction);
+  }
+
+  private void freshTransactionKey(String key, String val, boolean remove) {
+    Optional<Set<String>> cameraDatas = cacheUtils.get(cacheName, key);
+    Set<String> values = new HashSet<>();
+    cameraDatas.ifPresent(values::addAll);
+    if (remove) {
+      values.remove(val);
+    } else {
+      values.add(val);
+    }
+    cacheUtils.put(cacheName, key, values);
+  }
+
+  public Optional<Set<String>> getSsrcTransactionCamaraKey(String cameraCode) {
+    return cacheUtils.get(cacheName, buildTransactionCameraKey(cameraCode));
+  }
+
+  public Optional<Set<String>> getSsrcTransactionStreamKey(String stream) {
+    return cacheUtils.get(cacheName, buildTransactionStreamKey(stream));
+  }
+
+  public Optional<Set<String>> getSsrcTransactionChannelKey(
+      String cameraCode, String channelId, String stream) {
+    return cacheUtils.get(cacheName, buildTransactionChannelKey(cameraCode, channelId, stream));
+  }
+
+  public Optional<SsrcTransactionDTO> getSsrcTransaction(String fullKey) {
+    return cacheUtils.get(cacheName, fullKey);
+  }
+  public Optional<SsrcTransactionDTO> getSsrcTransaction(String cameraCode, String channelId, String stream) {
+    Optional<Set<String>> keys =getSsrcTransactionChannelKey(cameraCode, channelId,stream);
+
+    if(keys.isPresent()){
+      Optional<String> fullKey =keys.get().stream().findFirst();
+      if(fullKey.isPresent()){
+        return getSsrcTransaction(fullKey.get());
+      }
+    }
+    return Optional.empty();
+  }
+
+  public String getMediaServerId(String deviceId, String channelId, String stream) {
+    Optional<Set<String>> channels = getSsrcTransactionChannelKey(deviceId, channelId, stream);
+    if (channels.isPresent()) {
+      for (String fullKey : channels.get()) {
+        Optional<SsrcTransactionDTO> result = getSsrcTransaction(fullKey);
+        if (result.isPresent()) {
+          return result.get().getMediaServerId();
+        }
+      }
+    }
+    return null;
+  }
+
+  public String getSSRC(String deviceId, String channelId, String stream) {
+    Optional<Set<String>> channels = getSsrcTransactionChannelKey(deviceId, channelId, stream);
+
+    if (channels.isPresent()) {
+      for (String fullKey : channels.get()) {
+        Optional<SsrcTransactionDTO> result = getSsrcTransaction(fullKey);
+        if (result.isPresent()) {
+          return result.get().getSsrc();
+        }
+      }
+    }
+    return null;
+  }
+
+  public void remove(String cameraCode, String channelId, String stream) {
+    Optional<Set<String>> channelKeys = getSsrcTransactionChannelKey(cameraCode, channelId, stream);
+    channelKeys.ifPresent(
+        keys -> {
+          keys.forEach(
+              fullKey -> {
+                String streamKey = buildTransactionStreamKey(stream);
+                String cameraKey = buildTransactionCameraKey(cameraCode);
+                String channelKey = buildTransactionChannelKey(cameraCode, channelId, stream);
+                freshTransactionKey(cameraKey, fullKey, true);
+                freshTransactionKey(streamKey, fullKey, true);
+                freshTransactionKey(channelKey, fullKey, true);
+                cacheUtils.invalidate(cacheName, fullKey);
+              });
+        });
+  }
+
+  public String buildTransactionFullKey(
+      String cameraCode, String channelId, String callId, String stream) {
+    return FastIotConstants.MediaServerKey.MEDIA_TRANSACTION_USED_PREFIX
+        + userSetting.getServerId()
+        + "_"
+        + cameraCode
+        + "_"
+        + channelId
+        + "_"
+        + callId
+        + "_"
+        + stream;
+  }
+
+  public String buildTransactionChannelKey(String cameraCode, String channelId, String stream) {
+    return FastIotConstants.MediaServerKey.MEDIA_TRANSACTION_USED_PREFIX
+        + userSetting.getServerId()
+        + "_"
+        + cameraCode
+        + "_"
+        + channelId
+        + "_"
+        + stream;
+  }
+
+  public String buildTransactionStreamKey(String stream) {
+    return FastIotConstants.MediaServerKey.MEDIA_TRANSACTION_USED_PREFIX
+        + userSetting.getServerId()
+        + "_"
+        + stream;
+  }
+
+  public String buildTransactionCameraKey(String cameraCode) {
+    return FastIotConstants.MediaServerKey.MEDIA_TRANSACTION_USED_PREFIX
+        + userSetting.getServerId()
+        + "_"
+        + cameraCode;
+  }
+
+  public String getReceiveRtpKey(String ssrcStream) {
+    return FastIotConstants.CacheSipKey.TK_OTHER_RECEIVE_RTP_INFO
+        + userSetting.getServerId()
+        + "_"
+        + ssrcStream;
+  }
+
+  public String getReceivePsKey(String ssrcStream) {
+    return FastIotConstants.CacheSipKey.TK_OTHER_RECEIVE_PS_INFO
+        + userSetting.getServerId()
+        + "_"
+        + ssrcStream;
+  }
+}

+package org.thingsboard.server.common.data.yunteng.common.media;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.sip.hook.IHookSubscribe;
+import org.thingsboard.server.common.data.yunteng.enums.HookTypeEnum;
+
+/**
+ * ZLMediaServer的hook事件订阅
+ *
+ * @author lin
+ */
+@Component
+public class ZlmHttpHookSubscribe {
+
+  @FunctionalInterface
+  public interface Event {
+    void response(MediaServerDTO mediaServerInfo, JsonNode response);
+  }
+
+  private Map<HookTypeEnum, Map<IHookSubscribe, Event>> allSubscribes = new ConcurrentHashMap<>();
+
+  public void addSubscribe(IHookSubscribe hookSubscribe, Event event) {
+    if (hookSubscribe.getExpires() == null) {
+      // 默认5分钟过期
+      Instant expiresInstant = Instant.now().plusSeconds(TimeUnit.MINUTES.toSeconds(5));
+      hookSubscribe.setExpires(LocalDateTime.ofInstant(expiresInstant, ZoneId.systemDefault()));
+    }
+    allSubscribes
+        .computeIfAbsent(hookSubscribe.getHookType(), k -> new ConcurrentHashMap<>())
+        .put(hookSubscribe, event);
+  }
+
+  public Event sendNotify(HookTypeEnum type, JsonNode hookResponse) {
+    Event event = null;
+    Map<IHookSubscribe, Event> eventMap = allSubscribes.get(type);
+    if (eventMap == null) {
+      return null;
+    }
+    for (IHookSubscribe key : eventMap.keySet()) {
+      Boolean result = null;
+      // 使用 fields() 方法获取键值对迭代器
+      Iterator<Map.Entry<String, JsonNode>> fieldsIterator = key.getContent().fields();
+      while (fieldsIterator.hasNext()) {
+        Map.Entry<String, JsonNode> field = fieldsIterator.next();
+        String s = field.getKey();
+        JsonNode value = field.getValue();
+        if (result == null) {
+          result = value.equals(hookResponse.get(s));
+        } else {
+          if (value == null) {
+            continue;
+          }
+          result = result && value.equals(hookResponse.get(s));
+        }
+      }
+      if (null != result && result) {
+        event = eventMap.get(key);
+      }
+    }
+    return event;
+  }
+
+  public void removeSubscribe(IHookSubscribe hookSubscribe) {
+    Map<IHookSubscribe, Event> eventMap = allSubscribes.get(hookSubscribe.getHookType());
+    if (eventMap == null) {
+      return;
+    }
+
+    Set<Map.Entry<IHookSubscribe, Event>> entries = eventMap.entrySet();
+    if (entries.size() > 0) {
+      List<Map.Entry<IHookSubscribe, Event>> entriesToRemove = new ArrayList<>();
+      for (Map.Entry<IHookSubscribe, Event> entry : entries) {
+        ObjectNode content = entry.getKey().getContent();
+        if (content == null || content.size() == 0) {
+          entriesToRemove.add(entry);
+          continue;
+        }
+        Boolean result = null;
+        Iterator<Map.Entry<String, JsonNode>> fieldsIterator = content.fields();
+        while (fieldsIterator.hasNext()) {
+          Map.Entry<String, JsonNode> field = fieldsIterator.next();
+          String s = field.getKey();
+          JsonNode value = field.getValue();
+          if (result == null) {
+            result = value.equals(hookSubscribe.getContent().get(s));
+          } else {
+            if (value == null) {
+              continue;
+            }
+            result = result && value.equals(hookSubscribe.getContent().get(s));
+          }
+        }
+        if (result) {
+          entriesToRemove.add(entry);
+        }
+      }
+
+      if (!CollectionUtils.isEmpty(entriesToRemove)) {
+        for (Map.Entry<IHookSubscribe, Event> entry : entriesToRemove) {
+          entries.remove(entry);
+        }
+      }
+    }
+  }
+
+  /**
+   * 获取某个类型的所有的订阅
+   *
+   * @param type
+   * @return
+   */
+  public List<Event> getSubscribes(HookTypeEnum type) {
+    Map<IHookSubscribe, Event> eventMap = allSubscribes.get(type);
+    if (eventMap == null) {
+      return null;
+    }
+    List<Event> result = new ArrayList<>();
+    for (IHookSubscribe key : eventMap.keySet()) {
+      result.add(eventMap.get(key));
+    }
+    return result;
+  }
+
+  public List<IHookSubscribe> getAll() {
+    ArrayList<IHookSubscribe> result = new ArrayList<>();
+    Collection<Map<IHookSubscribe, Event>> values = allSubscribes.values();
+    for (Map<IHookSubscribe, Event> value : values) {
+      result.addAll(value.keySet());
+    }
+    return result;
+  }
+
+  /** 对订阅数据进行过期清理 */
+  @Scheduled(cron = "0 0/5 * * * ?") // 每5分钟执行一次
+  public void execute() {
+
+    Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
+    LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+    int total = 0;
+    for (HookTypeEnum hookType : allSubscribes.keySet()) {
+      Map<IHookSubscribe, Event> hookSubscribeEventMap = allSubscribes.get(hookType);
+      if (hookSubscribeEventMap.size() > 0) {
+        for (IHookSubscribe hookSubscribe : hookSubscribeEventMap.keySet()) {
+          if (hookSubscribe.getExpires().isBefore(localDateTime)) {
+            // 过期的
+            hookSubscribeEventMap.remove(hookSubscribe);
+            total++;
+          }
+        }
+      }
+    }
+  }
+}

+package org.thingsboard.server.common.data.yunteng.config.media;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+/**
+ * 配置文件里面的流媒体配置信息
+ */
+@ConfigurationProperties(prefix = "media")
+@Component
+@Data
+@Slf4j
+public class MediaConfig {
+  @Value("${media.id}")
+  private String mediaServerId;
+
+  @Value("${media.ip}")
+  private String ip;
+
+  @Value("${media.hook-ip:}")
+  private String hookIp;
+
+  @Value("${sip.ip}")
+  private String sipIp;
+
+  @Value("${sip.domain}")
+  private String sipDomain;
+
+  @Value("${media.sdp-ip:${media.ip}}")
+  private String sdpIp;
+
+  @Value("${media.stream-ip:${media.ip}}")
+  private String streamIp;
+
+  @Value("${media.http-port}")
+  private Integer httpPort;
+
+  @Value("${media.http-ssl-port:0}")
+  private Integer httpSslPort = 0;
+
+  @Value("${media.rtmp-port:0}")
+  private Integer rtmpPort = 0;
+
+  @Value("${media.rtmp-ssl-port:0}")
+  private Integer rtmpSslPort = 0;
+
+  @Value("${media.rtp-proxy-port:0}")
+  private Integer rtpProxyPort = 0;
+
+  @Value("${media.rtsp-port:0}")
+  private Integer rtspPort = 0;
+
+  @Value("${media.rtsp-ssl-port:0}")
+  private Integer rtspSslPort = 0;
+
+  @Value("${media.auto-config:true}")
+  private boolean autoConfig = true;
+
+  @Value("${media.secret}")
+  private String secret;
+
+  @Value("${media.rtp.enable}")
+  private boolean rtpEnable;
+
+  @Value("${media.rtp.port-range}")
+  private String rtpPortRange;
+
+  @Value("${media.rtp.send-port-range}")
+  private String rtpSendPortRange;
+
+  @Value("${media.record-assist-port:0}")
+  private Integer recordAssistPort = 0;
+  private boolean status;
+
+  public MediaServerDTO getMediaSerItem() {
+    MediaServerDTO mediaServerItem = new MediaServerDTO();
+    mediaServerItem.setMediaServerId(mediaServerId);
+    mediaServerItem.setIp(ip);
+    mediaServerItem.setDefaultServer(true);
+    mediaServerItem.setHookIp(getHookIp());
+    mediaServerItem.setSdpIp(getSdpIp());
+    mediaServerItem.setStreamIp(getStreamIp());
+    mediaServerItem.setHttpPort(httpPort);
+    mediaServerItem.setHttpSslPort(httpSslPort);
+    mediaServerItem.setRtmpPort(rtmpPort);
+    mediaServerItem.setRtmpSslPort(rtmpSslPort);
+    mediaServerItem.setRtpProxyPort(getRtpProxyPort());
+    mediaServerItem.setRtspPort(rtspPort);
+    mediaServerItem.setRtspSslPort(rtspSslPort);
+    mediaServerItem.setAutoConfig(autoConfig);
+    mediaServerItem.setSecret(secret);
+    mediaServerItem.setRtpEnable(rtpEnable);
+    mediaServerItem.setRtpPortRange(rtpPortRange);
+    mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
+    mediaServerItem.setRecordAssistPort(recordAssistPort);
+    mediaServerItem.setHookAliveInterval(30.00f);
+    mediaServerItem.setStatus(status);
+    return mediaServerItem;
+  }
+
+  public String getHookIp() {
+    if (ObjectUtils.isEmpty(hookIp)) {
+      return sipIp.split(",")[0];
+    } else {
+      return hookIp;
+    }
+  }
+
+  public String getSipIp() {
+    if (sipIp == null) {
+      return this.ip;
+    } else {
+      return sipIp;
+    }
+  }
+
+  public int getRtpProxyPort() {
+    return Objects.requireNonNullElse(rtpProxyPort, 0);
+  }
+
+  public String getSdpIp() {
+    if (ObjectUtils.isEmpty(sdpIp)) {
+      return ip;
+    } else {
+      if (isValidIPAddress(sdpIp)) {
+        return sdpIp;
+      } else {
+        // 按照域名解析
+        String hostAddress = null;
+        try {
+          hostAddress = InetAddress.getByName(sdpIp).getHostAddress();
+        } catch (UnknownHostException e) {
+          log.error("[获取SDP IP]: 域名解析失败");
+        }
+        return hostAddress;
+      }
+    }
+  }
+
+  public String getStreamIp() {
+    if (ObjectUtils.isEmpty(streamIp)) {
+      return ip;
+    } else {
+      return streamIp;
+    }
+  }
+
+  private boolean isValidIPAddress(String ipAddress) {
+    if ((ipAddress != null) && (!ipAddress.isEmpty())) {
+      return Pattern.matches(
+          "^([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}$",
+          ipAddress);
+    }
+    return false;
+  }
+}

+package org.thingsboard.server.common.data.yunteng.config.media;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "sip")
+@Component
+@Data
+public class SipConfig {
+    private String ip;
+    private String showIp;
+    private Integer port;
+    private String id;
+    private String domain;
+    private String password;
+    Integer ptzSpeed = 50;
+    Integer registerTimeInterval = 120;
+    private boolean alarm;
+
+    public String getShowIp() {
+        if (this.showIp == null) {
+            return this.ip;
+        }
+        return showIp;
+    }
+}

+package org.thingsboard.server.common.data.yunteng.config.media;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class ThingsKitVersionConfig {
+  @Value("${thingskit.release.version}")
+  private String releaseVersion;
+
+  @Value("${thingskit.release.date}")
+  private String releaseDate;
+}

+package org.thingsboard.server.common.data.yunteng.config.media;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "user-settings")
+@Component
+@Data
+public class UserSetting {
+    private String serverId = "000000";
+    private Boolean seniorSdp = Boolean.FALSE;
+    private Boolean pushAuthority = Boolean.TRUE;
+    private Boolean recordSip = Boolean.TRUE;
+    private Boolean recordPushLive = Boolean.TRUE;
+    private String recordPath = null;
+    private Boolean streamOnDemand = Boolean.TRUE;
+    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;
+    private Integer playTimeout = 30000;
+}

+package org.thingsboard.server.common.data.yunteng.config.media;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/** ZLMediaKit流媒体配置文件，具体配置说明可以参考ZLMediaKit的config.ini文件 */
+@Data
+public class ZLMediaKitServerConfig {
+  @JsonProperty(value = "api.apiDebug")
+  private String apiDebug;
+
+  @JsonProperty(value = "api.secret")
+  private String apiSecret;
+
+  @JsonProperty(value = "api.snapRoot")
+  private String apiSnapRoot;
+
+  @JsonProperty(value = "api.defaultSnap")
+  private String apiDefaultSnap;
+
+  @JsonProperty(value = "ffmpeg.bin")
+  private String ffmpegBin;
+
+  @JsonProperty(value = "ffmpeg.cmd")
+  private String ffmpegCmd;
+
+  @JsonProperty(value = "ffmpeg.snap")
+  private String ffmpegSnap;
+
+  @JsonProperty(value = "ffmpeg.log")
+  private String ffmpegLog;
+
+  @JsonProperty(value = "ffmpeg.restart_sec")
+  private String ffmpegRestartSec;
+
+  @JsonProperty(value = "protocol.modify_stamp")
+  private String protocolModifyStamp;
+
+  @JsonProperty(value = "protocol.enable_audio")
+  private String protocolEnableAudio;
+
+  @JsonProperty(value = "protocol.add_mute_audio")
+  private String protocolAddMuteAudio;
+
+  @JsonProperty(value = "protocol.continue_push_ms")
+  private String protocolContinuePushMs;
+
+  @JsonProperty(value = "protocol.enable_hls")
+  private String protocolEnableHls;
+
+  @JsonProperty(value = "protocol.enable_mp4")
+  private String protocolEnableMp4;
+
+  @JsonProperty(value = "protocol.enable_rtsp")
+  private String protocolEnableRtsp;
+
+  @JsonProperty(value = "protocol.enable_rtmp")
+  private String protocolEnableRtmp;
+
+  @JsonProperty(value = "protocol.enable_ts")
+  private String protocolEnableTs;
+
+  @JsonProperty(value = "protocol.enable_fmp4")
+  private String protocolEnableFmp4;
+
+  @JsonProperty(value = "protocol.mp4_as_player")
+  private String protocolMp4AsPlayer;
+
+  @JsonProperty(value = "protocol.mp4_max_second")
+  private String protocolMp4MaxSecond;
+
+  @JsonProperty(value = "protocol.mp4_save_path")
+  private String protocolMp4SavePath;
+
+  @JsonProperty(value = "protocol.hls_save_path")
+  private String protocolHlsSavePath;
+
+  @JsonProperty(value = "protocol.hls_demand")
+  private String protocolHlsDemand;
+
+  @JsonProperty(value = "protocol.rtsp_demand")
+  private String protocolRtspDemand;
+
+  @JsonProperty(value = "protocol.rtmp_demand")
+  private String protocolRtmpDemand;
+
+  @JsonProperty(value = "protocol.ts_demand")
+  private String protocolTsDemand;
+
+  @JsonProperty(value = "protocol.fmp4_demand")
+  private String protocolFmp4Demand;
+
+  @JsonProperty(value = "general.enableVhost")
+  private String generalEnableVhost;
+
+  @JsonProperty(value = "general.flowThreshold")
+  private String generalFlowThreshold;
+
+  @JsonProperty(value = "general.maxStreamWaitMS")
+  private String generalMaxStreamWaitMS;
+
+  @JsonProperty(value = "general.streamNoneReaderDelayMS")
+  private int generalStreamNoneReaderDelayMS;
+
+  @JsonProperty(value = "general.resetWhenRePlay")
+  private String generalResetWhenRePlay;
+
+  @JsonProperty(value = "general.mergeWriteMS")
+  private String generalMergeWriteMS;
+
+  @JsonProperty(value = "general.mediaServerId")
+  private String generalMediaServerId;
+
+  @JsonProperty(value = "general.wait_track_ready_ms")
+  private String generalWaitTrackReadyMs;
+
+  @JsonProperty(value = "general.wait_add_track_ms")
+  private String generalWaitAddTrackMs;
+
+  @JsonProperty(value = "general.unready_frame_cache")
+  private String generalUnreadyFrameCache;
+
+  @JsonProperty(value = "hls.fileBufSize")
+  private String hlsFileBufSize;
+
+  @JsonProperty(value = "hls.filePath")
+  private String hlsFilePath;
+
+  @JsonProperty(value = "hls.segDur")
+  private String hlsSegDur;
+
+  @JsonProperty(value = "hls.segNum")
+  private String hlsSegNum;
+
+  @JsonProperty(value = "hls.segRetain")
+  private String hlsSegRetain;
+
+  @JsonProperty(value = "hls.broadcastRecordTs")
+  private String hlsBroadcastRecordTs;
+
+  @JsonProperty(value = "hls.deleteDelaySec")
+  private String hlsDeleteDelaySec;
+
+  @JsonProperty(value = "hls.segKeep")
+  private String hlsSegKeep;
+
+  @JsonProperty(value = "hook.access_file_except_hls")
+  private String hookAccessFileExceptHLS;
+
+  @JsonProperty(value = "hook.admin_params")
+  private String hookAdminParams;
+
+  @JsonProperty(value = "hook.alive_interval")
+  private Float hookAliveInterval;
+
+  @JsonProperty(value = "hook.enable")
+  private String hookEnable;
+
+  @JsonProperty(value = "hook.on_flow_report")
+  private String hookOnFlowReport;
+
+  @JsonProperty(value = "hook.on_http_access")
+  private String hookOnHttpAccess;
+
+  @JsonProperty(value = "hook.on_play")
+  private String hookOnPlay;
+
+  @JsonProperty(value = "hook.on_publish")
+  private String hookOnPublish;
+
+  @JsonProperty(value = "hook.on_record_mp4")
+  private String hookOnRecordMp4;
+
+  @JsonProperty(value = "hook.on_rtsp_auth")
+  private String hookOnRtspAuth;
+
+  @JsonProperty(value = "hook.on_rtsp_realm")
+  private String hookOnRtspRealm;
+
+  @JsonProperty(value = "hook.on_shell_login")
+  private String hookOnShellLogin;
+
+  @JsonProperty(value = "hook.on_stream_changed")
+  private String hookOnStreamChanged;
+
+  @JsonProperty(value = "hook.on_stream_none_reader")
+  private String hookOnStreamNoneReader;
+
+  @JsonProperty(value = "hook.on_stream_not_found")
+  private String hookOnStreamNotFound;
+
+  @JsonProperty(value = "hook.on_server_started")
+  private String hookOnServerStarted;
+
+  @JsonProperty(value = "hook.on_server_keepalive")
+  private String hookOnServerKeepalive;
+
+  @JsonProperty(value = "hook.on_send_rtp_stopped")
+  private String hookOnSendRtpStopped;
+
+  @JsonProperty(value = "hook.on_rtp_server_timeout")
+  private String hookOnRtpServerTimeout;
+
+  @JsonProperty(value = "hook.timeoutSec")
+  private String hookTimeoutSec;
+
+  @JsonProperty(value = "http.charSet")
+  private String httpCharSet;
+
+  @JsonProperty(value = "http.keepAliveSecond")
+  private String httpKeepAliveSecond;
+
+  @JsonProperty(value = "http.maxReqCount")
+  private String httpMaxReqCount;
+
+  @JsonProperty(value = "http.maxReqSize")
+  private String httpMaxReqSize;
+
+  @JsonProperty(value = "http.notFound")
+  private String httpNotFound;
+
+  @JsonProperty(value = "http.port")
+  private int httpPort;
+
+  @JsonProperty(value = "http.rootPath")
+  private String httpRootPath;
+
+  @JsonProperty(value = "http.sendBufSize")
+  private String httpSendBufSize;
+
+  @JsonProperty(value = "http.sslport")
+  private int httpSslPort;
+
+  @JsonProperty(value = "multicast.addrMax")
+  private String multicastAddrMax;
+
+  @JsonProperty(value = "multicast.addrMin")
+  private String multicastAddrMin;
+
+  @JsonProperty(value = "multicast.udpTTL")
+  private String multicastUdpTTL;
+
+  @JsonProperty(value = "record.appName")
+  private String recordAppName;
+
+  @JsonProperty(value = "record.filePath")
+  private String recordFilePath;
+
+  @JsonProperty(value = "record.fileSecond")
+  private String recordFileSecond;
+
+  @JsonProperty(value = "record.sampleMS")
+  private String recordFileSampleMS;
+
+  @JsonProperty(value = "rtmp.handshakeSecond")
+  private String rtmpHandshakeSecond;
+
+  @JsonProperty(value = "rtmp.keepAliveSecond")
+  private String rtmpKeepAliveSecond;
+
+  @JsonProperty(value = "rtmp.modifyStamp")
+  private String rtmpModifyStamp;
+
+  @JsonProperty(value = "rtmp.port")
+  private int rtmpPort;
+
+  @JsonProperty(value = "rtmp.sslport")
+  private int rtmpSslPort;
+
+  @JsonProperty(value = "rtp.audioMtuSize")
+  private String rtpAudioMtuSize;
+
+  @JsonProperty(value = "rtp.clearCount")
+  private String rtpClearCount;
+
+  @JsonProperty(value = "rtp.cycleMS")
+  private String rtpCycleMS;
+
+  @JsonProperty(value = "rtp.maxRtpCount")
+  private String rtpMaxRtpCount;
+
+  @JsonProperty(value = "rtp.videoMtuSize")
+  private String rtpVideoMtuSize;
+
+  @JsonProperty(value = "rtp_proxy.checkSource")
+  private String rtpProxyCheckSource;
+
+  @JsonProperty(value = "rtp_proxy.dumpDir")
+  private String rtpProxyDumpDir;
+
+  @JsonProperty(value = "rtp_proxy.port")
+  private int rtpProxyPort;
+
+  @JsonProperty(value = "rtp_proxy.port_range")
+  private String portRange;
+
+  @JsonProperty(value = "rtp_proxy.timeoutSec")
+  private String rtpProxyTimeoutSec;
+
+  @JsonProperty(value = "rtsp.authBasic")
+  private String rtspAuthBasic;
+
+  @JsonProperty(value = "rtsp.handshakeSecond")
+  private String rtspHandshakeSecond;
+
+  @JsonProperty(value = "rtsp.keepAliveSecond")
+  private String rtspKeepAliveSecond;
+
+  @JsonProperty(value = "rtsp.port")
+  private int rtspPort;
+
+  @JsonProperty(value = "rtsp.sslport")
+  private int rtspSslPort;
+
+  @JsonProperty(value = "shell.maxReqSize")
+  private String shellMaxReqSize;
+
+  @JsonProperty(value = "shell.port")
+  private String shellPort;
+
+  @JsonProperty(value = "ip")
+  private String ip;
+
+  private String sdpIp;
+
+  private String streamIp;
+
+  private String hookIp;
+  private String tenantId;
+}

@@ -37,6 +37,175 @@ public interface FastIotConstants {
     String ORGANIZATION = "organization";
     String SCENE_REACT = "sceneReact";
   }
+  interface ModBusRTU{
+    /**
+     * 原始数据类型
+     */
+    String ORIGINAL_DATA_TYPE = "originalDataType";
+    /**
+     * 寄存器地址
+     */
+    String REGISTER_ADDRESS = "registerAddress";
+
+    /**
+     * 操作功能码类型
+     */
+    String OPERATION_TYPE = "operationType";
+    /**
+     * 缩放因子
+     */
+    String SCALE_FACTOR = "scaling";
+
+    /**
+     * 原始hex的标识符
+     */
+    String SOURCE_DATA_IDENTIFY = "source";
+
+    /**
+     * 比特位置
+     */
+    String BIT_MASK = "bitMask";
+  }
+  interface CacheSipKey {
+    String TK_SIP_CACHE_NAME = "tkSipCacheName";
+    String TK_OTHER_RECEIVE_RTP_INFO = "TK_OTHER_RECEIVE_RTP_INFO_";
+
+    String TK_OTHER_RECEIVE_PS_INFO = "TK_OTHER_RECEIVE_PS_INFO_";
+  }
+
+  interface MediaServerKey {
+
+    String MEDIA_SERVER_CACHE_NAME = "tkMediaServerCacheName";
+    String MEDIA_SERVER_PREFIX = "TK_MEDIA_SERVER_";
+    String MEDIA_TRANSACTION_USED_PREFIX = "TK_MEDIA_TRANSACTION_";
+    String MEDIA_SERVERS_ONLINE_PREFIX = "TK_MEDIA_ONLINE_SERVERS_";
+    String MEDIA_STREAM_AUTHORITY = "TK_MEDIA_STREAM_AUTHORITY_";
+
+    /** 点播信息的缓存键 */
+    String PLAYER_PREFIX = "TK_PLAYER";
+
+    /** 回放信息的缓存键 */
+    String PLAY_BACK_PREFIX = "TK_PLAY_BACK";
+
+    String TK_SERVER_STREAM_PREFIX = "TK_SIGNALLING_STREAM_";
+
+    String PLATFORM_SEND_RTP_INFO_PREFIX = "PLATFORM_SEND_RTP_INFO_";
+  }
+
+  interface ZLMediaKitHttpApi {
+    String BASE_URL = "/index/api";
+
+    /** 获取流列表，可选筛选参数 */
+    String GET_MEDIA_LIST = BASE_URL + "/getMediaList";
+
+    /** 获取rtp代理时的某路ssrc rtp信息 */
+    String GET_RTP_INFO = BASE_URL + "/getRtpInfo";
+
+    /** 获取视频流截图 */
+    String GET_STREAM_SNAP = BASE_URL + "/getSnap";
+
+    /** 通过fork FFmpeg进程的方式拉流代理，支持任意协议 */
+    String ADD_FFMPEG_SOURCE = BASE_URL + "/addFFmpegSource";
+
+    /** 关闭ffmpeg拉流代理(流注册成功后，也可以使用close_streams接口替代) */
+    String DEL_FFMPEG_SOURCE = BASE_URL + "/delFFmpegSource";
+
+    /** 获取服务器配置 */
+    String GET_SERVER_CONFIG = BASE_URL + "/getServerConfig";
+
+    /** 设置服务器配置 */
+    String SET_SERVER_CONFIG = BASE_URL + "/setServerConfig";
+
+    /** 创建GB28181 RTP接收端口，如果该端口接收数据超时，则会自动被回收(不用调用closeRtpServer接口) */
+    String OPEN_RTP_SERVER = BASE_URL + "/openRtpServer";
+
+    /** 关闭GB28181 RTP接收端口 */
+    String CLOSE_RTP_SERVER = BASE_URL + "/closeRtpServer";
+
+    /**
+     * 作为GB28181客户端，启动ps-rtp推流，支持rtp/udp方式；该接口支持rtsp/rtmp等协议转ps-rtp推流。
+     * 第一次推流失败会直接返回错误，成功一次后，后续失败也将无限重试。
+     */
+    String START_SEND_RTP = BASE_URL + "/startSendRtp";
+
+    /** 停止GB28181 ps-rtp推流 */
+    String STOP_SEND_RTP = BASE_URL + "/stopSendRtp";
+
+    /** 重启服务器,只有Daemon方式才能重启，否则是直接关闭！ */
+    String RESTART_SERVER = BASE_URL + "/restartServer";
+  }
+
+  interface ZLMediaBody {
+    /** 表单数据：异常码 */
+    String CODE = "code";
+
+    /** 表单数据：数据 */
+    String DATA = "data";
+
+    /** 表单数据：异常消息 */
+    String MSG = "msg";
+
+    /** 表单数据：流媒体密钥 */
+    String SECRET = "secret";
+
+    /** 流媒体服务器信息 */
+    String MEDIA = "media";
+
+    /** 流媒体服务器信息:ID */
+    String MEDIA_ID = "mediaId";
+
+    /** 流媒体服务器信息:会话描述协议 */
+    String MEDIA_SDP_IP = "sdpIp";
+
+    /** 数据流服务ID */
+    String SSRCINFO_STREAM = "streamId";
+
+    /** 数据流服务的端口 */
+    String SSRCINFO_PORT = "streamPort";
+
+    /** 同步源标识符 */
+    String SSRCINFO_SSRC = "ssrc";
+
+    /** 流媒体通道ID */
+    String CHANNEL_ID = "channelId";
+
+    /** 流媒体通道ID */
+    String CALL_ID = "callId";
+
+    /** 设备国标编号 */
+    String CAMERA_CODE = "cameraCode";
+
+    /** 方法类型 */
+    String METHOD_TYPE = "methodType";
+
+    /** 请求响应事件：头部标签内容 */
+    String MSG_HEADER = "msgHeader";
+
+    /** 请求响应事件：表单内容 */
+    String MSG_CONTEXT = "msgContext";
+
+    /** 消息类型，例如：查询、控制等 */
+    String MSG_TYPE = "xmlRoot";
+
+    /** 订阅处理结果 */
+    String SESSION_TYPE = "sessionType";
+
+    /** 订阅处理结果 */
+    String SSRC_CHECK = "ssrcCheck";
+  }
+
+  /** 视频流传输模式 */
+  interface StreamMode {
+    /** tcp 被动模式 */
+    String TCP_PASSIVE = "TCP-PASSIVE";
+
+    /** tcp 主动模式 */
+    String TCP_ACTIVE = "TCP-ACTIVE";
+
+    /** udp */
+    String UDP = "UDP";
+  }
+
 
   interface TBCacheConfig {
     String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
@@ -66,6 +235,23 @@ public interface FastIotConstants {
     String NODE = "NODE";
   }
 
+  /**
+   * 首页统计分析指标
+   */
+  interface Statistics {
+    String TRANSPORT_MSG_COUNT_HOURLY = "transportMsgCountHourly";
+    String TRANSPORT_DATAPOINTS_COUNT_HOURLY = "transportDataPointsCountHourly";
+    String CREATED_ALARMS_COUNT_HOURLY = "createdAlarmsCountHourly";
+    String TRANSPORT_MSG_COUNT = "transportMsgCount";
+    String TRANSPORT_DATAPOINTS_COUNT = "transportDataPointsCount";
+    String CREATED_ALARMS_COUNT = "createdAlarmsCount";
+  }
+  /**
+   * 单位转换常量
+   */
+  interface Unit {
+    Long ONE_DAY_MILLISECONDS = 86400000L;
+  }
   class DefaultOrder {
     public static final String CREATE_TIME = "create_time";
   }
@@ -119,6 +305,7 @@ public interface FastIotConstants {
   class MagicNumber {
     public static final int ZERO = 0;
     public static final int ONE = 1;
+    public static final int TWO = 2;
     public static final int TEN = 10;
   }
 
@@ -219,4 +406,22 @@ public interface FastIotConstants {
     public static String TK_MSG_EVENT_NODE = "org.thingsboard.rule.engine.yunteng.event.TkMsgEventNode";
   }
 
+
+  /** 设备扩展信息内容 */
+  interface DeviceAdditional {
+    /** 摄像头信息 */
+    String SIP = "sip";
+
+    /** 设备图片 */
+    String AVATAR = "avatar";
+
+    /** 设备地理位置 */
+    String ADDRESS = "address";
+
+    /** 地理坐标之经度 */
+    String LONGITUDE = "longitude";
+
+    /** 地理坐标之维度 */
+    String LATITUDE = "latitude";
+  }
 }

@@ -133,6 +133,15 @@ public final class ModelConstants {
 
     /** 产品品类表 */
     public static final String TK_DEVICE_PROFILE_CATEGORY = "tk_device_profile_category";
+
+    /** 设备接入信息表 */
+    public static final String TK_DEVICE_ACCESS_INFORMATION = "tk_device_access_information";
+
+    /** ZLMediaKit 流媒体表 */
+    public static final String TK_MEDIA_SERVER_NAME = "tk_media_server";
+
+    /** 视频通道表 */
+    public static final String TK_VIDEO_CHANNEL_NAME = "tk_video_channel";
   }
 
   public static class TableFields {

+package org.thingsboard.server.common.data.yunteng.constant;
+
+public class SipRequestMethodConstants {
+    public static final String ACK = "ACK";
+    public static final String BYE = "BYE";
+    public static final String CANCEL = "CANCEL";
+    public static final String INVITE = "INVITE";
+    public static final String OPTIONS = "OPTIONS";
+    public static final String REGISTER = "REGISTER";
+    public static final String NOTIFY = "NOTIFY";
+    public static final String SUBSCRIBE = "SUBSCRIBE";
+    public static final String MESSAGE = "MESSAGE";
+    public static final String REFER = "REFER";
+
+    public static final String INFO = "INFO";
+    public static final String PRACK = "PRACK";
+
+    public static final String UPDATE = "UPDATE";
+
+    public static final String PUBLISH = "PUBLISH";
+}

@@ -120,6 +120,22 @@ public enum ErrorMessage {
   EZVIZ_API_ERROR(400095,"荧石视频获取TokenAPI调用失败【%s】，错误码【%s】"),
   EZVIZ_GET_URL_ERROR(400096,"荧石API调用获取URL失败！！"),
   IMPORT_TCP_ERROR(400097,"TCP产品不能导入INT,DOUBLE,BOOL,TEXT以外的数据类型属性！！"),
+  SSRC_INFO_NOT_FOUND(400098,"缓存事务信息未找到,设备【%s】 通道【%s】"),
+  VIDEO_CHANNEL_NOT_FOUND(400099,"视频通道不存在"),
+  ONLINE_MEDIA_SERVER_NOT_FOUND(400100,"没有可用的流媒体节点"),
+  FOUND_VIDEO_DEVICE_FAILED(400101,"视频设备SIP信息丢失"),
+  NOT_FOUND_MEDIA_SERVER_FOR_PLAY(400102,"未找到可用于播放的流媒体"),
+  RECEIVE_STREAM_FAILED(400103,"开启收流失败"),
+  GET_PLAY_PORT_FAILED(400104,"从流媒体【%s】获取点播端口异常"),
+  STREAM_INFO_NOT_FOUND_FOR_PLAY(400105,"点播信息未找到"),
+  SIP_COMMAND_SEND_FAILED(400106,"sip命令下发失败"),
+  NOT_BELONG_CURRENT_CUSTOMER(400107,"该数据不属于当前客户"),
+  IMPORT_ERROR(400108,"请使用模板excel重新导入"),
+  INTRANET_ERROR(400109,"内网ip+端口不能重复，请重新输入"),
+  OUTER_NET_ERROR(400110,"外网ip+端口不能重复，请重新输入"),
+
+  DEVICE_NOT_ONLINE(400111,"设备不在线，无法执行相关操作！"),
+  GBT_VIDEO_REPETITION(400112,"该设备通道号视频已存在！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

@@ -128,4 +128,10 @@ public class DeviceDTO extends TenantDTO {
 
   @ApiModelProperty(value = "是否收藏:0否1是")
   private Integer isCollect;
+
+  @ApiModelProperty(value = "OTA升级固件ID")
+  private String firmwareId;
+
+  @ApiModelProperty(value = "OTA升级软件ID")
+  private String softwareId;
 }

@@ -88,6 +88,12 @@ public class DeviceProfileDTO extends BaseDTO {
   @ApiModelProperty(value = "品类名称")
   private String categoryName;
 
+  @ApiModelProperty(value = "OTA升级固件ID")
+  private String firmwareId;
+
+  @ApiModelProperty(value = "OTA升级软件ID")
+  private String softwareId;
+
   public DeviceProfileDTO() {}
 
   public DeviceProfileDTO(

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDeviceAccessInformationDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "内网ip")
+    @NotEmpty(
+            message = "内网ip不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String intranetIp;
+
+    @ApiModelProperty(value = "内网端口")
+    @NotEmpty(
+            message = "内网端口不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String intranetPort;
+
+    @ApiModelProperty(value = "外网IP")
+    @NotEmpty(
+            message = "外网IP不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String outerNetIp;
+
+    @ApiModelProperty(value = "外网端口")
+    private String outerNetPort;
+
+    @ApiModelProperty(value = "设备接入协议")
+    private TransportTypeEnum deviceAgreement;
+
+    @ApiModelProperty(value = "sip扩展信息: serverId  服务器id serverRegion 服务器域  password 密码")
+    private JsonNode sipExtend;
+
+}

@@ -2,6 +2,7 @@ package org.thingsboard.server.common.data.yunteng.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.HexByteOrderEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkModBusCheckType;
 import java.io.Serializable;
 import java.util.List;
@@ -28,4 +29,7 @@ public class TkDeviceRpcDTO implements Serializable {
 
   @ApiModelProperty(value = "寄存器值")
   private List<Integer> registerValues;
+
+  @ApiModelProperty(value = "顺序")
+  private HexByteOrderEnum hexByteOrderEnum;
 }

@@ -32,6 +32,7 @@ public class TkThingsModel implements Serializable {
 
   private JsonNode functionJson;
 
+  private JsonNode extensionDesc;
 
   private Integer status;
 

@@ -26,7 +26,6 @@ public class TkVideoDTO extends TenantDTO {
   private String deviceType;
 
   @ApiModelProperty(value = "摄像头编号/监控点位编号", required = true)
-  @NotEmpty(message = "摄像头编号不能为空或空字符串")
   private String sn;
 
   @ApiModelProperty(value = "组织ID", required = true)
@@ -42,7 +41,7 @@ public class TkVideoDTO extends TenantDTO {
   @ApiModelProperty(value = "摄像头描述")
   private String description;
 
-  @ApiModelProperty(value = "流获取方式：0 手动填写 1平台获取", required = true)
+  @ApiModelProperty(value = "流获取方式：0 手动填写 1平台获取 2 GBT28281", required = true)
   private Integer accessMode;
 
   @ApiModelProperty(value = "平台ID")

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TkVideoGbtDTO extends TenantDTO {
+
+  @ApiModelProperty(value = "组织ID", required = true)
+  @NotEmpty(message = "组织ID不能为空或空字符串")
+  private String organizationId;
+
+  @ApiModelProperty(value = "流获取方式：0 手动填写 1平台获取 2 GBT28281", required = true)
+  private Integer accessMode;
+
+  @ApiModelProperty(value = "多个设备id与通道号")
+  private List<TkVideoGbtDeviceDTO> gbtDeviceDTOS;
+
+  @ApiModelProperty(value = "是否全部设备 0否 1是")
+  private Integer allDevice;
+
+}
\ No newline at end of file

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class TkVideoGbtDeviceDTO {
+
+    @ApiModelProperty(value = "设备id", required = true)
+    @NotEmpty(message = "设备id不能为空")
+    private String deviceID;
+
+    @ApiModelProperty(value = "设备名称", required = true)
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @ApiModelProperty(value = "通道号集合")
+    @NotEmpty(message = "通道号集合不能为空")
+    private List<String> channelNos;
+
+}
\ No newline at end of file

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.CatalogDataStatusEnum;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class CatalogDataDTO {
+  /** 命令序列号 */
+  private int sn;
+
+  private int total;
+  private List<VideoChanelDTO> channelList;
+  private LocalDateTime lastTime;
+  private SipDeviceDTO device;
+  private String errorMsg;
+  private CatalogDataStatusEnum status;
+}

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.util.ObjectUtils;
+import org.thingsboard.server.common.data.yunteng.config.media.ZLMediaKitServerConfig;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MediaServerDTO extends TenantDTO {
+  private static final long serialVersionUID = -2499846994830954839L;
+
+  @ApiModelProperty(value = "流媒体的ID,非主键ID")
+  private String mediaServerId;
+
+  @ApiModelProperty(value = "流媒体的IP")
+  private String ip;
+
+  @ApiModelProperty(value = "hook使用的IP")
+  private String hookIp;
+
+  @ApiModelProperty(value = "SDP IP")
+  private String sdpIp;
+
+  @ApiModelProperty(value = "流IP")
+  private String streamIp;
+
+  @ApiModelProperty(value = "HTTP端口")
+  private Integer httpPort;
+
+  @ApiModelProperty(value = "HTTPS端口")
+  private Integer httpSslPort;
+
+  @ApiModelProperty(value = "RTMP端口")
+  private Integer rtmpPort;
+
+  @ApiModelProperty(value = "RTMP安全协议端口")
+  private Integer rtmpSslPort;
+
+  @ApiModelProperty(value = "RTP收流端口（单端口模式有用）")
+  private Integer rtpProxyPort;
+
+  @ApiModelProperty(value = "RTSP端口")
+  private Integer rtspPort;
+
+  @ApiModelProperty(value = "RTSP安全协议端口")
+  private Integer rtspSslPort;
+
+  @ApiModelProperty(value = "是否开启自动配置ZLMediaKit")
+  private boolean autoConfig;
+
+  @ApiModelProperty(value = "ZLMediaKit鉴权参数")
+  private String secret;
+
+  @ApiModelProperty(value = "keepalive hook触发间隔,单位秒")
+  private Float hookAliveInterval;
+
+  @ApiModelProperty(value = "是否使用多端口模式")
+  private boolean rtpEnable;
+
+  @ApiModelProperty(value = "流媒体服务器的状态")
+  private boolean status;
+
+  @ApiModelProperty(value = "多端口RTP收流端口范围")
+  private String rtpPortRange;
+
+  @ApiModelProperty(value = "RTP发流端口范围")
+  private String sendRtpPortRange;
+
+  @ApiModelProperty(value = "assist服务端口")
+  private Integer recordAssistPort;
+
+  @ApiModelProperty(value = "最后一次心跳时间")
+  private String lastKeepaliveTime;
+
+  @ApiModelProperty(value = "是否是默认ZLM")
+  private boolean defaultServer;
+
+  @ApiModelProperty(value = "当前使用到的端口")
+  private Integer currentPort;
+
+  public MediaServerDTO(){
+
+  }
+  public MediaServerDTO(ZLMediaKitServerConfig zlmServerConfig, String sipIp) {
+    setId(zlmServerConfig.getGeneralMediaServerId());
+    ip = zlmServerConfig.getIp();
+    hookIp = ObjectUtils.isEmpty(zlmServerConfig.getHookIp()) ? sipIp : zlmServerConfig.getHookIp();
+    sdpIp =
+        ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())
+            ? zlmServerConfig.getIp()
+            : zlmServerConfig.getSdpIp();
+    streamIp =
+        ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())
+            ? zlmServerConfig.getIp()
+            : zlmServerConfig.getStreamIp();
+    httpPort = zlmServerConfig.getHttpPort();
+    httpSslPort = zlmServerConfig.getHttpSslPort();
+    rtmpPort = zlmServerConfig.getRtmpPort();
+    rtmpSslPort = zlmServerConfig.getRtmpSslPort();
+    rtpProxyPort = zlmServerConfig.getRtpProxyPort();
+    rtspPort = zlmServerConfig.getRtspPort();
+    rtspSslPort = zlmServerConfig.getRtspSslPort();
+    autoConfig = true; // 默认值true;
+    secret = zlmServerConfig.getApiSecret();
+    hookAliveInterval = zlmServerConfig.getHookAliveInterval();
+    rtpEnable = false; // 默认使用单端口;直到用户自己设置开启多端口
+    rtpPortRange = zlmServerConfig.getPortRange().replace("_", ","); // 默认使用30000,30500作为级联时发送流的端口号
+    recordAssistPort = 0; // 默认关闭
+  }
+}

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum;
+
+import java.io.Serializable;
+
+@Data
+public class PTZCmdDTO implements Serializable {
+
+  @ApiModelProperty(value = "控制指令")
+  private PTZCommandEnum command;
+
+  @ApiModelProperty(value = "水平速度")
+  private int horizonSpeed;
+
+  @ApiModelProperty(value = "垂直速度")
+  private int verticalSpeed;
+
+  @ApiModelProperty(value = "缩放速度")
+  private int zoomSpeed;
+}

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.InviteStreamTypeEnum;
+
+@Data
+public class SendRtpItemDTO {
+  @ApiModelProperty(value = "推流ip")
+  private String ip;
+
+  @ApiModelProperty(value = "推流端口")
+  private int port;
+
+  @ApiModelProperty(value = "推流标识")
+  private String ssrc;
+
+  @ApiModelProperty(value = "平台id")
+  private String platformId;
+
+  @ApiModelProperty(value = "对应设备id")
+  private String deviceId;
+
+  @ApiModelProperty(value = "直播流的应用名")
+  private String app;
+
+  @ApiModelProperty(value = "通道id")
+  private String channelId;
+
+  @ApiModelProperty(value = "推流状态:0 等待设备推流上来 1 等待上级平台回复ack 2 推流中")
+  private int status = 0;
+
+  @ApiModelProperty(value = "设备推流的streamId")
+  private String streamId;
+
+  @ApiModelProperty(value = "是否为tcp")
+  private boolean tcp;
+
+  @ApiModelProperty(value = "是否为tcp主动模式")
+  private boolean tcpActive;
+
+  @ApiModelProperty(value = "自己推流使用的端口")
+  private int localPort;
+
+  @ApiModelProperty(value = "使用的流媒体")
+  private String mediaServerId;
+
+  @ApiModelProperty(value = "使用的服务的ID")
+  private String serverId;
+
+  @ApiModelProperty(value = "invite 的 callId")
+  private String CallId;
+
+  @ApiModelProperty(value = "invite 的 fromTag")
+  private String fromTag;
+
+  @ApiModelProperty(value = "invite 的 toTag")
+  private String toTag;
+
+  @ApiModelProperty(value = "发送时，rtp的pt（uint8_t）,不传时默认为96")
+  private int pt = 96;
+
+  @ApiModelProperty(value = "发送时，rtp的负载类型。为true时，负载为ps；为false时，为es")
+  private boolean usePs = true;
+
+  @ApiModelProperty(value = "当usePs 为false时，有效。为1时，发送音频；为0时，发送视频；不传时默认为0")
+  private boolean onlyAudio = false;
+
+  @ApiModelProperty(value = "是否开启rtcp保活")
+  private boolean rtcp = false;
+
+  @ApiModelProperty(value = "播放类型")
+  private InviteStreamTypeEnum playType;
+}

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+
+import java.io.Serializable;
+
+@Data
+public class SipDeviceDTO implements Serializable {
+  @ApiModelProperty(value = "设备国标编号")
+  private String cameraCode;
+
+  @ApiModelProperty(value = "wan地址")
+  private String hostAddress;
+
+  @ApiModelProperty(value = "设备访问平台的IP")
+  private String localIp;
+
+  @ApiModelProperty(value = "传输协议：UDP/TCP")
+  private String transport;
+
+  @ApiModelProperty(value = "字符集")
+  private String charset;
+
+  @ApiModelProperty(value = "收流IP")
+  private String sdpIp;
+
+  @ApiModelProperty(value = "数据流传输模式:UDP / TCP-ACTIVE：tcp主动模式 / TCP-PASSIVE：tcp被动模式")
+  private String streamMode;
+
+  @ApiModelProperty(value = "通道个数")
+  private Integer channelCount;
+
+  @ApiModelProperty(value = "设备使用的媒体id, 默认为null")
+  private String mediaServerId;
+
+  @ApiModelProperty(value = "是否开启ssrc校验，默认关闭，开启可以防止串流")
+  private boolean ssrcCheck = true;
+  @ApiModelProperty(value = "生产厂商")
+  private String manufacturer;
+
+  @ApiModelProperty(value = "设备名称")
+  private String name;
+
+  @ApiModelProperty(value = "设备型号")
+  private String model;
+
+  @ApiModelProperty(value = "固件版本")
+  private String firmware;
+  public Integer getStreamModeForParam() {
+    if (FastIotConstants.StreamMode.UDP.equalsIgnoreCase(streamMode)) {
+      return 0;
+    }else if (FastIotConstants.StreamMode.TCP_PASSIVE.equalsIgnoreCase(streamMode)) {
+      return 1;
+    }else if (FastIotConstants.StreamMode.TCP_ACTIVE.equalsIgnoreCase(streamMode)) {
+      return 2;
+    }
+    return 0;
+  }
+}

+package org.thingsboard.server.common.data.yunteng.dto.sip;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+public class SipMessageHeaderDTO implements Serializable {
+  private String callId;
+  private String viaTag;
+  private String fromTag;
+  private String toTag;
+  private String viaBranch;
+}