修改内容：添加SDK来源判断

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

@@ -1,16 +1,7 @@
 package com.zanxiang.game.data.serve.controller;
 
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.data.serve.pojo.dto.GameDataAgainDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GameDataDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GameDataH5DTO;
-import com.zanxiang.game.data.serve.pojo.dto.GameDataTotalDTO;
-import com.zanxiang.game.data.serve.pojo.dto.GameDataWaterDTO;
-import com.zanxiang.game.data.serve.pojo.vo.GameDataAgainDayVO;
-import com.zanxiang.game.data.serve.pojo.vo.GameDataDayVO;
-import com.zanxiang.game.data.serve.pojo.vo.GameDataH5VO;
-import com.zanxiang.game.data.serve.pojo.vo.GameDataTotalVO;
-import com.zanxiang.game.data.serve.pojo.vo.GameDataWaterVO;
+import com.zanxiang.game.data.serve.pojo.dto.*;
+import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IGameDataService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -44,7 +35,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) {
@@ -58,7 +49,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 +64,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/pojo/dto/AgentDayAgainDTO.java

@@ -0,0 +1,24 @@
+package com.zanxiang.game.data.serve.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author tianhua
+ * @time 2023/7/18
+ * @Description 前端传递的推广渠道每日复充查询条件
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AgentDayAgainDTO {
+
+    /**
+     *
+     */
+
+
+}

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

@@ -37,4 +37,10 @@ public class GameDataAgainDayDTO {
     @ApiModelProperty(value = "查询结束时间（前端不需要传递）")
     private LocalDate endDate;
 
+    /**
+     * SDK来源
+     */
+    @ApiModelProperty(value = "SDK来源")
+    private String sourceSystem;
+
 }

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

@@ -39,6 +39,12 @@ public class GameDataDayDTO extends BasePage {
     @ApiModelProperty(notes = "注册开始时间")
     private LocalDate registeredBeginDate;
 
+    /**
+     * SDK来源
+     */
+    @ApiModelProperty(value = "SDK来源")
+    private String sourceSystem;
+
     /**
      * 注册时间（结束）
      */

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

@@ -57,6 +57,12 @@ public class GameDataTotalDTO extends BasePage {
     @ApiModelProperty(notes = "充值结束时间")
     private LocalDate rechargeEndDate;
 
+    /**
+     * SDK来源
+     */
+    @ApiModelProperty(value = "SDK来源")
+    private String sourceSystem;
+
     /**
      * 排序字段
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsDaynGame.java

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsDaynGame.TABLE_NAME)
-@PK({"dt", "gameId"})
+@PK({"dt", "gameId", "sourceSystem"})
 public class AdsDaynGame implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_dayn_game";
@@ -40,6 +40,11 @@ public class AdsDaynGame implements Serializable {
      */
     private String gameId;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * 每一天的的充值金额，充值次数，充值人数
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsDaynGameBuy.java

@@ -0,0 +1,54 @@
+package com.zanxiang.game.data.serve.pojo.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 游戏聚合表（按游戏聚合）（买量）
+ * </p>
+ *
+ * @author tianhua
+ * @time 2023/7/11
+ * @Description
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Table(AdsDaynGameBuy.TABLE_NAME)
+@PK({"dt", "gameId", "sourceSystem"})
+public class AdsDaynGameBuy implements Serializable {
+    private static final long serialVersionUID = 1L;
+    public static final String TABLE_NAME = "ads_dayn_game_buy";
+
+    /**
+     * 注册时间
+     */
+    private LocalDate dt;
+
+    /**
+     * 游戏ID
+     */
+    private String gameId;
+
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
+    /**
+     * 每一天的的充值金额，充值次数，充值人数
+     */
+    @Column
+    private String dayN;
+
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsDaynGameNature.java

@@ -0,0 +1,54 @@
+package com.zanxiang.game.data.serve.pojo.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.PK;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 游戏聚合表（按游戏聚合）
+ * </p>
+ *
+ * @author tianhua
+ * @time 2023/7/11
+ * @Description
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Table(AdsDaynGameNature.TABLE_NAME)
+@PK({"dt", "gameId", "sourceSystem"})
+public class AdsDaynGameNature implements Serializable {
+    private static final long serialVersionUID = 1L;
+    public static final String TABLE_NAME = "ads_dayn_game_nature";
+
+    /**
+     * 注册时间
+     */
+    private LocalDate dt;
+
+    /**
+     * 游戏ID
+     */
+    private String gameId;
+
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
+    /**
+     * 每一天的的充值金额，充值次数，充值人数
+     */
+    @Column
+    private String dayN;
+
+}

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGameDay.java

@@ -26,7 +26,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDay.TABLE_NAME)
-@PK({"dt", "gameId", "gameName", "gameClassify"})
+@PK({"dt", "gameId", "gameName", "gameClassify", "sourceSystem"})
 public class AdsGameDay implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_day";
@@ -51,6 +51,11 @@ public class AdsGameDay implements Serializable {
      */
     private Long gameClassify;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * CP名称
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGameDayAgain.java

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgain.TABLE_NAME)
-@PK({"dt","ddf","gameId","gameName"})
+@PK({"dt", "ddf", "gameId", "gameName", "sourceSystem"})
 public class AdsGameDayAgain {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_day_again";
@@ -50,6 +50,11 @@ public class AdsGameDayAgain {
      */
     private String gameName;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * 充值一次
      */
@@ -105,5 +110,4 @@ public class AdsGameDayAgain {
     private BigInteger c9;
 
 
-
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGameDayAgainBuy.java

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainBuy.TABLE_NAME)
-@PK({"dt","ddf","gameId","gameName"})
+@PK({"dt", "ddf", "gameId", "gameName", "sourceSystem"})
 public class AdsGameDayAgainBuy {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_day_again_buy";
@@ -50,6 +50,11 @@ public class AdsGameDayAgainBuy {
      */
     private String gameName;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * 充值一次
      */
@@ -105,5 +110,4 @@ public class AdsGameDayAgainBuy {
     private BigInteger buyC9;
 
 
-
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGameDayAgainNature.java

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt","ddf","gameId","gameName"})
+@PK({"dt", "ddf", "gameId", "gameName", "sourceSystem"})
 public class AdsGameDayAgainNature {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_day_again_nature";
@@ -50,6 +50,11 @@ public class AdsGameDayAgainNature {
      */
     private String gameName;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * 充值一次
      */
@@ -105,5 +110,4 @@ public class AdsGameDayAgainNature {
     private BigInteger natureC9;
 
 
-
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGamePushNum.java

@@ -25,7 +25,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @Table(AdsGameDayAgainNature.TABLE_NAME)
-@PK({"dt","agentId","pitcherId","accountId"})
+@PK({"dt", "agentId", "pitcherId", "accountId", "sourceSystem"})
 public class AdsGamePushNum implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_push_num";
@@ -50,6 +50,11 @@ public class AdsGamePushNum implements Serializable {
      */
     private Long pitcherId;
 
+    /**
+     * SDK来源
+     */
+    private String sourceSystem;
+
     /**
      * 投手名字
      */

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

@@ -94,6 +94,10 @@ public class GameDataServiceImpl implements IGameDataService {
         if (dto.getRegisteredBeginDate() != null && dto.getRegisteredEndDate() != null) {
             cri.where().andBetween("dt", dto.getRegisteredBeginDate(), dto.getRegisteredEndDate());
         }
+        if (StringUtils.isNotBlank(dto.getSourceSystem())) {
+            //拼接SDK来源
+            cri.where().andEquals("source_system", dto.getSourceSystem());
+        }
         //拼接排序条件
         cri.getOrderBy().orderBy(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, dto.getSortFiled()), dto.getSortType());
 
@@ -414,11 +418,11 @@ public class GameDataServiceImpl implements IGameDataService {
         }
         //如果没有排序条件给默认值
         if (StringUtils.isBlank(dto.getSortFiled())){
-            //待查看
+            //根据游戏id
             dto.setSortFiled("game_id");
         }
         if (StringUtils.isBlank(dto.getSortType())){
-            dto.setSortType(OrderByEnum.DESC.getOrderType());
+            dto.setSortType(OrderByEnum.ASC.getOrderType());
         }
         //根据传入的dto拼接查询参数
         Criteria cri = Cnd.cri();
@@ -434,6 +438,10 @@ public class GameDataServiceImpl implements IGameDataService {
             //拼接注册日期查询条件
             cri.where().andBetween("a.dt", dto.getRegisteredBeginDate(), dto.getRegisteredEndDate());
         }
+        if (StringUtils.isNotBlank(dto.getSourceSystem())) {
+            //拼接SDK来源
+            cri.where().andEquals("a.source_system", dto.getSourceSystem());
+        }
         //拼接分组条件
         cri.getGroupBy().groupBy("a.game_name", "a.game_id", "a.game_classify");
         //拼接排序条件
@@ -460,14 +468,13 @@ public class GameDataServiceImpl implements IGameDataService {
             //将tempVO中查出的数据添加到vo上
             copyNullProperties(tempVO,vo);
 
-            log.info("amount:" + tempVO.getAmount());
-
             //设置查询参数map
             Map<String, Object> dayNMap = new HashMap<>(4);
             dayNMap.put("registerBeginDate", dto.getRegisteredBeginDate());
             dayNMap.put("registerEndDate", dto.getRegisteredEndDate());
             dayNMap.put("rechargeBeginDate", dto.getRechargeBeginDate());
             dayNMap.put("rechargeEndDate", dto.getRechargeEndDate());
+            dayNMap.put("sourceSystem", dto.getSourceSystem());
             dayNMap.put("gameId", vo.getGameId());
 
             //买量表的充值相关数据
@@ -718,6 +725,10 @@ public class GameDataServiceImpl implements IGameDataService {
             cri.where().andEquals("dt", dto.getBeginDate());
             cri.where().andBetween("ddf", dto.getBeginDate(), dto.getEndDate());
         }
+        if (StringUtils.isNotBlank(dto.getSourceSystem())) {
+            //拼接SDK来源
+            cri.where().andEquals("source_system", dto.getSourceSystem());
+        }
         //按 "ddf" 升序排序
         cri.getOrderBy().asc("ddf");
 
@@ -849,6 +860,10 @@ public class GameDataServiceImpl implements IGameDataService {
             //拼接充值日期查询条件
             criRc.where().andBetween("b.dt", dto.getRechargeBeginDate(), dto.getRechargeEndDate());
         }
+        if (StringUtils.isNotBlank(dto.getSourceSystem())) {
+            //拼接SDK来源
+            criRc.where().andEquals("b.source_system", dto.getSourceSystem());
+        }
         //创建sql语句
         Sql sqlWithRechargeDate = Sqls.create(gameDataTotalSqlRecharge() + criRc);
 
@@ -911,6 +926,7 @@ public class GameDataServiceImpl implements IGameDataService {
                 where
                     dt between @registerBeginDate and @registerEndDate
                     and game_id = @gameId
+                    and source_system = @sourceSystem
                 """
         );
         //sql语句传入参数
@@ -1307,8 +1323,7 @@ public class GameDataServiceImpl implements IGameDataService {
      * @return String
      */
     private String adsGameDataAgainSql() {
-        return
-                """  
+        return """  
                 SELECT
                     dt,
                     ddf,
@@ -1333,8 +1348,7 @@ public class GameDataServiceImpl implements IGameDataService {
      * @return String
      */
     private String adsGameDataAgainBuySql() {
-        return
-                """  
+        return """  
                 SELECT
                     dt,
                     ddf,
@@ -1359,8 +1373,7 @@ public class GameDataServiceImpl implements IGameDataService {
      * @return String
      */
     private String adsGameDataAgainNatureSql() {
-        return
-                """  
+        return """  
                 SELECT
                     dt,
                     ddf,