修改bug

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TBoardStatisticMapper.java

@@ -56,4 +56,5 @@ public interface TBoardStatisticMapper extends BaseMapper<TBoardStatistic> {
 
     List<Map> getInteractionFrequency(Page page,@Param("frequencyDate") String frequencyDate,@Param("orgCode") String orgCode);
 
+    List<TBoardPlayTrend> getBoardPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend);
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TBoardPlayTrend.java

@@ -58,6 +58,12 @@ public class TBoardPlayTrend implements Serializable {
     @ApiModelProperty("机构编码")
     private String organCode;
 
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
 
 
 

src/main/java/cn/wisenergy/chnmuseum/party/service/TBoardStatisticService.java

@@ -66,4 +66,5 @@ public interface TBoardStatisticService extends IService<TBoardStatistic> {
 
     List getBoardProvincePlayTotalList(String organId,String orgCode);
 
+    Page<TBoardPlayTrend> getBoardPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoardStatisticServiceImpl.java

@@ -160,6 +160,12 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
         return list;
     }
 
+    @Override
+    public Page<TBoardPlayTrend> getBoardPageList(Page<TBoardPlayTrend> page, TBoardPlayTrend trend) {
+        page.setRecords(boardStatisticMapper.getBoardPageList(page,trend));
+        return page;
+    }
+
     /**
      * 更新展板统计信息
      */

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

@@ -29,10 +29,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <pre>
@@ -122,6 +119,7 @@ public class TBoardStatisticController extends BaseController {
             dateList.add(t.getPlayDate());
             cntList.add(t.getPlayNumber());
         }
+        page.getRecords().sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber).reversed());
         map.put("dateList",dateList);
         map.put("cntList",cntList);
         map.put("page",page);
@@ -210,7 +208,7 @@ public class TBoardStatisticController extends BaseController {
 
 
     /**
-     * 以下两个接口是为方便区分日志模块
+     * 以下两个接口是pc端专用
      * @param trend
      * @return
      */
@@ -220,7 +218,7 @@ public class TBoardStatisticController extends BaseController {
     })
     @PostMapping("/getBoardPageList")
 //    @RequiresAuthentication  //@RequiresPermissions("t:board:statistic:Page")
-    @ApiOperation(value = "获取展板播放趋势", notes = "获取展板播放趋势")
+    @ApiOperation(value = "获取展板播放趋势Pc", notes = "获取展板播放趋势Pc")
 //    @MethodLog(operModule = OperModule.TEND, operType = OperType.SELECT)
     public Map<String, Object> getBoardPageList(TBoardPlayTrend trend) {
         TUser user = null;
@@ -232,10 +230,11 @@ public class TBoardStatisticController extends BaseController {
         }
         // 如果查询日志为空，则默认当月
         if (StringUtils.isEmpty(trend.getPlayDate())){
-            trend.setPlayDate(DateUtil.getCurrentDate("yyyyMM"));
+            trend.setBeginDate(DateUtil.getCurrentDate("yyyy")+"01");
+            trend.setEndDate(DateUtil.getCurrentDate("yyyyMM"));
         }
 
-        Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardTrendPageList(getPage(),trend);
+        Page<TBoardPlayTrend> page = this.tBoardStatisticService.getBoardPageList(getPage(),trend);
         // 处理数据为展板趋势图
         Map map = new HashMap();
         List dateList = new ArrayList();
@@ -244,6 +243,7 @@ public class TBoardStatisticController extends BaseController {
             dateList.add(t.getPlayDate());
             cntList.add(t.getPlayNumber());
         }
+        page.getRecords().sort(Comparator.comparing(TBoardPlayTrend::getPlayNumber).reversed());
         map.put("dateList",dateList);
         map.put("cntList",cntList);
         map.put("page",page);
@@ -258,7 +258,7 @@ public class TBoardStatisticController extends BaseController {
     })
     @PostMapping("/getInteractionPageList")
 //    @RequiresAuthentication  //@RequiresPermissions("t:interaction:statistic:districtPage")
-    @ApiOperation(value = "获取互动频次统计信息", notes = "获取互动频次统计信息")
+    @ApiOperation(value = "获取互动频次统计信息pc", notes = "获取互动频次统计信息pc")
 //    @MethodLog(operModule = OperModule.INTERACTION, operType = OperType.SELECT)
     public Map<String, Object> getInteractionPageList(String frequencyDate) {
         String orgCode;

src/main/resources/mapper/TBoardStatisticMapper.xml

@@ -96,6 +96,20 @@
         </if>
     </select>
 
+
+    <select id="getBoardPageList" parameterType="cn.wisenergy.chnmuseum.party.model.TBoardPlayTrend" resultMap="trendMap">
+            SELECT sum(s.play_number) play_number,left(s.play_date,6) play_date
+            from t_board_statistic s
+            left join t_organ o on o.id = s.organ_id
+            where
+            left(s.play_date,6) between ${trend.beginDate} and ${trend.endDate}
+            <if test="trend.organCode != null">
+                and o.code LIKE concat(#{trend.organCode}, '%')
+            </if>
+            GROUP BY left(s.play_date,6)
+            ORDER BY left(s.play_date,6)
+    </select>
+
     <!-- 地区展板播放统计 -->
     <select id="getBoardDistrictPageList" resultMap="districtMap">
         SELECT a.name area_name,sum(s.play_number) play_number,count(s.board_id) board_cnt from t_board_statistic s