Parcourir la source

修改头条视频报表查询逻辑

songyh il y a 3 ans
Parent
commit
7b03fdf3b3

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialReportOverViewController.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.ctop.service.IMaterialReportOverViewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
@@ -28,7 +29,7 @@ public class MaterialReportOverViewController {
     @Autowired
     private IMaterialReportOverViewService materialReportOverViewService;
 
-    @Autowired
+    @Resource
     private MaterialReportOverViewMapper materialReportOverViewMapper;
 
     /**

+ 3 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.MD5Util;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
@@ -26,6 +27,7 @@ import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
@@ -43,7 +45,7 @@ import java.util.*;
 public class ProjectMemberController {
     @Autowired
     private IProjectMemberService projectMemberService;
-    @Autowired
+    @Resource
     private ProjectMemberMapper projectMemberMapper;
     @Autowired
     private IProjectService projectService;
@@ -573,8 +575,5 @@ public class ProjectMemberController {
             result.setSuccess(true);
         }
         return result;
-
     }
-
-
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MediaReportMapper.xml

@@ -111,7 +111,7 @@
 
                  SELECT r.*, (r.todayCost - r.yesterdayCost) as diffCost, (r.todayCost + r.yesterdayCost) as sumCost
                  from (
-                          SELECT '- '                                                            as mediaType,
+                          SELECT '-'                                                            as mediaType,
                                  '-'                                                             as companyId,
                                  id                                                              as advertiserId,
                                  corporation_name                                                as advertiserName,

+ 2 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -16,6 +16,8 @@
         t1.material_name AS materialName,
         t1.project_name AS projectName,
         t1.material_create_time AS createTime,
+        sum (t1.material_show) as showMaterial,
+        sum (t1.click) as clickMaterial,
         ${filed}
         FROM
         etl_report_bytedance_video t1

+ 0 - 4
module-toutiao/src/main/resources/json_template/bytedance_video_report_mapping.json

@@ -3,10 +3,6 @@
     "filed": "IFNULL(sum(t1.cost),0) as cost ",
     "comment": "消耗"
   },
-  "showMaterial": {
-    "filed": "IFNULL(sum(t1.material_show),0) as showMaterial ",
-    "comment": "展示数"
-  },
   "cpm": {
     "filed": "CASE WHEN sum(t1.cost) / sum(t1.material_show) IS NULL THEN 0 ELSE ROUND((sum(t1.cost) / sum(t1.material_show)) * 1000, 2 ) END AS cpm ",
     "comment": "平均千次展现费用"