From ef19b4f85ff6442fbf87ae5c447575b0852fe463 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 09:52:23 +0800
Subject: [PATCH] Merge pull request #2 from lawrencehj/master

---
 src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

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 d46c357..10f3815 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 @@
 				"_" + "*";
 //		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());

--
Gitblit v1.8.0