Commit b4b27786 authored by nie'hong's avatar nie'hong

修改-大屏右下方数据取消分页

parent ea50c7c3
......@@ -22,7 +22,7 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
public List<TBoardPlayRank> getBoardRankPageList(Page<TBoardPlayRank> page, TBoardPlayRank rank);
public List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend);
// public List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend);
// /**
// * 获取展板播放趋势 去掉数据库分页查询
......@@ -31,7 +31,7 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
// * @param trend
// * @return
// */
// public List<TBoardPlayTrend> getBoardTrendPageList(@Param("trend") TBoardPlayTrend trend);
public List<TBoardPlayTrend> getBoardTrendPageList(@Param("trend") TBoardPlayTrend trend);
public List<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district);
......
......@@ -38,7 +38,7 @@ public interface TBoardStatisticService extends IService<TBoardStatistic> {
// * @param rank
// * @return
// */
Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
// Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
/**
* 获取展板播放趋势
......@@ -46,7 +46,7 @@ public interface TBoardStatisticService extends IService<TBoardStatistic> {
* @param rank
* @return
*/
// List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
/**
* 获取地区看板统计信息
......
......@@ -99,20 +99,20 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
return page;
}
@Override
public Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
page.setRecords(boardStatisticMapper.getBoardTrendPageList(page, trend));
return page;
}
// @Override
// public List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
// public Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
//
// List<TBoardPlayTrend> boardTrendPageList = boardStatisticMapper.getBoardTrendPageList(trend);
// return boardTrendPageList;
// page.setRecords(boardStatisticMapper.getBoardTrendPageList(page, trend));
// return page;
// }
@Override
public List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
List<TBoardPlayTrend> boardTrendPageList = boardStatisticMapper.getBoardTrendPageList(trend);
return boardTrendPageList;
}
@Override
public Page<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district) {
List<TDistrictBoardStatistic> list = boardStatisticMapper.getBoardDistrictPageList(page, district);
......
......@@ -130,7 +130,12 @@ public class TBoardStatisticController extends BaseController {
List<String> areaIds = findAllAreaIdByParentCode(trend.getAreaCode());
trend.setAreaIds(areaIds);
Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardTrendPageList(getPage(), trend);
List<TBoardPlayTrend> data = this.tBoardStatisticService.getBoardTrendPageList(getPage(), trend);
// 这里新建一个分页对象,是因为之前接口使用了分页,但其实不应该用分页,为了不改变返回给前端数据的结构,所以这样做
Page<TBoardPlayTrend> page = new Page<>();
page.setRecords(data);
page.setTotal(data.size());
// List<TBoardPlayTrend> records = this.tBoardStatisticService.getBoardTrendPageList(getPage(), trend);
// 处理数据为展板趋势图
......
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