修改评价统计更新与组合查询

bill-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -11,37 +11,37 @@ public class RedisKey {
     /**
      *  站点--排号--业务--count
      */
-    public static final String KEY_SITE_QUEUE_BUSNIESS_CHCHE = "site:queue:busniess:";
+    public static final String KEY_SITE_QUEUE_BUSNIESS_CHCHE = "stat:site:queue:busniess:";
     /**
      *  站点--排号--部门--count
      */
-    public static final String KEY_SITE_QUEUE_SECTIONNAME_CHCHE = "site:queue:sectionname:";
+    public static final String KEY_SITE_QUEUE_SECTIONNAME_CHCHE = "stat:site:queue:sectionname:";
 
     /**
      *  站点--排号--窗口--count
      */
-    public static final String KEY_SITE_QUEUE_WINDOW_CHCHE = "site:queue:window:";
+    public static final String KEY_SITE_QUEUE_WINDOW_CHCHE = "stat:site:queue:window:";
 
     /**
      *  站点--排号--大厅--count
      */
-    public static final String KEY_SITE_QUEUE_HALLNAME_CHCHE = "site:queue:hallname:";
+    public static final String KEY_SITE_QUEUE_HALLNAME_CHCHE = "stat:site:queue:hallname:";
 
 
 
     /**
      *  站点--评价--部门--count
      */
-    public static final String KEY_SITE_PJ_SECTIONNAME_CHCHE = "site:pj:sectionname:";
+    public static final String KEY_SITE_PJ_SECTIONNAME_CHCHE = "stat:site:pj:sectionname:";
 
     /**
      *  站点--评价--窗口--count
      */
-    public static final String KEY_SITE_PJ_WINDOW_CHCHE = "site:pj:window:";
+    public static final String KEY_SITE_PJ_WINDOW_CHCHE = "stat:site:pj:window:";
 
     /**
      *  站点--评价--大厅--count
      */
-    public static final String KEY_SITE_PJ_HALLNAME_CHCHE = "site:pj:hallname:";
+    public static final String KEY_SITE_PJ_HALLNAME_CHCHE = "stat:site:pj:hallname:";
 
 }

bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateStatController.java

@@ -78,9 +78,20 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
             Map<String, String> hallNameMap = cacheService.hgetAll(RedisKey.KEY_SITE_PJ_HALLNAME_CHCHE + siteId);
             Map<String, String> windowFromnumMap = cacheService.hgetAll(RedisKey.KEY_SITE_PJ_WINDOW_CHCHE + siteId);
 
-            this.addDict(model, "sectionNameList", sectionNameMap);
-            this.addDict(model, "hallNameList", hallNameMap);
-            this.addDict(model, "windowFromnumList", windowFromnumMap);
+            List<Map<String, String>> m1 = sectionNameMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+            List<Map<String, String>> m2 = hallNameMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+            List<Map<String, String>> m3 = windowFromnumMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+
+
+            this.addDict(model, "sectionNameList", m1);
+            this.addDict(model, "hallNameList", m2);
+            this.addDict(model, "windowFromnumList", m3);
             this.addDict(model, "groupList", GroupListEnum.getEnumMap());
         }