规范数据库，给各个标设置主键ID

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

@@ -3,6 +3,11 @@ package com.genersoft.iot.vmp.gb28181.bean;
 
 public class Device {
 
+	/**
+	 * Id
+	 */
+	private int id;
+
 	/**
 	 * 设备Id
 	 */
@@ -114,7 +119,13 @@ public class Device {
 	 */
 	private int subscribeCycleForCatalog ;
 
+	public int getId() {
+		return id;
+	}
 
+	public void setId(int id) {
+		this.id = id;
+	}
 
 	public String getDeviceId() {
 		return deviceId;
@@ -283,4 +294,6 @@ public class Device {
 	public void setSubscribeCycleForCatalog(int subscribeCycleForCatalog) {
 		this.subscribeCycleForCatalog = subscribeCycleForCatalog;
 	}
+
+
 }

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

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

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

@@ -7,6 +7,10 @@ package com.genersoft.iot.vmp.gb28181.bean;
  */
 
 public class MobilePosition {
+    /**
+     * Id
+     */
+    private int id;
     /**
      * 设备Id
      */
@@ -72,6 +76,13 @@ public class MobilePosition {
      */
     private String cnLat;
 
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
 
     public String getDeviceId() {
         return deviceId;

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

@@ -1,25 +1,16 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
 public class PlatformGbStream {
-    private String app;
-    private String stream;
+    private String gbStreamId;
     private String platformId;
     private String catalogId;
 
-    public String getApp() {
-        return app;
+    public String getGbStreamId() {
+        return gbStreamId;
     }
 
-    public void setApp(String app) {
-        this.app = app;
-    }
-
-    public String getStream() {
-        return stream;
-    }
-
-    public void setStream(String stream) {
-        this.stream = stream;
+    public void setGbStreamId(String gbStreamId) {
+        this.gbStreamId = gbStreamId;
     }
 
     public String getPlatformId() {

src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java

@@ -76,7 +76,10 @@ public class KeepaliveTimeoutListenerForPlatform extends RedisKeyExpirationEvent
             eventResult.callId = callid;
             eventResult.msg = "注册超时";
             eventResult.type = "register timeout";
-            sipSubscribe.getErrorSubscribe(callid).response(eventResult);
+            if (sipSubscribe.getErrorSubscribe(callid) != null) {
+                sipSubscribe.getErrorSubscribe(callid).response(eventResult);
+            }
+
         }
 
     }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -102,7 +102,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
 
                 sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (event)->{
                     if (event != null) {
-                        logger.info("向上级平台 [ {} ] 注册发上错误： {} ",
+                        logger.info("向上级平台 [ {} ] 注册发生错误： {} ",
                                 parentPlatform.getServerGBId(),
                                 event.msg);
                     }