Merge remote-tracking branch 'origin/package' into package

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

@@ -139,10 +139,10 @@ public class GameDataController {
         return ResultVO.ok(activeDataService.getActiveDataTotal(dto));
     }
 
-//    @ApiOperation(value = "流水监控")
-//    @PostMapping("/flow/monitor")
-//    public ResultVO<Page<FlowMonitorVO>> getFlowMonitor(@RequestBody FlowMonitorDTO dto) {
-//        return ResultVO.ok(gameDataService.getFlowMonitor(dto));
-//    }
+    @ApiOperation(value = "流水监控")
+    @PostMapping("/flow/monitor")
+    public ResultVO<Page<FlowMonitorVO>> getFlowMonitor(@RequestBody FlowMonitorDTO dto) {
+        return ResultVO.ok(gameDataService.getFlowMonitor(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

@@ -0,0 +1,66 @@
+package com.zanxiang.game.data.serve.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author ZhangXianyu
+ * @time 2024-03-04
+ * @Description 流水监控条件dto
+ **/
+@Data
+public class FlowMonitorDTO implements Serializable {
+
+    /**
+     * SDK类型
+     */
+    @ApiModelProperty(value = "SDK类型")
+    private String sourceSystem;
+    /**
+     * 投手id
+     */
+    @ApiModelProperty(value = "投手id")
+    private Long pitcherId;
+
+    /**
+     * 消耗开始时间
+     */
+    @ApiModelProperty(value = "消耗开始时间")
+    private LocalDate costBeginDate;
+
+    /**
+     * 消耗结束时间
+     */
+    @ApiModelProperty(value = "消耗结束时间")
+    private LocalDate costEndDate;
+
+    /**
+     * 订单开始时间
+     */
+    @ApiModelProperty(value = "订单开始时间")
+    private LocalDate orderBeginDate;
+
+    /**
+     * 订单结时间
+     */
+    @ApiModelProperty(value = "订单结时间")
+    private LocalDate orderEndDate;
+
+    /**
+     * 渠道id
+     */
+    @ApiModelProperty(value = "渠道id")
+    private Long agentId;
+
+    /**
+     * 游戏id
+     */
+    @ApiModelProperty(value = "游戏id")
+    private Long gameId;
+
+
+
+}

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

@@ -0,0 +1,55 @@
+package com.zanxiang.game.data.serve.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author ZhangXianyu
+ * @time 2024-03-04
+ * @Description 流水监控vo
+ **/
+@Data
+public class FlowMonitorVO implements Serializable {
+
+    /**
+     * SDK类型
+     */
+    @ApiModelProperty(value = "SDK类型")
+    private String sourceSystem;
+    /**
+     * 投手名称
+     */
+    @ApiModelProperty(value = "投手名称")
+    private String pitcherName;
+
+    /**
+     * 消耗开始时间
+     */
+    @ApiModelProperty(value = "消耗开始时间")
+    private LocalDate costBeginDate;
+
+    /**
+     * 消耗结束时间
+     */
+    @ApiModelProperty(value = "消耗结束时间")
+    private LocalDate costEndDate;
+
+    /**
+     * 订单开始时间
+     */
+    @ApiModelProperty(value = "订单开始时间")
+    private LocalDate orderBeginDate;
+
+    /**
+     * 订单结时间
+     */
+    @ApiModelProperty(value = "订单结时间")
+    private LocalDate orderEndDate;
+
+
+
+
+}

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

@@ -89,4 +89,11 @@ public interface IGameDataService {
      * @return
      */
     Page<GameDataUserDetailsVO> getUserDetails(GameDataUserDetailsDTO dto);
+
+    /**
+     * 流水监控
+     * @param dto
+     * @return
+     */
+    Page<FlowMonitorVO> getFlowMonitor(FlowMonitorDTO dto);
 }

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

@@ -5215,6 +5215,16 @@ public class GameDataServiceImpl implements IGameDataService {
         return new Page<>(userDetilsSql.getList(GameDataUserDetailsVO.class), pager);
     }
 
+    /**
+     * 流水监控
+     * @param dto 查询条件
+     * @return vo
+     */
+    @Override
+    public Page<FlowMonitorVO> getFlowMonitor(FlowMonitorDTO dto) {
+        return null;
+    }
+
     /**
      * 查询出每个游戏的注册查询时间内，注册当天且充值的所有用户id
      *

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

@@ -433,10 +433,21 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
         if (StringUtils.isNotBlank(idStr)) {
             ids = Arrays.stream(idStr.split("/")).map(Long::parseLong).toArray(Long[]::new);
         }
-        vo.setUserDetails(new FirstNewUserAgainTrendVO().builder().usersId(ids).build());
+
+
         if (StringUtils.isNotBlank(vo.getAmountD1())) {
             //处理dayN数据
             formatPitcherDataDayTotalDayN(vo);
+
+            FirstNewUserAgainTrendVO againTrendVO = FirstNewUserAgainTrendVO.builder()
+                    .gameDimension(dto.getGameDimension())
+                    .sourceSystem(dto.getSourceSystem())
+                    .timeType("da1")
+                    .rechargeCount(vo.getAmountD1Trend().getRechargeUserCount())
+                    .usersId(ids)
+                    .build();
+
+            vo.setUserDetails(againTrendVO);
         }
         return vo;
     }