From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001 From: 648540858 <456panlinlin> Date: 星期五, 01 四月 2022 16:45:29 +0800 Subject: [PATCH] 支持国标移动位置订阅,收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug --- src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 96 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java index ddd964b..8aa7b37 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java @@ -3,6 +3,11 @@ public class ParentPlatform { /** + * id + */ + private Integer id; + + /** * 鏄惁鍚敤 */ private boolean enable; @@ -81,7 +86,7 @@ /** * 鍏佽浜戝彴鎺у埗 */ - private boolean PTZEnable; + private boolean ptz; /** * RTCP娴佷繚娲� @@ -94,6 +99,43 @@ */ private boolean status; + /** + * 鍦ㄧ嚎鐘舵�� + */ + private int channelCount; + + /** + * 鍏变韩鎵�鏈夌殑鐩存挱娴� + */ + private boolean shareAllLiveStream; + + /** + * 榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅 + */ + private String catalogId; + + /** + * 宸茶璁㈤槄鐩綍淇℃伅 + */ + private boolean catalogSubscribe; + + /** + * 宸茶璁㈤槄鎶ヨ淇℃伅 + */ + private boolean alarmSubscribe; + + /** + * 宸茶璁㈤槄绉诲姩浣嶇疆淇℃伅 + */ + private boolean mobilePositionSubscribe; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } public boolean isEnable() { return enable; @@ -215,12 +257,12 @@ this.characterSet = characterSet; } - public boolean isPTZEnable() { - return PTZEnable; + public boolean isPtz() { + return ptz; } - public void setPTZEnable(boolean PTZEnable) { - this.PTZEnable = PTZEnable; + public void setPtz(boolean ptz) { + this.ptz = ptz; } public boolean isRtcp() { @@ -238,4 +280,53 @@ public void setStatus(boolean status) { this.status = status; } + + public int getChannelCount() { + return channelCount; + } + + public void setChannelCount(int channelCount) { + this.channelCount = channelCount; + } + + + public boolean isShareAllLiveStream() { + return shareAllLiveStream; + } + + public void setShareAllLiveStream(boolean shareAllLiveStream) { + this.shareAllLiveStream = shareAllLiveStream; + } + + public String getCatalogId() { + return catalogId; + } + + public void setCatalogId(String catalogId) { + this.catalogId = catalogId; + } + + public boolean isCatalogSubscribe() { + return catalogSubscribe; + } + + public void setCatalogSubscribe(boolean catalogSubscribe) { + this.catalogSubscribe = catalogSubscribe; + } + + public boolean isAlarmSubscribe() { + return alarmSubscribe; + } + + public void setAlarmSubscribe(boolean alarmSubscribe) { + this.alarmSubscribe = alarmSubscribe; + } + + public boolean isMobilePositionSubscribe() { + return mobilePositionSubscribe; + } + + public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) { + this.mobilePositionSubscribe = mobilePositionSubscribe; + } } -- Gitblit v1.8.0