From 009e46f7f235b081f69bb7cb82e7cb1cc76154a6 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: Sat, 24 Oct 2020 15:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=80=9A=E9=81=93=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=8E=92=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=AE=BE=E5=A4=87=E9=80=9A=E9=81=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B9=B1=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/storager/redis/VideoManagerRedisStoragerImpl.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
index d46c357b..10f38159 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -155,6 +155,13 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
 				"_" + "*";
 //		List<Object> deviceChannelList = redis.keys(queryStr);
 		List<Object> deviceChannelList = redis.scan(queryStr);
+		//对查询结果排序，避免出现通道排列顺序乱序的情况
+		Collections.sort(deviceChannelList,new Comparator<Object>(){
+			@Override
+			public int compare(Object o1, Object o2) {
+				return o1.toString().compareToIgnoreCase(o2.toString());
+			}
+		});
 		pageResult.setPage(page);
 		pageResult.setCount(count);
 		pageResult.setTotal(deviceChannelList.size());