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

648540858

2022-06-27 038d360dd4f2dd3c06f5d97dc66ed13fd78de212

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

@@ -66,12 +66,69 @@
   /**
    * 注册时间
    */
   private Long registerTimeMillis;
   private String registerTime;


   /**
    * 心跳时间
    */
   private String keepaliveTime;

   /**
    * 通道个数
    */
   private int channelCount;

   /**
    * 注册有效期
    */
   private int expires;

   /**
    * 创建时间
    */
   private String createTime;

   /**
    * 更新时间
    */
   private String updateTime;

   /**
    * 设备使用的媒体id, 默认为null
    */
   private String mediaServerId;

   /**
    * 字符集, 支持 UTF-8 与 GB2312
    */
   private String charset ;

   /**
    * 目录订阅周期，0为不订阅
    */
   private int subscribeCycleForCatalog;

   /**
    * 移动设备位置订阅周期，0为不订阅
    */
   private int subscribeCycleForMobilePosition;

   /**
    * 移动设备位置信息上报时间间隔,单位:秒,默认值5
    */
   private int mobilePositionSubmissionInterval = 5;

   /**
    * 报警订阅周期，0为不订阅
    */
   private int subscribeCycleForAlarm;

   /**
    * 是否开启ssrc校验，默认关闭，开启可以防止串流
    */
   private boolean ssrcCheck;


   public String getDeviceId() {
      return deviceId;
@@ -169,11 +226,100 @@
      this.channelCount = channelCount;
   }

   public Long getRegisterTimeMillis() {
      return registerTimeMillis;
   public String getRegisterTime() {
      return registerTime;
   }

   public void setRegisterTimeMillis(Long registerTimeMillis) {
      this.registerTimeMillis = registerTimeMillis;
   public void setRegisterTime(String registerTime) {
      this.registerTime = registerTime;
   }

   public String getKeepaliveTime() {
      return keepaliveTime;
   }

   public void setKeepaliveTime(String keepaliveTime) {
      this.keepaliveTime = keepaliveTime;
   }

   public int getExpires() {
      return expires;
   }

   public void setExpires(int expires) {
      this.expires = expires;
   }

   public String getCreateTime() {
      return createTime;
   }

   public void setCreateTime(String createTime) {
      this.createTime = createTime;
   }

   public String getUpdateTime() {
      return updateTime;
   }

   public void setUpdateTime(String updateTime) {
      this.updateTime = updateTime;
   }

   public String getMediaServerId() {
      return mediaServerId;
   }

   public void setMediaServerId(String mediaServerId) {
      this.mediaServerId = mediaServerId;
   }

   public String getCharset() {
      return charset;
   }

   public void setCharset(String charset) {
      this.charset = charset;
   }

   public int getSubscribeCycleForCatalog() {
      return subscribeCycleForCatalog;
   }

   public void setSubscribeCycleForCatalog(int subscribeCycleForCatalog) {
      this.subscribeCycleForCatalog = subscribeCycleForCatalog;
   }

   public int getSubscribeCycleForMobilePosition() {
      return subscribeCycleForMobilePosition;
   }

   public void setSubscribeCycleForMobilePosition(int subscribeCycleForMobilePosition) {
      this.subscribeCycleForMobilePosition = subscribeCycleForMobilePosition;
   }

   public int getMobilePositionSubmissionInterval() {
      return mobilePositionSubmissionInterval;
   }

   public void setMobilePositionSubmissionInterval(int mobilePositionSubmissionInterval) {
      this.mobilePositionSubmissionInterval = mobilePositionSubmissionInterval;
   }

   public int getSubscribeCycleForAlarm() {
      return subscribeCycleForAlarm;
   }

   public void setSubscribeCycleForAlarm(int subscribeCycleForAlarm) {
      this.subscribeCycleForAlarm = subscribeCycleForAlarm;
   }

   public boolean isSsrcCheck() {
      return ssrcCheck;
   }

   public void setSsrcCheck(boolean ssrcCheck) {
      this.ssrcCheck = ssrcCheck;
   }

}