Commit dc26dce4 by shenjunjie

热点库报错修复2

parent e0b6b588
...@@ -416,8 +416,8 @@ public class AppHotController extends BaseController { ...@@ -416,8 +416,8 @@ 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()); 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("currentCount", list.size());
result.put("lastCount", list.size() - lastList.size()); result.put("lastCount", list.size() - lastList.size());
if (!list.isEmpty()) { Map<String, List<JSONObject>> platformMap =
Map<String, List<JSONObject>> platformMap = list.stream().collect(Collectors.groupingBy(json -> HotPlatformEnum.convertPlatform(json.getString("type")))); list.stream().filter(json -> null != HotPlatformEnum.convertPlatform(json.getString("type"))).collect(Collectors.groupingBy(json -> HotPlatformEnum.convertPlatform(json.getString("type"))));
List<JSONObject> platformCount = new ArrayList<>(); List<JSONObject> platformCount = new ArrayList<>();
platformMap.forEach((platform, datas) -> { platformMap.forEach((platform, datas) -> {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
...@@ -426,7 +426,6 @@ public class AppHotController extends BaseController { ...@@ -426,7 +426,6 @@ public class AppHotController extends BaseController {
platformCount.add(json); platformCount.add(json);
}); });
result.put("platformCount", platformCount); result.put("platformCount", platformCount);
}
result.put("averageCount", source.size() / (Constant.ONE_YEAR / space)); result.put("averageCount", source.size() / (Constant.ONE_YEAR / space));
return result; return result;
} }
......
...@@ -51,7 +51,7 @@ public enum HotPlatformEnum { ...@@ -51,7 +51,7 @@ public enum HotPlatformEnum {
return platform.engName; return platform.engName;
} }
} }
return name; return null;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment