|
@@ -7,13 +7,13 @@ import cn.com.ctop.kuaishou.modules.report.entity.KuaishouInfoDTO;
|
|
import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO;
|
|
import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO;
|
|
import cn.com.ctop.kuaishou.modules.report.entity.ProjectAccountDTO;
|
|
import cn.com.ctop.kuaishou.modules.report.entity.ProjectAccountDTO;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
|
|
|
|
+import com.baomidou.mybatisplus.extension.api.R;
|
|
|
|
+import com.github.pagehelper.Page;
|
|
|
|
+import com.github.pagehelper.PageInfo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -72,8 +72,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouProjectInfo")
|
|
@RequestMapping("/getKuaishouProjectInfo")
|
|
- public Result<List<ProjectAccountDTO>> getKuaishouProjectInfo(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<ProjectAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<ProjectAccountDTO>> getKuaishouProjectInfo(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<ProjectAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
|
|
@@ -86,7 +86,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(),dto.getPageSize(),dto.getPageNum(), "");
|
|
|
|
|
|
+ PageInfo<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(),dto.getPageSize(),dto.getPageNum(), "");
|
|
result.setResult(projectAccountDTOList);
|
|
result.setResult(projectAccountDTOList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -100,8 +100,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouSaleProjectInfo")
|
|
@RequestMapping("/getKuaishouSaleProjectInfo")
|
|
- public Result<List<ProjectAccountDTO>> getKuaishouSaleProjectInfo(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<ProjectAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<ProjectAccountDTO>> getKuaishouSaleProjectInfo(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<ProjectAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
|
|
@@ -114,7 +114,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouSaleProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(),dto.getPageSize(),dto.getPageNum(), "");
|
|
|
|
|
|
+ PageInfo<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouSaleProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(),dto.getPageSize(),dto.getPageNum(), "");
|
|
result.setResult(projectAccountDTOList);
|
|
result.setResult(projectAccountDTOList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -129,8 +129,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouAccountInfoByProjectId")
|
|
@RequestMapping("/getKuaishouAccountInfoByProjectId")
|
|
- public Result<List<KuaishouReportDailyAccountDTO>> getKuaishouAccountInfoByProjectId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<KuaishouReportDailyAccountDTO>> getKuaishouAccountInfoByProjectId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getProjectId()==null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getProjectId()==null){
|
|
@@ -144,7 +144,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<KuaishouReportDailyAccountDTO> kuaishouReportDailyAccountDTOList = accountService.getKuaishouAccountInfoByProjectId(dto.getProjectId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
|
|
|
|
+ PageInfo<KuaishouReportDailyAccountDTO> kuaishouReportDailyAccountDTOList = accountService.getKuaishouAccountInfoByProjectId(dto.getProjectId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
result.setResult(kuaishouReportDailyAccountDTOList);
|
|
result.setResult(kuaishouReportDailyAccountDTOList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -158,8 +158,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouCampaignInfoByAccountId")
|
|
@RequestMapping("/getKuaishouCampaignInfoByAccountId")
|
|
- public Result<List<KuaishouReportDailyAccountDTO>> getKuaishouCampaignInfoByAccountId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<KuaishouReportDailyAccountDTO>> getKuaishouCampaignInfoByAccountId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getAccountId()==null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getAccountId()==null){
|
|
@@ -173,7 +173,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCampaignInfoByAccountId(dto.getAccountId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
|
|
|
|
+ PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCampaignInfoByAccountId(dto.getAccountId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -188,8 +188,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouUnitInfoByCampaignId")
|
|
@RequestMapping("/getKuaishouUnitInfoByCampaignId")
|
|
- public Result<List<KuaishouReportDailyAccountDTO>> getKuaishouUnitInfoByCampaignId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<KuaishouReportDailyAccountDTO>> getKuaishouUnitInfoByCampaignId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getCampaignId()==null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getCampaignId()==null){
|
|
@@ -202,7 +202,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouUnitInfoByCampaignId(dto.getCampaignId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
|
|
|
|
+ PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouUnitInfoByCampaignId(dto.getCampaignId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -216,8 +216,8 @@ public class KuaiShouController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping("/getKuaishouCreativeInfoByUnitId")
|
|
@RequestMapping("/getKuaishouCreativeInfoByUnitId")
|
|
- public Result<List<KuaishouReportDailyAccountDTO>> getKuaishouCreativeInfoByUnitId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
- Result<List<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
|
|
|
|
+ public Result<PageInfo<KuaishouReportDailyAccountDTO>> getKuaishouCreativeInfoByUnitId(@RequestBody KuaishouInfoDTO dto) {
|
|
|
|
+ Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getUnitId()==null){
|
|
if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getUnitId()==null){
|
|
@@ -230,7 +230,7 @@ public class KuaiShouController {
|
|
}
|
|
}
|
|
|
|
|
|
try{
|
|
try{
|
|
- List<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCreativeInfoByUnitId(dto.getUnitId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
|
|
|
|
+ PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCreativeInfoByUnitId(dto.getUnitId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum());
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
result.setResult(kuaishouCampaignInfoList);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|