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

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoardStatisticController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +30,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -232,7 +235,7 @@ public class TBoardStatisticController extends BaseController {
 //    @RequiresAuthentication  //@RequiresPermissions("t:board:statistic:Page")
     @ApiOperation(value = "获取展板播放趋势Pc", notes = "获取展板播放趋势Pc")
 //    @MethodLog(operModule = OperModule.TEND, operType = OperType.SELECT)
-    public Map<String, Object> getBoardPageList(TBoardPlayTrend trend) {
+    public Map<String, Object> getBoardPageList(TBoardPlayTrend trend) throws ParseException {
         TUser user = null;
         try {
             user = getcurUser();
@@ -247,17 +250,22 @@ public class TBoardStatisticController extends BaseController {
             trend.setBeginDate(DateUtil.getCurrentDate("yyyy")+"01");
             trend.setEndDate(DateUtil.getCurrentDate("yyyyMM"));
         }
-
         Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardPageList(getPage(),trend);
         // 处理数据为展板趋势图
         Map map = new HashMap();
         List dateList = new ArrayList();
         List cntList = new ArrayList();
+
         for (TBoardPlayTrend t : page.getRecords()) {
             dateList.add(t.getPlayDate());
             cntList.add(t.getPlayNumber());
         }
-        page.getRecords().sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber).reversed());
+        List<TBoardPlayTrend> list = page.getRecords();
+        list.sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber,Comparator.reverseOrder()).thenComparing(TBoardPlayTrend::getPlayDate,Comparator.reverseOrder()));
+        if (list.size()>=10) {
+            list = list.subList(0, 10);
+        }
+        page.setRecords(list);
         map.put("dateList",dateList);
         map.put("cntList",cntList);
         map.put("page",page);