Merge branch 'dev' of http://129.211.46.84:8800/platform/hp-smart into dev-sx

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI003.java

@@ -314,20 +314,22 @@ public class ServiceHPBI003 extends ServiceBase {
         }
         List<Map> result = new ArrayList<>();
         List<Map> listMap = DaoBase.getInstance().query("HPBI003.queryDayWts", params, 0,100);
-        Map<Object , Map<Object,List<Map>>> mapList = listMap.stream().collect(Collectors.groupingBy(map -> map.get("date"),Collectors.groupingBy(map -> map.get("series"))));
-        for (Object key: mapList.keySet()) {
+        List listMap2 = listMap.stream().map(map -> map.get("date")).sorted().distinct().collect(Collectors.toList());
+        Map<Object, List<Map>> listMap1 = listMap.stream().collect(Collectors.groupingBy(m -> m.get("series")));
+        for (Object key: listMap1.keySet()) {
             Map<Object, Object> map = new HashMap<>();
-            List<Map> list1 = new ArrayList<>();
-            Map<Object, List<Map>> listMap1 = mapList.get(key);
-            for (Object key1: listMap1.keySet()) {
-                Map<Object, Object> map2 = new HashMap<>();
-                map2.put(key1, listMap1.get(key1).stream().map(m -> m.get("wt")).collect(Collectors.toList()));
-                list1.add(map2);
+            map.put("name", key);
+            map.put("type", "line");
+            map.put("stack", "Total");
+            List list1 = new ArrayList<>();
+            for (Map map1: listMap1.get(key)) {
+                list1.add(map1.get("wt"));
             }
-            map.put(key, list1);
+            map.put("data", list1);
             result.add(map);
         }
-        inInfo.set("date", mapList.keySet());
+        inInfo.set("date", listMap2);
+        inInfo.set("name", listMap1.keySet());
         inInfo.set("result", result);
         return  inInfo;
     }