Преглед на файлове

Merge branch 'test' of http://39.106.184.70:3000/ctop/adsp-boot into test

yumeng преди 5 години
родител
ревизия
491f0cd405

+ 0 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinAppServiceImpl.java

@@ -28,7 +28,6 @@ public class PangolinAppServiceImpl extends ServiceImpl<PangolinAppMapper, Pango
     @Override
     public Map<String, Object> getListByUserId(String userId, JSONObject data) {
         Map<String,Object>result = new HashMap<>();
-        System.out.println(data.toJSONString());
         List<Long>projectIds = null;
         List<String>accountNames = null;
         JSONArray accountNameArray = data.getJSONArray("accountName");

+ 0 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java

@@ -64,7 +64,6 @@ public class PangolinReportAppHourServiceImpl extends ServiceImpl<PangolinReport
 
     private JSONObject getComparedDate(Integer appId,Integer hour,String userId,String type,String today, String yesterday, String sevenDaysAgo, String compareTime1, String compareTime2,List<Long>projectIds,List<String>  accountNames) {
         JSONObject data = pangolinReportAppHourMapper.getComparedDate(appId,hour,userId,type,today, yesterday,sevenDaysAgo,compareTime1,compareTime2,projectIds,accountNames);
-        System.out.println(data.toJSONString());
         if(null==data||data.toJSONString().equals("null")){
             data = new JSONObject();
             data.put("today",0);

+ 3 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceHomepageReportCtrl.java

@@ -25,10 +25,10 @@ public class BytedanceHomepageReportCtrl {
     IBytedanceHomepageReportService bytedanceHomepageReportService;
 
     @PostMapping("/report/week")
-    public Result<Map<String,JSONObject>> getWeekReport(@RequestBody JSONObject requestBody) {
-        Result<Map<String,JSONObject>> result = new Result<>();
+    public Result<Map<String,Object>> getWeekReport(@RequestBody JSONObject requestBody) {
+        Result<Map<String,Object>> result = new Result<>();
         try {
-            Map<String, JSONObject> weekReport = bytedanceHomepageReportService.getWeekReport(requestBody);
+            Map<String, Object> weekReport = bytedanceHomepageReportService.getWeekReport(requestBody);
             result.setResult(weekReport);
             result.setSuccess(true);
         } catch (Exception e) {

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceHomepageReportService.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface IBytedanceHomepageReportService {
 
-    Map<String,JSONObject> getWeekReport(JSONObject requestBody);
+    Map<String,Object> getWeekReport(JSONObject requestBody);
 
     Map<String,List<JSONObject>> getChartByDate(JSONObject requestBody);
 

+ 17 - 8
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceHomepageReportServiceImpl.java

@@ -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")));