Commit 1849586d by carrieyzzhang

log

parent 482c93ed
...@@ -75,12 +75,15 @@ public class EventReportCallable implements Callable<Map<String, List>> { ...@@ -75,12 +75,15 @@ public class EventReportCallable implements Callable<Map<String, List>> {
} }
//获取时间范围内按照时间粒度的所有日期 //获取时间范围内按照时间粒度的所有日期
Map<String, String> dateStringMap = eventStatsService.getDateMapByViewFlag(startDate, endDate, viewType); Map<String, String> dateStringMap = eventStatsService.getDateMapByViewFlag(startDate, endDate, viewType);
System.out.println("format................");
//格式化数据 //格式化数据
result = eventStatsService.formatComplicatedEventResponse(app, accountid, responseJson, dateStringMap, groupJsonArray, selectList); result = eventStatsService.formatComplicatedEventResponse(app, accountid, responseJson, dateStringMap, groupJsonArray, selectList);
System.out.println("after format..........................");
}else{ }else{
//查询合计 //查询合计
List<JSONObject> totalValue = eventStatsService.queryDistinctTotalData(app.getId(), accountid, startDate, endDate, eventCondition, viewType); List<JSONObject> totalValue = eventStatsService.queryDistinctTotalData(app.getId(), accountid, startDate, endDate, eventCondition, viewType);
System.out.println("after total calculate...................");
result = new HashMap<>(); result = new HashMap<>();
result.put("totalval",totalValue); result.put("totalval",totalValue);
} }
......
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