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