XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wvp-28181-2.0' into wvp-pro-record

Browse Source
This commit is contained in:
648540858
2022-02-24 17:18:36 +08:00
parent 0191e93768 a42dda2bd3
commit 00afecac47
13 changed files with 205 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
View File

@@ -5,7 +5,7 @@ package com.genersoft.iot.vmp.gb28181.bean;
*/
public class GbStream extends PlatformGbStream{
private int id;
private Integer gbStreamId;
private String app;
private String stream;
private String gbId;
@@ -20,12 +20,13 @@ public class GbStream extends PlatformGbStream{
*/
public Long createStamp;
public int getId() {
return id;
@Override
public Integer getGbStreamId() {
return gbStreamId;
}
public void setId(int id) {
this.id = id;
public void setGbStreamId(Integer gbStreamId) {
this.gbStreamId = gbStreamId;
}
public String getApp() {

6
src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
View File

@@ -1,15 +1,15 @@
package com.genersoft.iot.vmp.gb28181.bean;
public class PlatformGbStream {
private String gbStreamId;
private Integer gbStreamId;
private String platformId;
private String catalogId;
public String getGbStreamId() {
public Integer getGbStreamId() {
return gbStreamId;
}
public void setGbStreamId(String gbStreamId) {
public void setGbStreamId(Integer gbStreamId) {
this.gbStreamId = gbStreamId;
}