From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:08:33 +0800
Subject: [PATCH] 使用冒号分隔redis的key

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java |  225 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 204 insertions(+), 21 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 ca6ef60..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
@@ -1,123 +1,166 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "閫氶亾淇℃伅")
 public class DeviceChannel {
 
 
+	/**
+	 * 鏁版嵁搴撹嚜澧濱D
+	 */
+	@Schema(description = "鏁版嵁搴撹嚜澧濱D")
+	private int id;
 
 	/**
-	 * 閫氶亾id
+	 * 閫氶亾鍥芥爣缂栧彿
 	 */
+	@Schema(description = "閫氶亾鍥芥爣缂栧彿")
 	private String channelId;
 
 	/**
-	 * 璁惧id
+	 * 璁惧鍥芥爣缂栧彿
 	 */
+	@Schema(description = "璁惧鍥芥爣缂栧彿")
 	private String deviceId;
 	
 	/**
 	 * 閫氶亾鍚�
 	 */
+	@Schema(description = "鍚嶇О")
 	private String name;
 	
 	/**
 	 * 鐢熶骇鍘傚晢
 	 */
+	@Schema(description = "鐢熶骇鍘傚晢")
 	private String manufacture;
 	
 	/**
 	 * 鍨嬪彿
 	 */
+	@Schema(description = "鍨嬪彿")
 	private String model;
 	
 	/**
 	 * 璁惧褰掑睘
 	 */
+	@Schema(description = "璁惧褰掑睘")
 	private String owner;
 	
 	/**
 	 * 琛屾斂鍖哄煙
 	 */
+	@Schema(description = "琛屾斂鍖哄煙")
 	private String civilCode;
 	
 	/**
 	 * 璀﹀尯
 	 */
+	@Schema(description = "璀﹀尯")
 	private String block;
 
 	/**
 	 * 瀹夎鍦板潃
 	 */
+	@Schema(description = "瀹夎鍦板潃")
 	private String address;
 	
 	/**
 	 * 鏄惁鏈夊瓙璁惧 1鏈�, 0娌℃湁
 	 */
+	@Schema(description = "鏄惁鏈夊瓙璁惧 1鏈�, 0娌℃湁")
 	private int parental;
 	
 	/**
 	 * 鐖剁骇id
 	 */
+	@Schema(description = "鐖剁骇id")
 	private String parentId;
 	
 	/**
 	 * 淇′护瀹夊叏妯″紡  缂虹渷涓�0; 0:涓嶉噰鐢�; 2: S/MIME绛惧悕鏂瑰紡; 3: S/ MIME鍔犲瘑绛惧悕鍚屾椂閲囩敤鏂瑰紡; 4:鏁板瓧鎽樿鏂瑰紡
 	 */
+	@Schema(description = "淇′护瀹夊叏妯″紡  缂虹渷涓�0; 0:涓嶉噰鐢�; 2: S/MIME绛惧悕鏂瑰紡; 3: S/ MIME鍔犲瘑绛惧悕鍚屾椂閲囩敤鏂瑰紡; 4:鏁板瓧鎽樿鏂瑰紡")
 	private int safetyWay;
 	
 	/**
 	 * 娉ㄥ唽鏂瑰紡 缂虹渷涓�1;1:绗﹀悎IETFRFC3261鏍囧噯鐨勮璇佹敞鍐屾ā 寮�; 2:鍩轰簬鍙d护鐨勫弻鍚戣璇佹敞鍐屾ā寮�; 3:鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇佹敞鍐屾ā寮�
 	 */
+	@Schema(description = "娉ㄥ唽鏂瑰紡 缂虹渷涓�1;1:绗﹀悎IETFRFC3261鏍囧噯鐨勮璇佹敞鍐屾ā 寮�; 2:鍩轰簬鍙d护鐨勫弻鍚戣璇佹敞鍐屾ā寮�; 3:鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇佹敞鍐屾ā寮�")
 	private int registerWay;
 	
 	/**
 	 * 璇佷功搴忓垪鍙�
 	 */
+	@Schema(description = "璇佷功搴忓垪鍙�")
 	private String certNum;
 	
 	/**
 	 * 璇佷功鏈夋晥鏍囪瘑 缂虹渷涓�0;璇佷功鏈夋晥鏍囪瘑:0:鏃犳晥1: 鏈夋晥
 	 */
+	@Schema(description = "璇佷功鏈夋晥鏍囪瘑 缂虹渷涓�0;璇佷功鏈夋晥鏍囪瘑:0:鏃犳晥1: 鏈夋晥")
 	private int certifiable;
 	
 	/**
 	 * 璇佷功鏃犳晥鍘熷洜鐮�
 	 */
+	@Schema(description = "璇佷功鏃犳晥鍘熷洜鐮�")
 	private int errCode;
 	
 	/**
 	 * 璇佷功缁堟鏈夋晥鏈�
 	 */
+	@Schema(description = "璇佷功缁堟鏈夋晥鏈�")
 	private String endTime;
 	
 	/**
 	 * 淇濆瘑灞炴�� 缂虹渷涓�0; 0:涓嶆秹瀵�, 1:娑夊瘑
 	 */
+	@Schema(description = "淇濆瘑灞炴�� 缂虹渷涓�0; 0:涓嶆秹瀵�, 1:娑夊瘑")
 	private String secrecy;
 	
 	/**
 	 * IP鍦板潃
 	 */
+	@Schema(description = "IP鍦板潃")
 	private String ipAddress;
 	
 	/**
 	 * 绔彛鍙�
 	 */
+	@Schema(description = "绔彛鍙�")
 	private int port;
 	
 	/**
 	 * 瀵嗙爜
 	 */
+	@Schema(description = "瀵嗙爜")
 	private String password;
 
 	/**
 	 * 浜戝彴绫诲瀷
 	 */
-	private int PTZType;
+	@Schema(description = "浜戝彴绫诲瀷")
+	private int ptzType;
 
 	/**
 	 * 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
 	 */
-	private String PTZTypeText;
+	@Schema(description = "浜戝彴绫诲瀷鎻忚堪瀛楃涓�")
+	private String ptzTypeText;
+
+	/**
+	 * 鍒涘缓鏃堕棿
+	 */
+	@Schema(description = "鍒涘缓鏃堕棿")
+	private String createTime;
+
+	/**
+	 * 鏇存柊鏃堕棿
+	 */
+	@Schema(description = "鏇存柊鏃堕棿")
+	private String updateTime;
 	
 	/**
 	 * 鍦ㄧ嚎/绂荤嚎
@@ -128,32 +171,92 @@
 	 * <Status>OFF</Status>
 	 * 閬囧埌杩嘚VR涓嬬殑IPC涓嬪彂淇′护鍙互鎺ㄦ祦锛� 浣嗘槸 Status 鍝嶅簲 OFF
 	 */
-	private int status;
+	@Schema(description = "鍦ㄧ嚎/绂荤嚎锛� 1鍦ㄧ嚎,0绂荤嚎")
+	private boolean status;
 
 	/**
 	 * 缁忓害
 	 */
+	@Schema(description = "缁忓害")
 	private double longitude;
 	
 	/**
 	 * 绾害
 	 */
+	@Schema(description = "绾害")
 	private double latitude;
+
+	/**
+	 * 缁忓害 GCJ02
+	 */
+	@Schema(description = "GCJ02鍧愭爣绯荤粡搴�")
+	private double longitudeGcj02;
+
+	/**
+	 * 绾害 GCJ02
+	 */
+	@Schema(description = "GCJ02鍧愭爣绯荤含搴�")
+	private double latitudeGcj02;
+
+	/**
+	 * 缁忓害 WGS84
+	 */
+	@Schema(description = "WGS84鍧愭爣绯荤粡搴�")
+	private double longitudeWgs84;
+
+	/**
+	 * 绾害 WGS84
+	 */
+	@Schema(description = "WGS84鍧愭爣绯荤含搴�")
+	private double latitudeWgs84;
 
 	/**
 	 * 瀛愯澶囨暟
 	 */
+	@Schema(description = "瀛愯澶囨暟")
 	private int subCount;
 
 	/**
 	 * 娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�
 	 */
+	@Schema(description = "娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�")
 	private String  streamId;
 
 	/**
 	 *  鏄惁鍚湁闊抽
 	 */
+	@Schema(description = "鏄惁鍚湁闊抽")
 	private boolean hasAudio;
+
+	/**
+	 * 鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
+	 */
+	@Schema(description = "鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝")
+	private int channelType;
+
+	/**
+	 * 涓氬姟鍒嗙粍
+	 */
+	@Schema(description = "涓氬姟鍒嗙粍")
+	private String businessGroupId;
+
+	/**
+	 * GPS鐨勬洿鏂版椂闂�
+	 */
+	@Schema(description = "GPS鐨勬洿鏂版椂闂�")
+	private String gpsTime;
+
+	@Schema(description = "鐮佹祦鏍囪瘑锛屼紭鍏堢骇楂樹簬璁惧涓爜娴佹爣璇嗭紝" +
+			"鐢ㄤ簬閫夋嫨鐮佹祦鏃剁粍鎴愮爜娴佹爣璇嗐�傞粯璁や负null锛屼笉璁剧疆銆傚彲閫夊��: stream/streamnumber/streamprofile/streamMode")
+	private String streamIdentification;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
 
 	public String getDeviceId() {
 		return deviceId;
@@ -163,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;
 		}
 	}
@@ -344,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;
 	}
 
@@ -378,6 +481,38 @@
 
 	public void setLatitude(double latitude) {
 		this.latitude = latitude;
+	}
+
+	public double getLongitudeGcj02() {
+		return longitudeGcj02;
+	}
+
+	public void setLongitudeGcj02(double longitudeGcj02) {
+		this.longitudeGcj02 = longitudeGcj02;
+	}
+
+	public double getLatitudeGcj02() {
+		return latitudeGcj02;
+	}
+
+	public void setLatitudeGcj02(double latitudeGcj02) {
+		this.latitudeGcj02 = latitudeGcj02;
+	}
+
+	public double getLongitudeWgs84() {
+		return longitudeWgs84;
+	}
+
+	public void setLongitudeWgs84(double longitudeWgs84) {
+		this.longitudeWgs84 = longitudeWgs84;
+	}
+
+	public double getLatitudeWgs84() {
+		return latitudeWgs84;
+	}
+
+	public void setLatitudeWgs84(double latitudeWgs84) {
+		this.latitudeWgs84 = latitudeWgs84;
 	}
 
 	public int getSubCount() {
@@ -403,4 +538,52 @@
 	public void setStreamId(String streamId) {
 		this.streamId = streamId;
 	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public int getChannelType() {
+		return channelType;
+	}
+
+	public void setChannelType(int channelType) {
+		this.channelType = channelType;
+	}
+
+	public String getBusinessGroupId() {
+		return businessGroupId;
+	}
+
+	public void setBusinessGroupId(String businessGroupId) {
+		this.businessGroupId = businessGroupId;
+	}
+
+	public String getGpsTime() {
+		return gpsTime;
+	}
+
+	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