From d34be408d6f933586cdab190a6f78ff1a10a5820 Mon Sep 17 00:00:00 2001
From: lanss <7428909+lanss-01@user.noreply.gitee.com>
Date: 星期二, 25 一月 2022 21:50:22 +0800
Subject: [PATCH] update web_src/src/components/dialog/changePassword.vue.
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
index 7a1c49b..d3c9b1b 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -57,11 +57,6 @@
private String originUrl;
/**
- * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
- */
- private Long createStamp;
-
- /**
* 瀛樻椿鏃堕棿锛屽崟浣嶇
*/
private Long aliveSecond;
@@ -76,6 +71,11 @@
*/
private String vhost;
+ /**
+ * 浣跨敤鐨勬祦濯掍綋ID
+ */
+ private String mediaServerId;
+
public String getVhost() {
return vhost;
}
@@ -87,7 +87,7 @@
@Override
public int compareTo(@NotNull StreamPushItem streamPushItem) {
- return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
+ return Long.valueOf(super.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
}
public static class MediaSchema {
@@ -177,14 +177,6 @@
this.originUrl = originUrl;
}
- public Long getCreateStamp() {
- return createStamp;
- }
-
- public void setCreateStamp(Long createStamp) {
- this.createStamp = createStamp;
- }
-
public Long getAliveSecond() {
return aliveSecond;
}
@@ -202,5 +194,14 @@
}
+ @Override
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ @Override
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
}
--
Gitblit v1.8.0