修改内容：111

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsPromotionDayController.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.controller;
 
+import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.PromotionDayDTO;
 import com.zanxiang.game.data.serve.pojo.dto.PromotionDayTotalDTO;
 import com.zanxiang.game.data.serve.pojo.vo.PromotionDayTotalVO;
@@ -31,14 +32,14 @@ public class AdsPromotionDayController {
     private IAdsPromotionDayService adsPromotionDayService;
 
     @ApiOperation(value = "广告监控数据")
-    //@PreAuthorize(permissionKey = "promotionData:adsPromotionDay:day")
+    @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:day")
     @PostMapping("/day")
     public ResultVO<Page<PromotionDayVO>> getPromotionDayData(@RequestBody PromotionDayDTO dto){
         return ResultVO.ok(adsPromotionDayService.getPromotionDayData(dto));
     }
 
     @ApiOperation(value = "广告监控数据总计")
-    //@PreAuthorize(permissionKey = "promotionData:adsPromotionDay:total")
+    @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:total")
     @PostMapping("/total")
     public ResultVO<PromotionDayTotalVO> getPromotionDayTotalData(@RequestBody PromotionDayTotalDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getPromotionDayTotalData(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/GameDataController.java

@@ -36,7 +36,7 @@ public class GameDataController {
     private IGameDataService gameDataService;
 
     @ApiOperation(value = "游戏每日数据")
-    //@PreAuthorize(permissionKey = "gameData:adsGameDay:day")
+    @PreAuthorize(permissionKey = "gameData:adsGameDay:day")
     @PostMapping("/day")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<Page<GameDataDayVO>> getGameDataDay(@RequestBody GameDataDayDTO dto) {
@@ -44,7 +44,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏每日数据总计")
-    //@PreAuthorize(permissionKey = "gameData:adsGameDay:dayTotal")
+    @PreAuthorize(permissionKey = "gameData:adsGameDay:dayTotal")
     @PostMapping("/day/total")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<GameDataDayTotalVO> getGameDataDay(@RequestBody GameDataDayTotalDTO dto) {
@@ -58,7 +58,7 @@ public class GameDataController {
         return ResultVO.ok(gameDataService.getH5Recharge(dto));
     }
     @ApiOperation(value = "游戏总数据")
-    //@PreAuthorize(permissionKey = "gameData:adsGameDay:total")
+    @PreAuthorize(permissionKey = "gameData:adsGameDay:total")
     @PostMapping("/total")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataTotalVO.class)})
     public ResultVO<Page<GameDataTotalVO>> getGameDataTotal(@RequestBody GameDataTotalDTO dto) {
@@ -73,7 +73,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏每日复充数据")
-    //@PreAuthorize(permissionKey = "gameData:adsGameDay:again")
+    @PreAuthorize(permissionKey = "gameData:adsGameDay:again")
     @PostMapping("/again")
     public ResultVO<Map<LocalDate, List<GameDataAgainDayVO>>> getGameDataAgainDay(@RequestBody GameDataAgainDayDTO dto) throws Exception {
         return ResultVO.ok(gameDataService.getGameDataAgainDay(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/OverallSummaryController.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.controller;
 
+import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.OverallSummaryDTO;
 import com.zanxiang.game.data.serve.pojo.vo.OverallSummaryVO;
 import com.zanxiang.game.data.serve.service.IOverallSummaryService;
@@ -33,7 +34,7 @@ public class OverallSummaryController {
     private IOverallSummaryService overallSummaryService;
 
     @ApiOperation(value = "获取整体概况数据")
-    //@PreAuthorize(permissionKey = "gameData:adsOverallSummary:totalData")
+    @PreAuthorize(permissionKey = "gameData:adsOverallSummary:totalData")
     @PostMapping("/totalData")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OverallSummaryVO.class)})
     public ResultVO<OverallSummaryVO> getOverallSummaryTotalData(@RequestBody OverallSummaryDTO dto) {
@@ -41,7 +42,7 @@ public class OverallSummaryController {
     }
 
     @ApiOperation(value = "获取折线图数据")
-    //@PreAuthorize(permissionKey = "gameData:adsOverallSummary:lineData")
+    @PreAuthorize(permissionKey = "gameData:adsOverallSummary:lineData")
     @PostMapping("/lineData")
     public ResultVO<Map<String,List>> getOverallSummaryLineData(@RequestBody OverallSummaryDTO dto) {
         return ResultVO.ok(overallSummaryService.getOverallSummaryLineData(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/OverallSummaryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.service.impl;
 
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.data.serve.pojo.dto.OverallSummaryDTO;
 import com.zanxiang.game.data.serve.pojo.vo.OverallSummaryAmountLineDataVO;
 import com.zanxiang.game.data.serve.pojo.vo.OverallSummaryCostLineDataVO;
@@ -226,7 +227,7 @@ public class OverallSummaryServiceImpl implements IOverallSummaryService {
             //拼接查询 sdk 来源条件
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
-        /*//前端传递 pitcherId 根据 pitcherId 查询
+        //前端传递 pitcherId 根据 pitcherId 查询
         if (dto.getPitcherId() != null) {
             //拼接投手查询条件
             cri.where().andEquals("pitcher_id", dto.getPitcherId());
@@ -236,19 +237,8 @@ public class OverallSummaryServiceImpl implements IOverallSummaryService {
         } else {
             //前端没有传递 pitcherId 并且不是管理员 只能看自己的数据
             cri.where().andEquals("pitcher_id", SecurityUtil.getUserId());
-        }*/
-
-        //前端传递 pitcherId 根据 pitcherId 查询
-        if (dto.getPitcherId() != null) {
-            //拼接投手查询条件
-            cri.where().andEquals("pitcher_id", dto.getPitcherId());
-        } else {
-            //前端没有传递 pitcherId 并且不是管理员 只能看自己的数据
-            cri.where().andNotEquals("pitcher_id", -2);
         }
 
-
-
         //根据参数拼接条件
         switch (queryDays) {
             //前一天时间