:feat:流水监控，流水监控总计

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

@@ -140,9 +140,19 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "流水监控")
+    @PreAuthorize(permissionKey = "gameData:flow:monitor")
     @PostMapping("/flow/monitor")
     public ResultVO<Page<FlowMonitorVO>> getFlowMonitor(@RequestBody FlowMonitorDTO dto) {
         return ResultVO.ok(gameDataService.getFlowMonitor(dto));
     }
 
+    @ApiOperation(value = "流水监控总计")
+    @PreAuthorize(permissionKey = "gameData:flow:monitorCount")
+    @PostMapping("/flow/monitorCount")
+    public ResultVO<FlowMonitorCountVo> getFlowMonitorCount(@RequestBody FlowMonitorDTO dto) {
+        return ResultVO.ok(gameDataService.getFlowMonitorCount(dto));
+    }
+
+
+
 }

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

@@ -37,7 +37,7 @@ public class PitcherDataController {
     }
 
     @ApiOperation(value = "投手每日数据总计")
-//    @PreAuthorize(permissionKey = "pitcherData:pitcher:dayTotal")
+    @PreAuthorize(permissionKey = "pitcherData:pitcher:dayTotal")
     @PostMapping("/pitcher/day/total")
     public ResultVO<PitcherDataDayTotalVO> getPitcherDataDayTotal(@RequestBody PitcherDataDayTotalDTO dto) {
         return ResultVO.ok(pitcherDataService.getPitcherDataDayTotal(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/FlowMonitorDTO.java

@@ -1,10 +1,12 @@
 package com.zanxiang.game.data.serve.pojo.dto;
 
+import com.zanxiang.game.data.serve.pojo.base.BasePage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author ZhangXianyu
@@ -12,18 +14,23 @@ import java.time.LocalDate;
  * @Description 流水监控条件dto
  **/
 @Data
-public class FlowMonitorDTO implements Serializable {
+public class FlowMonitorDTO extends BasePage implements Serializable  {
 
     /**
      * SDK类型
      */
     @ApiModelProperty(value = "SDK类型")
     private String sourceSystem;
+    /**
+     * 数据归因：1-子游戏维度; 2-父游戏维度
+     */
+    @ApiModelProperty(notes = "数据归因：1-子游戏维度; 2-父游戏维度")
+    private Long gameDimension;
     /**
      * 投手id
      */
     @ApiModelProperty(value = "投手id")
-    private Long pitcherId;
+    private List<Long> pitcherId;
 
     /**
      * 消耗开始时间
@@ -53,13 +60,19 @@ public class FlowMonitorDTO implements Serializable {
      * 渠道id
      */
     @ApiModelProperty(value = "渠道id")
-    private Long agentId;
+    private List<Long> agentId;
 
     /**
      * 游戏id
      */
     @ApiModelProperty(value = "游戏id")
-    private Long gameId;
+    private List<Long> gameId;
+
+    /**
+     * 广告id
+     */
+    @ApiModelProperty(value = "广告id")
+    private List<Long> accountId;
 
 
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/FlowMonitorCountVo.java

@@ -0,0 +1,35 @@
+package com.zanxiang.game.data.serve.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ZhangXianyu
+ * @time 2024-03-05
+ * @Description 流水监控总计vo
+ **/
+@Data
+public class FlowMonitorCountVo implements Serializable {
+
+    /**
+     * 消耗总计
+     */
+    @ApiModelProperty(value = "消耗总计")
+    private String costCount = "0";
+
+    /**
+     * 充值总计
+     */
+    @ApiModelProperty(value = "充值总计")
+    private String amountCount = "0";
+
+    /**
+     * 回报率总计
+     */
+    @ApiModelProperty(value = "回报率总计")
+    private String recoveryCount = "0.00%";
+
+
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/FlowMonitorVO.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.pojo.vo;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,18 +39,77 @@ public class FlowMonitorVO implements Serializable {
     private LocalDate costEndDate;
 
     /**
-     * 订单开始时间
+     * 订单时间
      */
-    @ApiModelProperty(value = "订单开始时间")
-    private LocalDate orderBeginDate;
+    @ApiModelProperty(value = "订单时间")
+    private LocalDate orderDate;
 
     /**
-     * 订单结时间
+     * 10点充值金额
      */
-    @ApiModelProperty(value = "订单结时间")
-    private LocalDate orderEndDate;
-
+    @ApiModelProperty(value = "10点充值金额")
+    private String tenAmount;
+    /**
+     * 10点环比
+     */
+    @ApiModelProperty(value = "10点环比")
+    private String tenRate;
+    /**
+     * 10点回收率
+     */
+    @ApiModelProperty(value = "10点回收率")
+    private String tenRecovery;
+    /**
+     * 14点充值金额
+     */
+    @ApiModelProperty(value = "14点充值金额")
+    private String fourteenAmount;
+    /**
+     * 14点环比
+     */
+    @ApiModelProperty(value = "14点环比")
+    private String fourteenRate;
+    /**
+     * 14点回收率
+     */
+    @ApiModelProperty(value = "14点回收率")
+    private String fourteenRecovery;
+    /**
+     * 17点充值金额
+     */
+    @ApiModelProperty(value = "17点充值金额")
+    private String seventeenAmount;
+    /**
+     * 17点环比
+     */
+    @ApiModelProperty(value = "17点环比")
+    private String seventeenRate;
+    /**
+     * 17点回收率
+     */
+    @ApiModelProperty(value = "17点回收率")
+    private String seventeenRecovery;
+    /**
+     * 24点充值金额
+     */
+    @ApiModelProperty(value = "24点充值金额")
+    private String twentyfourAmount;
+    /**
+     * 24点环比
+     */
+    @ApiModelProperty(value = "24点环比")
+    private String twentyfourRate;
+    /**
+     * 24点回收率
+     */
+    @ApiModelProperty(value = "24点回收率")
+    private String twentyfourRecovery;
 
+    /**
+     * 消耗
+     */
+    @ApiModelProperty(value = "消耗")
+    private String costCount;
 
 
 }

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

@@ -96,4 +96,11 @@ public interface IGameDataService {
      * @return
      */
     Page<FlowMonitorVO> getFlowMonitor(FlowMonitorDTO dto);
+
+    /**
+     * 流水监控总计
+     * @param dto
+     * @return
+     */
+    FlowMonitorCountVo getFlowMonitorCount(FlowMonitorDTO dto);
 }