From 3b5a37c270e5b6649b9a168ee753c2b3353a257a Mon Sep 17 00:00:00 2001
From: zouyaoji <370681295@qq.com>
Date: 星期六, 06 八月 2022 11:27:02 +0800
Subject: [PATCH] 前端显示媒体服务器配置时报错修复
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 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 73e162a..ff63f6f 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
@@ -1,12 +1,19 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.jetbrains.annotations.NotNull;
+import org.springframework.util.unit.DataUnit;
import java.util.List;
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{
+
+ /**
+ * id
+ */
+ private Integer id;
/**
* 搴旂敤鍚�
@@ -57,11 +64,6 @@
private String originUrl;
/**
- * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
- */
- private Long createStamp;
-
- /**
* 瀛樻椿鏃堕棿锛屽崟浣嶇
*/
private Long aliveSecond;
@@ -81,6 +83,38 @@
*/
private String mediaServerId;
+ /**
+ * 浣跨敤鐨勬湇鍔D
+ */
+ private String serverId;
+
+ /**
+ * 鎺ㄦ祦鏃堕棿
+ */
+ private String pushTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏄惁姝ｅ湪鎺ㄦ祦
+ */
+ private boolean pushIng;
+
+ /**
+ * 鏄惁鑷繁骞冲彴鐨勬帹娴�
+ */
+ private boolean self;
+
+
+
public String getVhost() {
return vhost;
}
@@ -92,7 +126,8 @@
@Override
public int compareTo(@NotNull StreamPushItem streamPushItem) {
- return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
+ return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(super.createTime)
+ - DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue();
}
public static class MediaSchema {
@@ -116,19 +151,30 @@
}
}
+ public Integer getId() {
+ return id;
+ }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Override
public String getApp() {
return app;
}
+ @Override
public void setApp(String app) {
this.app = app;
}
+ @Override
public String getStream() {
return stream;
}
+ @Override
public void setStream(String stream) {
this.stream = stream;
}
@@ -182,14 +228,6 @@
this.originUrl = originUrl;
}
- public Long getCreateStamp() {
- return createStamp;
- }
-
- public void setCreateStamp(Long createStamp) {
- this.createStamp = createStamp;
- }
-
public Long getAliveSecond() {
return aliveSecond;
}
@@ -216,5 +254,56 @@
public void setMediaServerId(String mediaServerId) {
this.mediaServerId = mediaServerId;
}
+
+ public String getServerId() {
+ return serverId;
+ }
+
+ public void setServerId(String serverId) {
+ this.serverId = serverId;
+ }
+
+
+ public String getPushTime() {
+ return pushTime;
+ }
+
+ public void setPushTime(String pushTime) {
+ this.pushTime = pushTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public boolean isPushIng() {
+ return pushIng;
+ }
+
+ public void setPushIng(boolean pushIng) {
+ this.pushIng = pushIng;
+ }
+
+ public boolean isSelf() {
+ return self;
+ }
+
+ public void setSelf(boolean self) {
+ this.self = self;
+ }
}
--
Gitblit v1.8.0