Merge remote-tracking branch 'origin/rtc' into commercial

648540858

2022-06-27 038d360dd4f2dd3c06f5d97dc66ed13fd78de212

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java

@@ -125,9 +125,24 @@
    private boolean alarmSubscribe;

    /**
     * 已被订阅GPS信息
     * 已被订阅移动位置信息
     */
    private boolean gpsSubscribe;
    private boolean mobilePositionSubscribe;

    /**
     * 点播未推流的设备时是否使用redis通知拉起
     */
    private boolean startOfflinePush;

    /**
     * 目录分组-每次向上级发送通道信息时单个包携带的通道数量，取值1,2,4,8
     */
    private int catalogGroup;

    /**
     * 行政区划
     */
    private String administrativeDivision;

    public Integer getId() {
        return id;
@@ -322,11 +337,35 @@
        this.alarmSubscribe = alarmSubscribe;
    }

    public boolean isGpsSubscribe() {
        return gpsSubscribe;
    public boolean isMobilePositionSubscribe() {
        return mobilePositionSubscribe;
    }

    public void setGpsSubscribe(boolean gpsSubscribe) {
        this.gpsSubscribe = gpsSubscribe;
    public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) {
        this.mobilePositionSubscribe = mobilePositionSubscribe;
    }

    public boolean isStartOfflinePush() {
        return startOfflinePush;
    }

    public void setStartOfflinePush(boolean startOfflinePush) {
        this.startOfflinePush = startOfflinePush;
    }

    public int getCatalogGroup() {
        return catalogGroup;
    }

    public void setCatalogGroup(int catalogGroup) {
        this.catalogGroup = catalogGroup;
    }

    public String getAdministrativeDivision() {
        return administrativeDivision;
    }

    public void setAdministrativeDivision(String administrativeDivision) {
        this.administrativeDivision = administrativeDivision;
    }
}