|
@@ -25,8 +25,8 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
|
|
|
BytedanceHomepageMapper bytedanceHomepageMapper;
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, JSONObject> getWeekReport(JSONObject requestBody) {
|
|
|
- Map<String, JSONObject> result = new HashMap<>();
|
|
|
+ public Map<String, Object> getWeekReport(JSONObject requestBody) {
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
//当天日期
|
|
|
String nowDate = DateUtils.getNowDate(SystemDateConstant.yyyy_MM_dd);
|
|
|
//本周汇总数据
|
|
@@ -43,16 +43,25 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
|
|
|
JSONObject top = new JSONObject();
|
|
|
top.put("top7", costTop);
|
|
|
//周明细环比数据拼接
|
|
|
- JSONObject costWeekData = new JSONObject();
|
|
|
+ List<Map<String,Object>> costWeekData = new ArrayList<>();
|
|
|
JSONObject costWeekLink = new JSONObject();
|
|
|
- JSONObject clickWeekData = new JSONObject();
|
|
|
+ List<Map<String,Object>> clickWeekData = new ArrayList<>();
|
|
|
JSONObject clickWeekLink = new JSONObject();
|
|
|
- JSONObject showNumWeekData = new JSONObject();
|
|
|
+ List<Map<String,Object>> showNumWeekData = new ArrayList<>();
|
|
|
JSONObject showNumWeekLink = new JSONObject();
|
|
|
weekDetailData.forEach(day -> {
|
|
|
- costWeekData.put((String) day.get("statDate"), day.get("cost"));
|
|
|
- clickWeekData.put((String) day.get("statDate"), day.get("click"));
|
|
|
- showNumWeekData.put((String) day.get("statDate"), day.get("showNum"));
|
|
|
+ Map<String,Object> cost= new HashMap<>();
|
|
|
+ Map<String,Object> click= new HashMap<>();
|
|
|
+ Map<String,Object> showNum= new HashMap<>();
|
|
|
+ cost.put("statDate",day.get("statDate"));
|
|
|
+ cost.put("cost",day.get("cost"));
|
|
|
+ click.put("statDate",day.get("statDate"));
|
|
|
+ click.put("click",day.get("click"));
|
|
|
+ showNum.put("statDate",day.get("statDate"));
|
|
|
+ showNum.put("showNum",day.get("showNum"));
|
|
|
+ costWeekData.add(cost);
|
|
|
+ clickWeekData.add(click);
|
|
|
+ showNumWeekData.add(showNum);
|
|
|
});
|
|
|
costWeekLink.put("weekCostSum", weekSumData.get("cost"));
|
|
|
costWeekLink.put("weekCostSumLink", countLink(weekSumData.getBigDecimal("cost"), weekBeforeSumData.getBigDecimal("cost")));
|