Merge branch 'feature' into 'release'

热点库报错修复2

See merge request !361

src/main/java/com/zhiwei/brandkbs2/controller/app/AppHotController.java

@@ -416,17 +416,16 @@ public class AppHotController extends BaseController {
         List<JSONObject> lastList = source.stream().filter(json -> json.getLong("startTime") >= (timeRange[0] - space) && json.getLong("startTime") < timeRange[0]).collect(Collectors.toList());
         result.put("currentCount", list.size());
         result.put("lastCount", list.size() - lastList.size());
-        if (!list.isEmpty()) {
-            Map<String, List<JSONObject>> platformMap = list.stream().collect(Collectors.groupingBy(json -> HotPlatformEnum.convertPlatform(json.getString("type"))));
-            List<JSONObject> platformCount = new ArrayList<>();
-            platformMap.forEach((platform, datas) -> {
-                JSONObject json = new JSONObject();
-                json.put("platform", platform);
-                json.put("count", datas.size());
-                platformCount.add(json);
-            });
-            result.put("platformCount", platformCount);
-        }
+        Map<String, List<JSONObject>> platformMap =
+                list.stream().filter(json -> null != HotPlatformEnum.convertPlatform(json.getString("type"))).collect(Collectors.groupingBy(json -> HotPlatformEnum.convertPlatform(json.getString("type"))));
+        List<JSONObject> platformCount = new ArrayList<>();
+        platformMap.forEach((platform, datas) -> {
+            JSONObject json = new JSONObject();
+            json.put("platform", platform);
+            json.put("count", datas.size());
+            platformCount.add(json);
+        });
+        result.put("platformCount", platformCount);
         result.put("averageCount", source.size() / (Constant.ONE_YEAR / space));
         return result;
     }

src/main/java/com/zhiwei/brandkbs2/enmus/HotPlatformEnum.java

@@ -51,7 +51,7 @@ public enum HotPlatformEnum {
                 return platform.engName;
             }
         }
-        return name;
+        return null;
     }
 
 }