yumeng 1 هفته پیش
والد
کامیت
61adb9542f
14فایلهای تغییر یافته به همراه49 افزوده شده و 24 حذف شده
  1. 5 5
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ReportController.java
  2. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/AdqAdvertiserReportMapper.java
  3. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/BytedanceAccountReportDailyDwMapper.java
  4. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/KuaishouAccountReportDailyDwMapper.java
  5. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IAdqAdvertiserReportService.java
  6. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IBytedanceAccountReportDailyDwService.java
  7. 1 1
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IKuaishouAccountReportDailyDwService.java
  8. 8 4
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/AdqAdvertiserReportServiceImpl.java
  9. 8 4
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/BytedanceAccountReportDailyDwServiceImpl.java
  10. 8 4
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouAccountReportDailyDwServiceImpl.java
  11. 4 0
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/CtopAdConstant.java
  12. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  13. 4 0
      jeecg-boot-report/src/main/java/cn/com/ctop/common/constant/CtopAdConstant.java
  14. 3 0
      jeecg-boot-report/src/main/java/cn/com/ctop/report/controller/KuaishouMaterialReportDailyDwController.java

+ 5 - 5
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ReportController.java

@@ -160,17 +160,17 @@ public class ReportController {
      * @param mediaId
      */
     @GetMapping("/getProjectReport")
-    public Result<Object> getProjectReport(String mediaId, String category, String sortCode, String order, Long projectId, String startTime, String endTime, String userId, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public Result<Object> getProjectReport(String mediaId, String category, String sortCode, String order, Long projectId, String startTime, String endTime, String userId, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "allData", defaultValue = "false") Boolean allData) {
         try {
-            String cacheKey = "dashboard:summary:getProjectReport:" + safe(mediaId) + ":" + safe(category) + ":" + safe(sortCode) + ":" + safe(order) + ":" + safe(projectId) + ":" + safe(startTime) + ":" + safe(endTime) + ":" + safe(userId) + ":" + safe(pageNo) + ":" + safe(pageSize);
+            String cacheKey = "dashboard:summary:getProjectReport:" + safe(mediaId) + ":" + safe(category) + ":" + safe(sortCode) + ":" + safe(order) + ":" + safe(projectId) + ":" + safe(startTime) + ":" + safe(endTime) + ":" + safe(userId) + ":" + safe(pageNo) + ":" + safe(pageSize) + ":" + safe(allData);
             return getCachedResult(cacheKey, resolveCacheTtl(startTime, endTime), () -> {
                 try {
                     if ("1".equals(mediaId)) {
-                        return bytedanceReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
+                        return bytedanceReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo, allData);
                     } else if ("16".equals(mediaId)) {
-                        return adqAdvertiserReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo, userId);
+                        return adqAdvertiserReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo, userId, allData);
                     }
-                    return kuaishouReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
+                    return kuaishouReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo, allData);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/AdqAdvertiserReportMapper.java

@@ -35,7 +35,7 @@ public interface AdqAdvertiserReportMapper {
 
     List<JSONObject> getProjectToDayReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("hour") Integer hour, @Param("sortCode") String sortCode, @Param("order") String order, @Param("userIds") List<String> userIds);
 
-    List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order, @Param("userIds") List<String> userIds);
+    List<JSONObject> getProjectMoreDaysReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order, @Param("userIds") List<String> userIds);
 
     List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTime, @Param("endTime") Integer endTime);
 

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/BytedanceAccountReportDailyDwMapper.java

@@ -25,7 +25,7 @@ public interface BytedanceAccountReportDailyDwMapper {
 
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
 
-    List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order);
+    List<JSONObject> getProjectMoreDaysReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order);
 
     List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/KuaishouAccountReportDailyDwMapper.java

@@ -23,7 +23,7 @@ public interface KuaishouAccountReportDailyDwMapper {
 
     Long getProjectMoreDaysReportTotal(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("hour") Integer hour);
 
-    List<JSONObject> getProjectMoreDaysReport(@Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order);
+    List<JSONObject> getProjectMoreDaysReport(@Param("category") String category, @Param("projectId") Long projectId, @Param("startTime") Integer startTime, @Param("endTime") Integer endTime, @Param("lastStart") Integer lastStart, @Param("lastEnd") Integer lastEnd, @Param("sortCode") String sortCode, @Param("order") String order);
 
     List<JSONObject> getProjectNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IAdqAdvertiserReportService.java

@@ -11,7 +11,7 @@ public interface IAdqAdvertiserReportService {
 
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
-    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, String userId) throws Exception;
+    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, String userId, Boolean allData) throws Exception;
 
     Result<Object> getOperateInfo(String startTime, String endTime);
 

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IBytedanceAccountReportDailyDwService.java

@@ -11,7 +11,7 @@ public interface IBytedanceAccountReportDailyDwService {
 
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
-    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, Boolean allData) throws Exception;
 
     Result<Object> getOperateInfo(String startTime, String endTime);
 

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IKuaishouAccountReportDailyDwService.java

@@ -11,7 +11,7 @@ public interface IKuaishouAccountReportDailyDwService {
 
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
-    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, Boolean allData) throws Exception;
 
     Result<Object> getOperateInfo(String startTime, String endTime);
 

+ 8 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/AdqAdvertiserReportServiceImpl.java

@@ -128,7 +128,7 @@ public class AdqAdvertiserReportServiceImpl implements IAdqAdvertiserReportServi
     }
 
     @Override
-    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, String userId) throws Exception {
+    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, String userId, Boolean allData) throws Exception {
         if (Check.isNull(order)) {
             order = "DESC";
         }
@@ -143,14 +143,18 @@ public class AdqAdvertiserReportServiceImpl implements IAdqAdvertiserReportServi
         List<JSONObject> data;
         List<String> userIds = resolveTencentUserIds(userId);
         if (startTime.equals(endTime) && today.equals(startTime)) {
-            PageHelper.startPage(pageNo, pageSize, false);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
             data = adqAdvertiserReportMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour, sortCode, order, userIds);
         } else {
             int days = DateUtils.dateDiff(startTime, endTime) + 1;
             Integer lastStart = DateUtils.getDateInteger(DateUtils.getLastDay(startTime, days));
             Integer lastEnd = DateUtils.getDateInteger(DateUtils.getLastDay(endTime, days));
-            PageHelper.startPage(pageNo, pageSize, false);
-            data = adqAdvertiserReportMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order, userIds);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
+            data = adqAdvertiserReportMapper.getProjectMoreDaysReport(category, projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order, userIds);
         }
         PageInfo<JSONObject> page = new PageInfo<>(data);
         return Result.OK(page);

+ 8 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/BytedanceAccountReportDailyDwServiceImpl.java

@@ -98,7 +98,7 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
     }
 
     @Override
-    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, Boolean allData) throws Exception {
         if (Check.isNull(order)) {
             order = "DESC";
         }
@@ -113,15 +113,19 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
         String today = DateUtils.formatDate(new Date());
         List<JSONObject> data = null;
         if (startTime.equals(endTime) && today.equals(startTime)) {
-            PageHelper.startPage(pageNo, pageSize, false);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
             data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour, sortCode, order);
         } else {
             int days = DateUtils.dateDiff(startTime, endTime) + 1;
             //上阶段时间
             Integer lastStart = DateUtils.getDateInteger(DateUtils.getLastDay(startTime, days));
             Integer lastEnd = DateUtils.getDateInteger(DateUtils.getLastDay(endTime, days));
-            PageHelper.startPage(pageNo, pageSize, false);
-            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
+            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(category, projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order);
         }
         PageInfo<JSONObject> page = new PageInfo<>(data);
         return Result.OK(page);

+ 8 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouAccountReportDailyDwServiceImpl.java

@@ -97,7 +97,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
     }
 
     @Override
-    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo, Boolean allData) throws Exception {
         if (Check.isNull(order)) {
             order = "DESC";
         }
@@ -113,15 +113,19 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
         String today = DateUtils.formatDate(new Date());
         List<JSONObject> data = null;
         if (startTime.equals(endTime) && today.equals(startTime)) {
-            PageHelper.startPage(pageNo, pageSize, false);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
             data = kuaishouAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour, sortCode, order);
         } else {
             int days = DateUtils.dateDiff(startTime, endTime) + 1;
             //上阶段时间
             Integer lastStart = DateUtils.getDateInteger(DateUtils.getLastDay(startTime, days));
             Integer lastEnd = DateUtils.getDateInteger(DateUtils.getLastDay(endTime, days));
-            PageHelper.startPage(pageNo, pageSize, false);
-            data = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order);
+            if (!Boolean.TRUE.equals(allData)) {
+                PageHelper.startPage(pageNo, pageSize, false);
+            }
+            data = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReport(category, projectId, startTimeInt, endTimeInt, lastStart, lastEnd, sortCode, order);
         }
         PageInfo<JSONObject> page = new PageInfo<>(data);
         return Result.OK(page);

+ 4 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/CtopAdConstant.java

@@ -18,11 +18,15 @@ public class CtopAdConstant {
     //头条内广
     public static final String PLATFORM_TYPE_KUAISHOU_INSIDE = "4";
     public static final  int PLATFORM_TYPE_KUAISHOU_INSIDE_INT = 4;
+    //腾讯广告
+    public static final String PLATFORM_TYPE_TENCENT = "16";
+    public static final int PLATFORM_TYPE_TENCENT_INT = 16;
 
     public static final String PLATFORM_TYPE_PANGOLIN = "5";
 
     public static final String PLATFORM_TYPE_BYTEDANCE_PY = "bytedance";
     public static final String PLATFORM_TYPE_KUAISHOU_PY = "kuaishou";
+    public static final String PLATFORM_TYPE_TENCENT_PY = "tencent";
     public static final String PLATFORM_TYPE_PANGOLIN_PY = "pangolin";
 
     public static final String BYTEDANCE_REPORT_TYPE_DAILY = "STAT_TIME_GRANULARITY_DAILY";

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -172,6 +172,9 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         } else if (mediaType.equals(CtopAdConstant.PLATFORM_TYPE_KUAISHOU)) {
             mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
             mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INSIDE_INT);
+        } else if (mediaType.equals(CtopAdConstant.PLATFORM_TYPE_TENCENT)
+                || mediaType.equals(CtopAdConstant.PLATFORM_TYPE_TENCENT_PY)) {
+            mediaList.add(CtopAdConstant.PLATFORM_TYPE_TENCENT_INT);
         }
         //查询登录账号下的项目
         List<ProjectMember> projectMemberList = this.queryProjectMemberBy(userId, mediaList);
@@ -478,4 +481,3 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 }
 
 
-

+ 4 - 0
jeecg-boot-report/src/main/java/cn/com/ctop/common/constant/CtopAdConstant.java

@@ -18,11 +18,15 @@ public class CtopAdConstant {
     //头条内广
     public static final String PLATFORM_TYPE_KUAISHOU_INSIDE = "4";
     public static final  int PLATFORM_TYPE_KUAISHOU_INSIDE_INT = 4;
+    //腾讯广告
+    public static final String PLATFORM_TYPE_TENCENT = "16";
+    public static final int PLATFORM_TYPE_TENCENT_INT = 16;
 
     public static final String PLATFORM_TYPE_PANGOLIN = "5";
 
     public static final String PLATFORM_TYPE_BYTEDANCE_PY = "bytedance";
     public static final String PLATFORM_TYPE_KUAISHOU_PY = "kuaishou";
+    public static final String PLATFORM_TYPE_TENCENT_PY = "tencent";
     public static final String PLATFORM_TYPE_PANGOLIN_PY = "pangolin";
 
     public static final String BYTEDANCE_REPORT_TYPE_DAILY = "STAT_TIME_GRANULARITY_DAILY";

+ 3 - 0
jeecg-boot-report/src/main/java/cn/com/ctop/report/controller/KuaishouMaterialReportDailyDwController.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.report.controller;
 
 import cn.com.ctop.common.constant.AccountReportConstants;
+import cn.com.ctop.common.constant.CtopAdConstant;
 import cn.com.ctop.common.mapper.SysRoleMapper;
 import cn.com.ctop.common.service.IProjectMemberService;
 import cn.com.ctop.common.service.ISysRoleService;
@@ -62,6 +63,8 @@ public class KuaishouMaterialReportDailyDwController {
         if ("kuaishou".equals(type)) {
             mediaIds.add(2);
             mediaIds.add(4);
+        } else if (CtopAdConstant.PLATFORM_TYPE_TENCENT_PY.equals(type)) {
+            mediaIds.add(CtopAdConstant.PLATFORM_TYPE_TENCENT_INT);
         } else {
             mediaIds.add(1);
             mediaIds.add(3);