Commit ce6383e2 authored by 许润龙's avatar 许润龙

修改:活动视频、直播数据详情数据接口

parent 6e6dd378
...@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming; ...@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.Max; import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -18,10 +19,11 @@ import java.util.List; ...@@ -18,10 +19,11 @@ import java.util.List;
@JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase) @JSONType(naming = com.alibaba.fastjson.PropertyNamingStrategy.SnakeCase)
public class FawActivityDTO { public class FawActivityDTO {
@Max(value = 500,message = "单页数据page_size过大") @Min(value = 1, message = "当前页最小1")
private Integer pageSize; private Integer current;
private Integer pageNum; @Max(value = 500, message = "分页大小最大500")
private Integer size;
private String publishDateStart; private String publishDateStart;
......
package com.afanticar.afantiopenapi.model.vo; package com.afanticar.afantiopenapi.model.vo;
import com.alibaba.fastjson.annotation.JSONType; import com.alibaba.fastjson.annotation.JSONType;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -12,6 +13,7 @@ public class HongqiActivityBaseVO { ...@@ -12,6 +13,7 @@ public class HongqiActivityBaseVO {
private List<ActivityVO> activityList; private List<ActivityVO> activityList;
@JsonIgnore
private String activityInfo; private String activityInfo;
} }
...@@ -105,35 +105,35 @@ public class FawOpenService { ...@@ -105,35 +105,35 @@ public class FawOpenService {
public BasePageVO<HongqiActivityAwemeVO> douyinActivityAwemes(FawActivityDTO dto) { public BasePageVO<HongqiActivityAwemeVO> douyinActivityAwemes(FawActivityDTO dto) {
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getPageNum(), dto.getPageSize()); IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getCurrent(), dto.getSize());
IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.douyinActivityAwemes(page, dto); IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.douyinActivityAwemes(page, dto);
BaseUtils.parseSeries(awemePage.getRecords()); BaseUtils.parseSeries(awemePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords()); return BasePageVO.restPage(dto.getCurrent(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
} }
public BasePageVO<HongqiActivityLiveVO> douyinActivityLives(FawActivityDTO dto) { public BasePageVO<HongqiActivityLiveVO> douyinActivityLives(FawActivityDTO dto) {
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityLiveVO> page = new Page<>(dto.getPageNum(), dto.getPageSize()); IPage<HongqiActivityLiveVO> page = new Page<>(dto.getCurrent(), dto.getSize());
IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.douyinActivityLives(page, dto); IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.douyinActivityLives(page, dto);
BaseUtils.parseSeries(livePage.getRecords()); BaseUtils.parseSeries(livePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords()); return BasePageVO.restPage(dto.getCurrent(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
} }
public BasePageVO<HongqiActivityAwemeVO> kuaishouActivityAwemes(FawActivityDTO dto) { public BasePageVO<HongqiActivityAwemeVO> kuaishouActivityAwemes(FawActivityDTO dto) {
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getPageNum(), dto.getPageSize()); IPage<HongqiActivityAwemeVO> page = new Page<>(dto.getCurrent(), dto.getSize());
IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityAwemes(page, dto); IPage<HongqiActivityAwemeVO> awemePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityAwemes(page, dto);
BaseUtils.parseSeries(awemePage.getRecords()); BaseUtils.parseSeries(awemePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords()); return BasePageVO.restPage(dto.getCurrent(), (int) awemePage.getSize(), (int) awemePage.getTotal(), (int) awemePage.getPages(), awemePage.getRecords());
} }
public BasePageVO<HongqiActivityLiveVO> kuaishouActivityLives(FawActivityDTO dto) { public BasePageVO<HongqiActivityLiveVO> kuaishouActivityLives(FawActivityDTO dto) {
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
IPage<HongqiActivityLiveVO> page = new Page<>(dto.getPageNum(), dto.getPageSize()); IPage<HongqiActivityLiveVO> page = new Page<>(dto.getCurrent(), dto.getSize());
IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityLives(page, dto); IPage<HongqiActivityLiveVO> livePage = dwdKuaishouAuthorInfoMapper.kuaishouActivityLives(page, dto);
BaseUtils.parseSeries(livePage.getRecords()); BaseUtils.parseSeries(livePage.getRecords());
return BasePageVO.restPage(dto.getPageNum(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords()); return BasePageVO.restPage(dto.getCurrent(), (int) livePage.getSize(), (int) livePage.getTotal(), (int) livePage.getPages(), livePage.getRecords());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment