From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java |  193 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 170 insertions(+), 23 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 3633789..fb8ad3d 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,138 +1,167 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "通道信息")
 public class DeviceChannel {
 
 
 	/**
-	 * 数据库自赠ID
+	 * 数据库自增ID
 	 */
+	@Schema(description = "数据库自增ID")
 	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:基于口令的双向认证注册模式; 3:基于数字证书的双向认证注册模式
 	 */
+	@Schema(description = "注册方式 缺省为1;1:符合IETFRFC3261标准的认证注册模 式; 2:基于口令的双向认证注册模式; 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;
 
 	/**
 	 * 云台类型
 	 */
+	@Schema(description = "云台类型")
 	private int PTZType;
 
 	/**
 	 * 云台类型描述字符串
 	 */
+	@Schema(description = "云台类型描述字符串")
 	private String PTZTypeText;
 
 	/**
 	 * 创建时间
 	 */
+	@Schema(description = "创建时间")
 	private String createTime;
 
 	/**
 	 * 更新时间
 	 */
+	@Schema(description = "更新时间")
 	private String updateTime;
-	
+
 	/**
 	 * 在线/离线
 	 * 1在线,0离线
@@ -142,32 +171,86 @@
 	 * <Status>OFF</Status>
 	 * 遇到过NVR下的IPC下发信令可以推流, 但是 Status 响应 OFF
 	 */
+	@Schema(description = "在线/离线, 1在线,0离线")
 	private int 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 = "空间坐标")
+	private String coordinate;
 
 	public int getId() {
 		return id;
@@ -402,6 +485,38 @@
 		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() {
 		return subCount;
 	}
@@ -441,4 +556,36 @@
 	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 getCoordinate() {
+		return coordinate;
+	}
+
+	public void setCoordinate(String coordinate) {
+		this.coordinate = coordinate;
+	}
 }

--
Gitblit v1.9.3