|
@@ -8,6 +8,7 @@ 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.baomidou.mybatisplus.extension.api.R;
|
|
|
|
+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;
|
|
@@ -70,8 +71,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){
|
|
@@ -84,7 +85,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());
|
|
@@ -98,8 +99,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){
|
|
@@ -112,7 +113,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());
|
|
@@ -127,11 +128,11 @@ 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){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数有误");
|
|
result.setMessage("参数有误");
|
|
return result;
|
|
return result;
|
|
@@ -142,7 +143,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());
|
|
@@ -156,11 +157,11 @@ 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){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数有误");
|
|
result.setMessage("参数有误");
|
|
return result;
|
|
return result;
|
|
@@ -171,7 +172,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());
|
|
@@ -186,11 +187,11 @@ 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){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数有误");
|
|
result.setMessage("参数有误");
|
|
return result;
|
|
return result;
|
|
@@ -200,7 +201,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());
|
|
@@ -214,11 +215,11 @@ 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){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数有误");
|
|
result.setMessage("参数有误");
|
|
return result;
|
|
return result;
|
|
@@ -228,7 +229,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());
|