设备信息增加最近注册时间和最近心跳时间，心跳超时时间变为可配置

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

@@ -66,19 +66,24 @@ public class Device {
 	/**
 	 * 注册时间
 	 */
-	private Long registerTimeMillis;
+	private String registerTime;
 
 
 	/**
 	 * 心跳时间
 	 */
-	private Long KeepaliveTimeMillis;
+	private String keepaliveTime;
 
 	/**
 	 * 通道个数
 	 */
 	private int channelCount;
 
+	/**
+	 * 注册有效期
+	 */
+	private int expires;
+
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -175,19 +180,27 @@ public class Device {
 		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 Long getKeepaliveTimeMillis() {
-		return KeepaliveTimeMillis;
+	public String getKeepaliveTime() {
+		return keepaliveTime;
 	}
 
-	public void setKeepaliveTimeMillis(Long keepaliveTimeMillis) {
-		KeepaliveTimeMillis = keepaliveTimeMillis;
+	public void setKeepaliveTime(String keepaliveTime) {
+		this.keepaliveTime = keepaliveTime;
+	}
+
+	public int getExpires() {
+		return expires;
+	}
+
+	public void setExpires(int expires) {
+		this.expires = expires;
 	}
 }