|
@@ -77,13 +77,13 @@ public class ReportController {
|
|
|
* @param mediaId
|
|
|
*/
|
|
|
@GetMapping("/getTrendCharge")
|
|
|
- public Result<Object> getTrendCharge(String type,String mediaId, Long projectId, String startTime, String endTime) {
|
|
|
+ public Result<Object> getTrendCharge(String type, String mediaId, Long projectId, String startTime, String endTime) {
|
|
|
try {
|
|
|
JSONObject data = null;
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- data = bytedanceReportService.getTrendCharge(type,projectId, startTime, endTime);
|
|
|
+ data = bytedanceReportService.getTrendCharge(type, projectId, startTime, endTime);
|
|
|
} else {
|
|
|
- data = kuaishouReportService.getTrendCharge(type,projectId, startTime, endTime);
|
|
|
+ data = kuaishouReportService.getTrendCharge(type, projectId, startTime, endTime);
|
|
|
}
|
|
|
return Result.OK(data);
|
|
|
} catch (Exception e) {
|
|
@@ -100,12 +100,12 @@ public class ReportController {
|
|
|
* @param mediaId
|
|
|
*/
|
|
|
@GetMapping("/getProjectReport")
|
|
|
- public Result<Object> getProjectReport(String mediaId,String sortCode,String order, Long projectId, String startTime, String endTime, @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, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
|
try {
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- return bytedanceReportService.getProjectReport(projectId, startTime, endTime,sortCode,order, pageSize, pageNo);
|
|
|
+ return bytedanceReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
|
|
|
} else {
|
|
|
- return kuaishouReportService.getProjectReport(projectId, startTime, endTime,sortCode,order, pageSize, pageNo);
|
|
|
+ return kuaishouReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|