From dfb87c768538e280cf5e17d1d5ee5bbed1e1888d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 10:58:26 +0800
Subject: [PATCH] 合并主线

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
index 21b46d8..d1e4ccb 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
@@ -1,31 +1,46 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * 鐩存挱娴佸叧鑱斿浗鏍囦笂绾у钩鍙�
+ * @author lin
  */
+@Schema(description = "鐩存挱娴佸叧鑱斿浗鏍囦笂绾у钩鍙�")
 public class GbStream extends PlatformGbStream{
 
-    private int id;
+    @Schema(description = "ID")
+    private Integer gbStreamId;
+    @Schema(description = "搴旂敤鍚�")
     private String app;
+    @Schema(description = "娴両D")
     private String stream;
+    @Schema(description = "鍥芥爣ID")
     private String gbId;
+    @Schema(description = "鍚嶇О")
     private String name;
+    @Schema(description = "娴佸獟浣揑D")
     private String mediaServerId;
+    @Schema(description = "缁忓害")
     private double longitude;
+    @Schema(description = "绾害")
     private double latitude;
+    @Schema(description = "娴佺被鍨嬶紙鎷夋祦/鎺ㄦ祦锛�")
     private String streamType;
+    @Schema(description = "鐘舵��")
     private boolean status;
-    /**
-     * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
-     */
-    public Long createStamp;
 
-    public int getId() {
-        return id;
+    @Schema(description = "鍒涘缓鏃堕棿")
+    public String createTime;
+
+    @Override
+    public Integer getGbStreamId() {
+        return gbStreamId;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    @Override
+    public void setGbStreamId(Integer gbStreamId) {
+        this.gbStreamId = gbStreamId;
     }
 
     public String getApp() {
@@ -100,12 +115,11 @@
         this.mediaServerId = mediaServerId;
     }
 
-
-    public Long getCreateStamp() {
-        return createStamp;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setCreateStamp(Long createStamp) {
-        this.createStamp = createStamp;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 }

--
Gitblit v1.8.0