Merge pull request #2 from lawrencehj/master

648540858

2020-10-26 ef19b4f85ff6442fbf87ae5c447575b0852fe463

 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());