From 009e46f7f235b081f69bb7cb82e7cb1cc76154a6 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 24 十月 2020 15:22:48 +0800
Subject: [PATCH] 对通道列表查询结果排序，避免设备通道列表乱序的问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 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 1350341..810feab 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
@@ -153,6 +153,28 @@
*/
private boolean play;
+
+ public void setPTZType(int PTZType) {
+ this.PTZType = PTZType;
+ switch (PTZType) {
+ case 0:
+ this.PTZTypeText = "鏈煡";
+ break;
+ case 1:
+ this.PTZTypeText = "鐞冩満";
+ break;
+ case 2:
+ this.PTZTypeText = "鍗婄悆";
+ break;
+ case 3:
+ this.PTZTypeText = "鍥哄畾鏋満";
+ break;
+ case 4:
+ this.PTZTypeText = "閬ユ帶鏋満";
+ break;
+ }
+ }
+
public String getChannelId() {
return channelId;
}
@@ -167,14 +189,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
}
public String getManufacture() {
@@ -321,6 +335,26 @@
this.password = password;
}
+ public int getPTZType() {
+ return PTZType;
+ }
+
+ public String getPTZTypeText() {
+ return PTZTypeText;
+ }
+
+ public void setPTZTypeText(String PTZTypeText) {
+ this.PTZTypeText = PTZTypeText;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
public double getLongitude() {
return longitude;
}
@@ -337,43 +371,6 @@
this.latitude = latitude;
}
- public int getPTZType() {
- return PTZType;
- }
-
- public void setPTZType(int PTZType) {
- this.PTZType = PTZType;
- switch (PTZType) {
- case 0:
- this.PTZTypeText = "鏈煡";
- break;
- case 1:
- this.PTZTypeText = "鐞冩満";
- break;
- case 2:
- this.PTZTypeText = "鍗婄悆";
- break;
- case 3:
- this.PTZTypeText = "鍥哄畾鏋満";
- break;
- case 4:
- this.PTZTypeText = "閬ユ帶鏋満";
- break;
- }
- }
-
- public String getPTZTypeText() {
- return PTZTypeText;
- }
-
- public String getSsrc() {
- return ssrc;
- }
-
- public void setSsrc(String ssrc) {
- this.ssrc = ssrc;
- }
-
public int getSubCount() {
return subCount;
}
@@ -382,8 +379,12 @@
this.subCount = subCount;
}
- public void setPTZTypeText(String PTZTypeText) {
- this.PTZTypeText = PTZTypeText;
+ public String getSsrc() {
+ return ssrc;
+ }
+
+ public void setSsrc(String ssrc) {
+ this.ssrc = ssrc;
}
public boolean isHasAudio() {
--
Gitblit v1.8.0