From cefdce5e0a34743e6d9784f858265120e75179a1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 08 三月 2023 14:46:18 +0800
Subject: [PATCH] 优化兼容接口
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java | 68 +++++++++++----------------------
1 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
similarity index 78%
rename from src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java
rename to src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
index 9494352..972d1a6 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
@@ -1,165 +1,140 @@
package com.genersoft.iot.vmp.web.gb28181.dto;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "閫氶亾淇℃伅")
-public class DeviceChannelExtent {
+public class DeviceChannelExtend {
/**
* 鏁版嵁搴撹嚜澧濱D
*/
- @Schema(description = "鏁版嵁搴撹嚜澧濱D")
private int id;
/**
- * 閫氶亾鍥芥爣缂栧彿
+ * 閫氶亾id
*/
- @Schema(description = "閫氶亾鍥芥爣缂栧彿")
private String channelId;
/**
- * 璁惧鍥芥爣缂栧彿
+ * 璁惧id
*/
- @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceId;
/**
* 閫氶亾鍚�
*/
- @Schema(description = "鍚嶇О")
private String name;
+
+ private String deviceName;
+
+ private int deviceOnline;
/**
* 鐢熶骇鍘傚晢
*/
- @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;
/**
@@ -171,79 +146,66 @@
* <Status>OFF</Status>
* 閬囧埌杩嘚VR涓嬬殑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;
public int getId() {
@@ -574,4 +536,20 @@
public void setGpsTime(String gpsTime) {
this.gpsTime = gpsTime;
}
+
+ public String getDeviceName() {
+ return deviceName;
+ }
+
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ public int getDeviceOnline() {
+ return deviceOnline;
+ }
+
+ public void setDeviceOnline(int deviceOnline) {
+ this.deviceOnline = deviceOnline;
+ }
}
--
Gitblit v1.8.0