From 40bf2d6642ce0ee84e95e2ec834ba567c29b9157 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 20 Jun 2024 20:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E9=81=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  9 ++++
 .../iot/vmp/gb28181/bean/GbChannel.java       | 51 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b60b693..e0ef34bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,6 +338,15 @@
             <version>32.1.3-jre</version>
         </dependency>
 
+        <!-- 自动化生成代码工具 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbChannel.java
index f3c0bfb3..b705030f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbChannel.java
@@ -1,11 +1,12 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
+@Data
 @Schema(description = "国标通道")
 public class GbChannel {
 
-    // 国标28181信息
     @Schema(description = "国标-编码")
     private String gbDeviceId;
 
@@ -18,6 +19,10 @@ public class GbChannel {
     @Schema(description = "国标-设备型号")
     private String gbModel;
 
+    // 2016
+    @Schema(description = "国标-设备归属")
+    private String gbOwner;
+
     @Schema(description = "国标-行政区域")
     private String gbCivilCode;
 
@@ -33,9 +38,30 @@ public class GbChannel {
     @Schema(description = "国标-父节点ID")
     private String gbParentId;
 
+    // 2016
+    @Schema(description = "国标-信令安全模式")
+    private Integer gbSafetyWay;
+
     @Schema(description = "国标-注册方式")
     private Integer gbRegisterWay;
 
+    // 2016
+    @Schema(description = "国标-证书序列号")
+    private Integer gbCertNum;
+
+    // 2016
+    @Schema(description = "国标-证书有效标识")
+    private Integer gbCertifiable;
+
+    // 2016
+    @Schema(description = "国标-无效原因码(有证书且证书无效的设备必选)")
+    private Integer gbErrCode;
+
+    // 2016
+    @Schema(description = "国标-证书终止有效期(有证书且证书无效的设备必选)")
+    private Integer gbEndTime;
+
+    // 2022
     @Schema(description = "国标-摄像机安全能力等级代码")
     private String gbSecurityLevelCode;
 
@@ -75,6 +101,10 @@ public class GbChannel {
     @Schema(description = "国标-摄像机安装位置室外、室内属性。1-室外、2-室内。")
     private Integer gbRoomType;
 
+    // 2016
+    @Schema(description = "国标-用途属性")
+    private Integer gbUseType;
+
     @Schema(description = "国标-摄像机补光属性。1-无补光;2-红外补光;3-白光补光;4-激光补光;9-其他")
     private Integer gbSupplyLightType;
 
@@ -85,6 +115,7 @@ public class GbChannel {
     @Schema(description = "国标-摄像机支持的分辨率,可多值")
     private String gbResolution;
 
+    // 2022
     @Schema(description = "国标-摄像机支持的码流编号列表,用于实时点播时指定码流编号(可选)")
     private String gbStreamNumberList;
 
@@ -97,52 +128,70 @@ public class GbChannel {
     @Schema(description = "国标-时域编码能力,取值0-不支持;1-1级增强;2-2级增强;3-3级增强(可选)")
     private Integer gbSvcTimeSupportMode;
 
+    // 2022
     @Schema(description = "国标- SSVC增强层与基本层比例能力 ")
     private String gbSsvcRatioSupportList;
 
+    // 2022
     @Schema(description = "国标-移动采集设备类型(仅移动采集设备适用,必选);1-移动机器人载摄像机;2-执法记录仪;3-移动单兵设备;" +
             "4-车载视频记录设备;5-无人机载摄像机;9-其他")
     private Integer gbMobileDeviceType;
 
+    // 2022
     @Schema(description = "国标-摄像机水平视场角(可选),取值范围大于0度小于等于360度")
     private Double gbHorizontalFieldAngle;
 
+    // 2022
     @Schema(description = "国标-摄像机竖直视场角(可选),取值范围大于0度小于等于360度 ")
     private Double gbVerticalFieldAngle;
 
+    // 2022
     @Schema(description = "国标-摄像机可视距离(可选),单位:米")
     private Double gbMaxViewDistance;
 
+    // 2022
     @Schema(description = "国标-基层组织编码(必选,非基层建设时为“000000”)")
     private String gbGrassrootsCode;
 
+    // 2022
     @Schema(description = "国标-监控点位类型(当为摄像机时必选),1-一类视频监控点;2-二类视频监控点;3-三类视频监控点;9-其他点位。")
     private Integer gbPoType;
 
+    // 2022
     @Schema(description = "国标-点位俗称")
     private String gbPoCommonName;
 
+    // 2022
     @Schema(description = "国标-设备MAC地址(可选),用“XX-XX-XX-XX-XX-XX”格式表达")
     private String gbMac;
 
+    // 2022
     @Schema(description = "国标-摄像机卡口功能类型,01-人脸卡口;02-人员卡口;03-机动车卡口;04-非机动车卡口;05-物品卡口;99-其他")
     private String gbFunctionType;
 
+    // 2022
     @Schema(description = "国标-摄像机视频编码格式")
     private String gbEncodeType;
 
+    // 2022
     @Schema(description = "国标-摄像机安装使用时间")
     private String gbInstallTime;
 
+    // 2022
     @Schema(description = "国标-摄像机所属管理单位名称")
     private String gbManagementUnit;
 
+    // 2022
     @Schema(description = "国标-摄像机所属管理单位联系人的联系方式(电话号码,可多值,用英文半角“/”分割)")
     private String gbContactInfo;
 
+    // 2022
     @Schema(description = "国标-录像保存天数(可选)")
     private Integer gbRecordSaveDays;
 
+    // 2022
     @Schema(description = "国标-国民经济行业分类代码(可选)")
     private String gbIndustrialClassification;
+
+
 }