From 9978d30aa1533c50bfaa48e44a1b0de4c157d10b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 09:36:48 +0800
Subject: [PATCH] Merge branch '2.7.0'

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java |   50 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 0e1b618..32b6fac 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -142,13 +142,13 @@
 	 * 浜戝彴绫诲瀷
 	 */
 	@Schema(description = "浜戝彴绫诲瀷")
-	private int PTZType;
+	private int ptzType;
 
 	/**
 	 * 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
 	 */
 	@Schema(description = "浜戝彴绫诲瀷鎻忚堪瀛楃涓�")
-	private String PTZTypeText;
+	private String ptzTypeText;
 
 	/**
 	 * 鍒涘缓鏃堕棿
@@ -172,7 +172,7 @@
 	 * 閬囧埌杩嘚VR涓嬬殑IPC涓嬪彂淇′护鍙互鎺ㄦ祦锛� 浣嗘槸 Status 鍝嶅簲 OFF
 	 */
 	@Schema(description = "鍦ㄧ嚎/绂荤嚎锛� 1鍦ㄧ嚎,0绂荤嚎")
-	private int status;
+	private boolean status;
 
 	/**
 	 * 缁忓害
@@ -246,6 +246,10 @@
 	@Schema(description = "GPS鐨勬洿鏂版椂闂�")
 	private String gpsTime;
 
+	@Schema(description = "鐮佹祦鏍囪瘑锛屼紭鍏堢骇楂樹簬璁惧涓爜娴佹爣璇嗭紝" +
+			"鐢ㄤ簬閫夋嫨鐮佹祦鏃剁粍鎴愮爜娴佹爣璇嗐�傞粯璁や负null锛屼笉璁剧疆銆傚彲閫夊��: stream/streamnumber/streamprofile/streamMode")
+	private String streamIdentification;
+
 	public int getId() {
 		return id;
 	}
@@ -262,23 +266,23 @@
 		this.deviceId = deviceId;
 	}
 
-	public void setPTZType(int PTZType) {
-		this.PTZType = PTZType;
-		switch (PTZType) {
+	public void setPtzType(int ptzType) {
+		this.ptzType = ptzType;
+		switch (ptzType) {
 			case 0:
-				this.PTZTypeText = "鏈煡";
+				this.ptzTypeText = "鏈煡";
 				break;
 			case 1:
-				this.PTZTypeText = "鐞冩満";
+				this.ptzTypeText = "鐞冩満";
 				break;
 			case 2:
-				this.PTZTypeText = "鍗婄悆";
+				this.ptzTypeText = "鍗婄悆";
 				break;
 			case 3:
-				this.PTZTypeText = "鍥哄畾鏋満";
+				this.ptzTypeText = "鍥哄畾鏋満";
 				break;
 			case 4:
-				this.PTZTypeText = "閬ユ帶鏋満";
+				this.ptzTypeText = "閬ユ帶鏋満";
 				break;
 		}
 	}
@@ -443,23 +447,23 @@
 		this.password = password;
 	}
 
-	public int getPTZType() {
-		return PTZType;
+	public int getPtzType() {
+		return ptzType;
 	}
 
-	public String getPTZTypeText() {
-		return PTZTypeText;
+	public String getPtzTypeText() {
+		return ptzTypeText;
 	}
 
-	public void setPTZTypeText(String PTZTypeText) {
-		this.PTZTypeText = PTZTypeText;
+	public void setPtzTypeText(String ptzTypeText) {
+		this.ptzTypeText = ptzTypeText;
 	}
 
-	public int getStatus() {
+	public boolean isStatus() {
 		return status;
 	}
 
-	public void setStatus(int status) {
+	public void setStatus(boolean status) {
 		this.status = status;
 	}
 
@@ -574,4 +578,12 @@
 	public void setGpsTime(String gpsTime) {
 		this.gpsTime = gpsTime;
 	}
+
+	public String getStreamIdentification() {
+		return streamIdentification;
+	}
+
+	public void setStreamIdentification(String streamIdentification) {
+		this.streamIdentification = streamIdentification;
+	}
 }

--
Gitblit v1.8.0