Commit 7d0b286a by shenjunjie

Merge branch 'feature' into 'release'

热点库报错修复

See merge request !359
parents 7ec62ba4 e0b6b588
......@@ -416,6 +416,7 @@ 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) -> {
......@@ -425,6 +426,7 @@ public class AppHotController extends BaseController {
platformCount.add(json);
});
result.put("platformCount", platformCount);
}
result.put("averageCount", source.size() / (Constant.ONE_YEAR / space));
return result;
}
......
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