支持国标移动位置订阅,收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug

This commit is contained in:
648540858
2022-04-01 16:45:29 +08:00
parent ee490f5b93
commit 7e755f405d
92 changed files with 1459 additions and 1067 deletions

View File

@@ -112,8 +112,22 @@ public class Device {
/**
* 目录订阅周期0为不订阅
*/
private int subscribeCycleForCatalog ;
private int subscribeCycleForCatalog;
/**
* 移动设备位置订阅周期0为不订阅
*/
private int subscribeCycleForMobilePosition;
/**
* 移动设备位置信息上报时间间隔,单位:秒,默认值5
*/
private int mobilePositionSubmissionInterval = 5;
/**
* 报警订阅周期0为不订阅
*/
private int subscribeCycleForAlarm;
public String getDeviceId() {
@@ -283,4 +297,28 @@ public class Device {
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;
}
}

View File

@@ -0,0 +1,8 @@
package com.genersoft.iot.vmp.gb28181.bean;
public enum InviteStreamType {
PLAY,PLAYBACK,PUSH,PROXY,CLOUD_RECORD_PUSH,CLOUD_RECORD_PROXY
}

View File

@@ -125,9 +125,9 @@ public class ParentPlatform {
private boolean alarmSubscribe;
/**
* 已被订阅GPS信息
* 已被订阅移动位置信息
*/
private boolean gpsSubscribe;
private boolean mobilePositionSubscribe;
public Integer getId() {
return id;
@@ -322,11 +322,11 @@ public class ParentPlatform {
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;
}
}

View File

@@ -77,9 +77,9 @@ public class SendRtpItem {
private String CallId;
/**
* 是否是play false是playback
* 播放类型
*/
private boolean isPlay;
private InviteStreamType playType;
private byte[] transaction;
@@ -197,12 +197,12 @@ public class SendRtpItem {
CallId = callId;
}
public boolean isPlay() {
return isPlay;
public InviteStreamType getPlayType() {
return playType;
}
public void setPlay(boolean play) {
isPlay = play;
public void setPlayType(InviteStreamType playType) {
this.playType = playType;
}
public byte[] getTransaction() {