Commit 4c1da6a9 authored by liqin's avatar liqin 💬

Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev

parents a1dfac07 e9250468
...@@ -2,7 +2,6 @@ package cn.wisenergy.chnmuseum.party.mapper; ...@@ -2,7 +2,6 @@ package cn.wisenergy.chnmuseum.party.mapper;
import cn.wisenergy.chnmuseum.party.model.*; import cn.wisenergy.chnmuseum.party.model.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
...@@ -21,14 +20,24 @@ import java.util.Map; ...@@ -21,14 +20,24 @@ import java.util.Map;
@Mapper @Mapper
public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> { public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
public List<TBoardPlayRank> getBoardRankPageList(Page<TBoardPlayRank> page,TBoardPlayRank rank); 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);
/**
* 获取展板播放趋势 去掉数据库分页查询
*
* @param
* @param trend
* @return
*/
public List<TBoardPlayTrend> getBoardTrendPageList(@Param("trend") TBoardPlayTrend trend);
public List<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district); public List<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district);
/** /**
* 获取展板播放总量 * 获取展板播放总量
*
* @param survey * @param survey
* @return * @return
*/ */
...@@ -36,12 +45,15 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> { ...@@ -36,12 +45,15 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
/** /**
* 获取展板总量 * 获取展板总量
*
* @param survey * @param survey
* @return * @return
*/ */
Integer getBoardTotal(TBoardSurvey survey); Integer getBoardTotal(TBoardSurvey survey);
/** /**
* 获取播放展板的机构总量 * 获取播放展板的机构总量
*
* @param survey * @param survey
* @return * @return
*/ */
...@@ -49,12 +61,13 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> { ...@@ -49,12 +61,13 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
/** /**
* 获取互动总量 * 获取互动总量
*
* @param survey * @param survey
* @return * @return
*/ */
Integer getInteractionTotal(TBoardSurvey survey); Integer getInteractionTotal(TBoardSurvey survey);
List<Map> getInteractionFrequency(Page page,@Param("frequencyDate") String frequencyDate,@Param("orgCode") String orgCode); List<Map> getInteractionFrequency(Page page, @Param("frequencyDate") String frequencyDate, @Param("orgCode") String orgCode);
List<TBoardPlayTrend> getBoardPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend); List<TBoardPlayTrend> getBoardPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend);
} }
...@@ -33,13 +33,21 @@ public interface TBoardStatisticService extends IService<TBoardStatistic> { ...@@ -33,13 +33,21 @@ public interface TBoardStatisticService extends IService<TBoardStatistic> {
*/ */
Page<TBoardPlayRank> getBoardRankPageList(Page<TBoardPlayRank> page,TBoardPlayRank rank); Page<TBoardPlayRank> getBoardRankPageList(Page<TBoardPlayRank> page,TBoardPlayRank rank);
// /**
// * 获取展板播放趋势
// * @param page
// * @param rank
// * @return
// */
// Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
/** /**
* 获取展板播放趋势 * 获取展板播放趋势
* @param page * @param page
* @param rank * @param rank
* @return * @return
*/ */
Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank); List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend rank);
/** /**
* 获取地区看板统计信息 * 获取地区看板统计信息
......
...@@ -99,14 +99,20 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe ...@@ -99,14 +99,20 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
return page; return page;
} }
// @Override
// public Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
//
// page.setRecords(boardStatisticMapper.getBoardTrendPageList(page, trend));
// return page;
// }
@Override @Override
public Page<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) { public List<TBoardPlayTrend> getBoardTrendPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
page.setRecords(boardStatisticMapper.getBoardTrendPageList(page, trend)); List<TBoardPlayTrend> boardTrendPageList = boardStatisticMapper.getBoardTrendPageList(trend);
return page; return boardTrendPageList;
} }
@Override @Override
public Page<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district) { public Page<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district) {
List<TDistrictBoardStatistic> list = boardStatisticMapper.getBoardDistrictPageList(page, district); List<TDistrictBoardStatistic> list = boardStatisticMapper.getBoardDistrictPageList(page, district);
......
...@@ -108,14 +108,17 @@ public class TBoardStatisticController extends BaseController { ...@@ -108,14 +108,17 @@ public class TBoardStatisticController extends BaseController {
trend.setPlayDate(DateUtil.getCurrentDate("yyyyMM")); trend.setPlayDate(DateUtil.getCurrentDate("yyyyMM"));
} }
Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardTrendPageList(getPage(),trend); // Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardTrendPageList(getPage(),trend);
List<TBoardPlayTrend> records = this.tBoardStatisticService.getBoardTrendPageList(getPage(),trend);
// 处理数据为展板趋势图 // 处理数据为展板趋势图
Map map = new HashMap(); Map map = new HashMap();
List dateList = new ArrayList(); List dateList = new ArrayList();
List cntList = new ArrayList(); List cntList = new ArrayList();
//按照 播放数据统计大屏 中 展板点播趋势图要求返回本月每天的播放量需求 修改接口 //按照 播放数据统计大屏 中 展板点播趋势图要求返回本月每天的播放量需求 修改接口
getDateList(trend.getPlayDate(),dateList, cntList); getDateList(trend.getPlayDate(),dateList, cntList);
for (TBoardPlayTrend t : page.getRecords()) { // for (TBoardPlayTrend t : page.getRecords()) {
for (TBoardPlayTrend t : records) {
// dateList.add(t.getPlayDate()); // dateList.add(t.getPlayDate());
// cntList.add(t.getPlayNumber()); // cntList.add(t.getPlayNumber());
int index = dateList.indexOf(t.getPlayDate()); int index = dateList.indexOf(t.getPlayDate());
...@@ -123,10 +126,10 @@ public class TBoardStatisticController extends BaseController { ...@@ -123,10 +126,10 @@ public class TBoardStatisticController extends BaseController {
cntList.set(index,t.getPlayNumber()); cntList.set(index,t.getPlayNumber());
} }
} }
page.getRecords().sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber).reversed()); // page.getRecords().sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber).reversed());
map.put("dateList",dateList); map.put("dateList",dateList);
map.put("cntList",cntList); map.put("cntList",cntList);
map.put("page",page); // map.put("page",page);
return getResult(map); return getResult(map);
} }
......
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