Procházet zdrojové kódy

Merge branch 'package' of GameCenter/game-center into dev

root před 4 dny
rodič
revize
4ba8c7452d
100 změnil soubory, kde provedl 123 přidání a 987 odebrání
  1. 4 1
      game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITencentAppApiBackRpc.java
  2. 0 21
      game-back/game-back-serve/pom.xml
  3. 0 48
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/config/SwaggerConfig.java
  4. 4 11
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java
  5. 3 6
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/OceanengineAppController.java
  6. 1 15
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/OceanengineLogController.java
  7. 3 7
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentAppApiLogController.java
  8. 0 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentAppController.java
  9. 1 16
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentLogController.java
  10. 0 10
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentMiniGameLogController.java
  11. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/api/OceanengineCallbackApi.java
  12. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameBackPolicyMapper.java
  13. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameOceanengineAppCallbackXgltMapper.java
  14. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentBackLogMapper.java
  15. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentOrderMapper.java
  16. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentUserMapper.java
  17. 1 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/oceanengine/MiniGameCallback.java
  18. 0 15
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/BackPolicyOfSplitLevel.java
  19. 0 11
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/BackPolicyOfSumRecharge.java
  20. 0 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/TencentAppReport.java
  21. 1 38
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java
  22. 0 6
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyListDTO.java
  23. 1 24
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineAppOrderLogDTO.java
  24. 1 15
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineAppUserLogDTO.java
  25. 1 17
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineOrderLogDTO.java
  26. 1 10
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineRoleRegisterLogDTO.java
  27. 1 13
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineUserLogDTO.java
  28. 0 20
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentAppOrderDTO.java
  29. 0 14
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentAppUserDTO.java
  30. 0 15
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameOrderDTO.java
  31. 1 12
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameRoleRegisterDTO.java
  32. 1 9
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameUserDTO.java
  33. 0 16
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentOrderDTO.java
  34. 0 12
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentRoleRegisterDTO.java
  35. 1 12
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentUserDTO.java
  36. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/OrderReportDTO.java
  37. 3 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppBackLogXglt.java
  38. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppCallback.java
  39. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppOrderLog.java
  40. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppRoleRegisterLog.java
  41. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppBackLog.java
  42. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppCallback.java
  43. 4 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppOrderSplitLog.java
  44. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppRoleRegister.java
  45. 3 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppUser.java
  46. 5 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentBackLog.java
  47. 5 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java
  48. 5 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentUser.java
  49. 0 35
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameBackPolicyVO.java
  50. 1 28
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineAppOrderLogVO.java
  51. 0 16
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineAppUserLogVO.java
  52. 1 23
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineOrderLogVO.java
  53. 1 15
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineRoleRegisterLogVO.java
  54. 1 17
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineUserLogVO.java
  55. 0 28
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentAppOrderVO.java
  56. 0 21
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameOrderVO.java
  57. 0 10
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameRoleRegisterVO.java
  58. 0 11
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameUserVO.java
  59. 0 27
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentOrderVO.java
  60. 0 12
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentRoleRegisterVO.java
  61. 0 17
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentUserVO.java
  62. 12 6
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentAppApiBackRpcImpl.java
  63. 0 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentUserActionBackRpcImpl.java
  64. 4 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtMiniGameBackRpcImpl.java
  65. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameBackPolicyService.java
  66. 0 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameOceanengineOrderLogService.java
  67. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentBackLogService.java
  68. 1 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentOrderService.java
  69. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentUserService.java
  70. 1 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppBackLogXgltServiceImpl.java
  71. 1 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppOrderLogServiceImpl.java
  72. 0 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppOrderSplitLogServiceImpl.java
  73. 2 16
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineOrderLogServiceImpl.java
  74. 0 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineRoleRegisterLogServiceImpl.java
  75. 0 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineUserLogServiceImpl.java
  76. 0 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java
  77. 0 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderSplitLogServiceImpl.java
  78. 2 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiRoleRegisterServiceImpl.java
  79. 0 3
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppOrderServiceImpl.java
  80. 0 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppRoleRegisterServiceImpl.java
  81. 0 5
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppUserServiceImpl.java
  82. 2 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentBackLogServiceImpl.java
  83. 0 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameUserServiceImpl.java
  84. 5 21
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java
  85. 1 8
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentRoleRegisterServiceImpl.java
  86. 1 6
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentUserServiceImpl.java
  87. 3 1
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/TencentAppApiOrderSplitBackTask.java
  88. 1 7
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/utils/BackPolicyUtil.java
  89. 0 21
      game-data/game-data-serve/pom.xml
  90. 4 2
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/component/DataPowerComponent.java
  91. 0 48
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/config/SwaggerConfig.java
  92. 0 8
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AccountAgentDayController.java
  93. 0 10
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsCreativeDayController.java
  94. 0 9
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsGameServerController.java
  95. 0 15
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsMediaDataController.java
  96. 0 9
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsOrderDetailController.java
  97. 0 11
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsPromotionDayController.java
  98. 0 9
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/ChoiceListController.java
  99. 0 28
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/GameDataController.java
  100. 0 6
      game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/GameMonitorAlarmController.java

+ 4 - 1
game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITencentAppApiBackRpc.java

@@ -1,7 +1,10 @@
 package com.zanxiang.game.back.base.rpc;
 
 import com.github.sd4324530.jtuple.Tuple2;
-import com.zanxiang.game.back.base.pojo.dto.*;
+import com.zanxiang.game.back.base.pojo.dto.TencentAppApiUserAgentQueryRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderAppApiRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterAppApiRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserAppApiRpcDTO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
 /**

+ 0 - 21
game-back/game-back-serve/pom.xml

@@ -112,27 +112,6 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metadata-definition-protobuf</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
         <!-- Mybatis Plus -->
         <dependency>
             <groupId>com.baomidou</groupId>

+ 0 - 48
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/config/SwaggerConfig.java

@@ -1,48 +0,0 @@
-package com.zanxiang.game.back.serve.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @author : lingfeng
- * @time : 2022-3-31
- * @description : Swagger2 配置
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-
-    /**
-     * 包扫描
-     */
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .useDefaultResponseMessages(false)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors
-                        .basePackage("com.zanxiang.game.back.serve"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    /**
-     * api文档构造
-     *
-     * @return : 返回api模板
-     */
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("游戏回传服务")
-                .version("1.0")
-                .build();
-    }
-}

+ 4 - 11
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
-import com.zanxiang.game.back.serve.pojo.dto.*;
+import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyDTO;
+import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
-import com.zanxiang.game.back.serve.pojo.vo.*;
-import com.zanxiang.game.back.serve.service.*;
+import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
+import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,12 +24,10 @@ import java.util.Objects;
 
 @RestController
 @RequestMapping("/policy")
-@Api("回传策略")
 public class BackPolicyController {
     @Autowired
     private IGameBackPolicyService gameBackPolicyService;
 
-    @ApiOperation(value = "创建回传策略")
     @PreAuthorize(permissionKey = "gameBack:policy:allOfUser")
     @GetMapping("/allOfUser")
     public ResultVO<List<GameBackPolicyVO>> allOfUser() {
@@ -39,14 +36,12 @@ public class BackPolicyController {
 
     @PreAuthorize(permissionKey = "gameBack:policy:list")
     @PostMapping("/list")
-    @ApiOperation(value = "回传策略列表")
     public ResultVO<IPage<GameBackPolicyVO>> policyList(@Validated @RequestBody GameBackPolicyListDTO dto) {
         return ResultVO.ok(gameBackPolicyService.policyList(dto));
     }
 
     @PreAuthorize(permissionKey = "gameBack:policy:create")
     @PostMapping("/add")
-    @ApiOperation(value = "创建回传策略")
     public ResultVO<Boolean> createPolicy(@Validated @RequestBody GameBackPolicyDTO dto) {
         checkDTO(dto);
         return ResultVO.ok(gameBackPolicyService.createPolicy(dto));
@@ -54,7 +49,6 @@ public class BackPolicyController {
 
     @PreAuthorize(permissionKey = "gameBack:policy:update")
     @PostMapping("/modify/{policyId}")
-    @ApiOperation(value = "修改回传策略")
     public ResultVO<Boolean> updatePolicy(@PathVariable("policyId") Long policyId, @Validated @RequestBody GameBackPolicyDTO dto) {
         checkDTO(dto);
         return ResultVO.ok(gameBackPolicyService.updatePolicy(policyId, dto));
@@ -62,7 +56,6 @@ public class BackPolicyController {
 
     @PreAuthorize(permissionKey = "gameBack:policy:delete")
     @DeleteMapping("/del/{ids}")
-    @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
         throw new BaseException("暂不支持删除回传策略!");
         // return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));

+ 3 - 6
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/OceanengineAppController.java

@@ -7,10 +7,10 @@ import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineAppUserLogDTO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppUserLogVO;
-import com.zanxiang.game.back.serve.service.*;
+import com.zanxiang.game.back.serve.service.IGameOceanengineAppOrderLogService;
+import com.zanxiang.game.back.serve.service.IGameOceanengineAppOrderSplitLogService;
+import com.zanxiang.game.back.serve.service.IGameOceanengineAppUserLogService;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,7 +19,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/oceanengineApp")
-@Api("头条APP回传策略")
 public class OceanengineAppController {
     @Autowired
     private IGameOceanengineAppUserLogService gameOceanengineAppUserLogService;
@@ -30,7 +29,6 @@ public class OceanengineAppController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengineApp:orderLogs")
     @PostMapping("/orderLogs")
-    @ApiOperation(value = "头条订单回传日志列表")
     public ResultVO<IPage<GameOceanengineAppOrderLogVO>> oceanengineAppOrderLogList(@RequestBody GameOceanengineAppOrderLogDTO dto) {
         return ResultVO.ok(gameOceanengineAppOrderLogService.oceanengineAppOrderLogList(dto));
     }
@@ -43,7 +41,6 @@ public class OceanengineAppController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengineApp:userLogs")
     @PostMapping("/userLogs")
-    @ApiOperation(value = "头条用户回传日志列表")
     public ResultVO<IPage<GameOceanengineAppUserLogVO>> oceanengineAppUserLogList(@RequestBody GameOceanengineAppUserLogDTO dto) {
         return ResultVO.ok(gameOceanengineAppUserLogService.oceanengineAppUserLogList(dto));
     }

+ 1 - 15
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/OceanengineLogController.java

@@ -11,20 +11,12 @@ import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineUserLogVO;
 import com.zanxiang.game.back.serve.service.IGameOceanengineOrderLogService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineOrderSplitLogService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineUserLogService;
-import com.zanxiang.module.util.NumberUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -32,7 +24,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/oceanengine")
-@Api("回传策略")
 public class OceanengineLogController {
     @Autowired
     private IGameOceanengineOrderLogService oceanengineOrderLogService;
@@ -43,7 +34,6 @@ public class OceanengineLogController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
     @PostMapping("/orderLogs")
-    @ApiOperation(value = "头条订单回传日志列表")
     public ResultVO<IPage<GameOceanengineOrderLogVO>> oceanengineOrderLogList(@RequestBody GameOceanengineOrderLogDTO dto) {
         return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderLogList(dto));
     }
@@ -56,7 +46,6 @@ public class OceanengineLogController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
     @PostMapping("/orderReport/{ids}/{backMoney}")
-    @ApiOperation(value = "头条订单手动上报")
     public ResultVO<Boolean> oceanengineOrderReport(@PathVariable("ids") List<Long> ids, @PathVariable("backMoney") BigDecimal backMoney) {
         OrderReportDTO dto = new OrderReportDTO();
         dto.setOrderIds(ids);
@@ -67,7 +56,6 @@ public class OceanengineLogController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
     @PostMapping("/orderReport")
-    @ApiOperation(value = "头条订单手动上报")
     public ResultVO<Boolean> oceanengineOrderReport(@Validated @RequestBody OrderReportDTO dto) {
         if (CollectionUtils.isEmpty(dto.getOrderIds())) {
             throw new BaseException("参数错误!");
@@ -96,14 +84,12 @@ public class OceanengineLogController {
 
     @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
     @PostMapping("/userLogs")
-    @ApiOperation(value = "头条用户回传日志列表")
     public ResultVO<IPage<GameOceanengineUserLogVO>> oceanengineUserLogList(@RequestBody GameOceanengineUserLogDTO dto) {
         return ResultVO.ok(oceanengineUserLogService.oceanengineUserLogList(dto));
     }
 
     @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
     @PostMapping("/userReport/{ids}")
-    @ApiOperation(value = "头条用户手动上报")
     public ResultVO<Boolean> oceanengineUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(oceanengineUserLogService.oceanengineUserReport(ids));
     }

+ 3 - 7
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentAppApiLogController.java

@@ -3,11 +3,11 @@ package com.zanxiang.game.back.serve.controller;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.back.serve.pojo.dto.OrderReportDTO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentAppApiOrderSplitLogVO;
-import com.zanxiang.game.back.serve.service.*;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderSplitLogService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiUserService;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -19,7 +19,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/tencentAppApi")
-@Api("腾讯APP API 回传")
 public class TencentAppApiLogController {
     @Autowired
     private IGameTencentAppApiUserService gameTencentAppApiUserService;
@@ -37,7 +36,6 @@ public class TencentAppApiLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentAppApi:orderReport")
     @PostMapping("/orderReport/{ids}/{backMoney}")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids, @PathVariable("backMoney") BigDecimal backMoney) {
         OrderReportDTO dto = new OrderReportDTO();
         dto.setOrderIds(ids);
@@ -48,7 +46,6 @@ public class TencentAppApiLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentAppApi:orderReport")
     @PostMapping("/orderReport")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@Validated @RequestBody OrderReportDTO dto) {
         if (CollectionUtils.isEmpty(dto.getOrderIds())) {
             throw new BaseException("参数错误!");
@@ -77,7 +74,6 @@ public class TencentAppApiLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentAppApi:userReport")
     @PostMapping("/userReport/{ids}")
-    @ApiOperation(value = "腾讯用户手动上报")
     public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameTencentAppApiUserService.tencentUserReport(ids));
     }

+ 0 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentAppController.java

@@ -11,8 +11,6 @@ import com.zanxiang.game.back.serve.service.IGameTencentAppOrderService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppOrderSplitLogService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppUserService;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,7 +24,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/tencentApp")
-@Api("腾讯APP回传")
 public class TencentAppController {
 
     @Autowired
@@ -40,7 +37,6 @@ public class TencentAppController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentApp:orderLogs")
     @PostMapping("/orderLogs")
-    @ApiOperation(value = "腾讯订单回传日志列表")
     public ResultVO<IPage<GameTencentAppOrderVO>> tencentAppOrderList(@RequestBody GameTencentAppOrderDTO dto) {
         return ResultVO.ok(gameTencentAppOrderService.gameTencentAppOrderLogList(dto));
     }
@@ -53,7 +49,6 @@ public class TencentAppController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentApp:userLogs")
     @PostMapping("/userLogs")
-    @ApiOperation(value = "腾讯用户回传日志列表")
     public ResultVO<IPage<GameTencentUserVO>> tencentAppUserList(@RequestBody GameTencentAppUserDTO dto) {
         return ResultVO.ok(gameTencentAppUserService.tencentUserLogList(dto));
     }

+ 1 - 16
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentLogController.java

@@ -5,27 +5,18 @@ import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentOrderDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentUserDTO;
 import com.zanxiang.game.back.serve.pojo.dto.OrderReportDTO;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentUserVO;
 import com.zanxiang.game.back.serve.service.IGameTencentOrderService;
 import com.zanxiang.game.back.serve.service.IGameTencentOrderSplitLogService;
 import com.zanxiang.game.back.serve.service.IGameTencentUserService;
-import com.zanxiang.module.util.NumberUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -33,7 +24,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/tencent")
-@Api("回传策略")
 public class TencentLogController {
     @Autowired
     private IGameTencentUserService tencentUserService;
@@ -44,7 +34,6 @@ public class TencentLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
     @PostMapping("/orderLogs")
-    @ApiOperation(value = "腾讯订单回传日志列表")
     public ResultVO<IPage<GameTencentOrderVO>> tencentOrderLogList(@RequestBody GameTencentOrderDTO dto) {
         return ResultVO.ok(tencentOrderService.tencentOrderLogList(dto));
     }
@@ -57,7 +46,6 @@ public class TencentLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
     @PostMapping("/orderReport/{ids}/{backMoney}")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids, @PathVariable("backMoney") BigDecimal backMoney) {
         OrderReportDTO dto = new OrderReportDTO();
         dto.setOrderIds(ids);
@@ -68,7 +56,6 @@ public class TencentLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
     @PostMapping("/orderReport")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@Validated @RequestBody OrderReportDTO dto) {
         if (CollectionUtils.isEmpty(dto.getOrderIds())) {
             throw new BaseException("参数错误!");
@@ -97,14 +84,12 @@ public class TencentLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
     @PostMapping("/userLogs")
-    @ApiOperation(value = "腾讯用户回传日志列表")
     public ResultVO<IPage<GameTencentUserVO>> tencentUserLogList(@RequestBody GameTencentUserDTO dto) {
         return ResultVO.ok(tencentUserService.tencentUserLogList(dto));
     }
 
     @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
     @PostMapping("/userReport/{ids}")
-    @ApiOperation(value = "腾讯用户手动上报")
     public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(tencentUserService.tencentUserReport(ids));
     }

+ 0 - 10
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencentMiniGameLogController.java

@@ -12,8 +12,6 @@ import com.zanxiang.game.back.serve.service.*;
 import com.zanxiang.module.util.DateUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -25,7 +23,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/tencentMiniGame")
-@Api("腾讯小游戏回传")
 public class TencentMiniGameLogController {
 
     @Autowired
@@ -45,7 +42,6 @@ public class TencentMiniGameLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:orderLogs")
     @PostMapping("/orderLogs")
-    @ApiOperation(value = "腾讯订单回传日志列表")
     public ResultVO<IPage<GameTencentMiniGameOrderVO>> tencentOrderLogList(@RequestBody GameTencentMiniGameOrderDTO dto) {
         return ResultVO.ok(gameTencentMiniGameOrderService.listOfPage(dto));
     }
@@ -58,7 +54,6 @@ public class TencentMiniGameLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:orderReport")
     @PostMapping("/orderReport/{ids}/{backMoney}")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids, @PathVariable("backMoney") BigDecimal backMoney) {
         OrderReportDTO dto = new OrderReportDTO();
         dto.setOrderIds(ids);
@@ -69,7 +64,6 @@ public class TencentMiniGameLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:orderReport")
     @PostMapping("/orderReport")
-    @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@Validated @RequestBody OrderReportDTO dto) {
         if (CollectionUtils.isEmpty(dto.getOrderIds())) {
             throw new BaseException("参数错误!");
@@ -98,28 +92,24 @@ public class TencentMiniGameLogController {
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:userLogs")
     @PostMapping("/userLogs")
-    @ApiOperation(value = "腾讯用户回传日志列表")
     public ResultVO<IPage<GameTencentMiniGameUserVO>> tencentUserLogList(@RequestBody GameTencentMiniGameUserDTO dto) {
         return ResultVO.ok(gameTencentMiniGameUserService.listOfPage(dto));
     }
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:userReport")
     @PostMapping("/userReport/{ids}")
-    @ApiOperation(value = "腾讯用户手动上报")
     public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameTencentMiniGameUserService.doReport(ids));
     }
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:roleReport")
     @PostMapping("/roleReport/{ids}")
-    @ApiOperation(value = "腾讯创角手动上报")
     public ResultVO<Boolean> tencentRoleReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameTencentMiniGameRoleRegisterService.doReport(ids));
     }
 
     @PreAuthorize(permissionKey = "gameBack:tencentMiniGame:userUpdateCallBackUrl")
     @GetMapping("/user/update/back/url")
-    @ApiOperation(value = "玩家信息更新回传地址")
     public ResultVO<Boolean> userUpdateCallBackUrl(@RequestParam Long gameId, @RequestParam long startTime) {
         gameTencentMiniGameCallbackService.delayUpdateMiniGameUserCallBackUrl(gameId, DateUtil.secondToLocalDateTime(startTime));
         return ResultVO.ok();

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/api/OceanengineCallbackApi.java

@@ -2,8 +2,8 @@ package com.zanxiang.game.back.serve.controller.api;
 
 import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineAppCallbackDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineCallbackDTO;
-import com.zanxiang.game.back.serve.service.IGameOceanengineAppCallbackXgltService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineAppCallbackService;
+import com.zanxiang.game.back.serve.service.IGameOceanengineAppCallbackXgltService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineCallbackService;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameBackPolicyMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.dao.mapper;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 
 /**
  * <p>

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameOceanengineAppCallbackXgltMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.dao.mapper;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppCallbackXglt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppCallbackXglt;
 
 public interface GameOceanengineAppCallbackXgltMapper extends BaseMapper<GameOceanengineAppCallbackXglt> {
 }

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentBackLogMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.dao.mapper;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 
 /**
  * <p>

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentOrderMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.dao.mapper;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 
 /**
  * <p>

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/dao/mapper/GameTencentUserMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.dao.mapper;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
 
 /**
  * <p>

+ 1 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/oceanengine/MiniGameCallback.java

@@ -2,11 +2,7 @@ package com.zanxiang.game.back.serve.oceanengine;
 
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.encryption.ShaUtil;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

+ 0 - 15
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/BackPolicyOfSplitLevel.java

@@ -1,7 +1,6 @@
 package com.zanxiang.game.back.serve.pojo;
 
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,49 +12,35 @@ import java.util.List;
 @Data
 public class BackPolicyOfSplitLevel {
 
-    @ApiModelProperty("充值注册最大间隔时间(超时不回传)")
     private Long regPayIntervalTime;
 
-    @ApiModelProperty("充值挡位")
     private List<RechargeLevel> rechargeLevelList;
 
-    @ApiModelProperty("单用户最大回传订单数")
     private Integer backCountOfUser;
 
-    @ApiModelProperty("降档策略")
     private List<GameBackPolicyVO.PolicyDownLevel> downLevel;
 
-    @ApiModelProperty("拆单策略")
     private List<GameBackPolicyVO.SplitStrategy> splitStrategy;
 
-    @ApiModelProperty("激活回传开关")
     private Boolean activeBackSwitch;
 
-    @ApiModelProperty("角色激活回传开关")
     private Boolean roleBackSwitch;
 
-    @ApiModelProperty("最小回传等级")
     private Long roleLevelMin;
 
-    @ApiModelProperty("新手引导回传条件")
     private TutorialFinish tutorialFinish;
 
-    @ApiModelProperty("监测链接回传")
     private Boolean linkCallBack;
 
     @Data
     public static class RechargeLevel {
 
-        @ApiModelProperty("最小金额")
         private BigDecimal minAmount;
 
-        @ApiModelProperty("最大金额")
         private BigDecimal maxAmount;
 
-        @ApiModelProperty("回传类型(1:概率、2:比例)")
         private Integer backType;
 
-        @ApiModelProperty("回传值(100% | 1:2)")
         private String backRate;
     }
 }

+ 0 - 11
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/BackPolicyOfSumRecharge.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,37 +8,27 @@ import java.util.List;
 @Data
 public class BackPolicyOfSumRecharge {
 
-    @ApiModelProperty("充值注册最大间隔时间(超时不回传)")
     private Long regPayIntervalTime;
 
-    @ApiModelProperty("充值挡位")
     private List<RechargeLevel> rechargeLevelList;
 
-    @ApiModelProperty("激活回传开关")
     private Boolean activeBackSwitch;
 
-    @ApiModelProperty("角色激活回传开关")
     private Boolean roleBackSwitch;
 
-    @ApiModelProperty("最小回传等级")
     private Long roleLevelMin;
 
-    @ApiModelProperty("新手引导回传条件")
     private TutorialFinish tutorialFinish;
 
-    @ApiModelProperty("监测链接回传")
     private Boolean linkCallBack;
 
     @Data
     public static class RechargeLevel {
 
-        @ApiModelProperty("最小金额")
         private BigDecimal minAmount;
 
-        @ApiModelProperty("最大金额")
         private BigDecimal maxAmount;
 
-        @ApiModelProperty("单用户最大回传订单数")
         private Long backCountOfUser;
     }
 }

+ 0 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/TencentAppReport.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo;
 
-import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 38
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java

@@ -4,13 +4,12 @@ import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
 import com.zanxiang.game.back.serve.pojo.TutorialFinish;
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
-import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -32,208 +31,172 @@ public class GameBackPolicyDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotBlank(message = "回传策略名称不能为空")
-    @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
-    @ApiModelProperty("回传策略类型")
     private Integer policyType;
 
     private BackPolicyOfSplitLevel typeOfSplitLevel;
 
     private BackPolicyOfSumRecharge typeOfSumRecharge;
 
-    @ApiModelProperty("新手引导回传条件")
     private TutorialFinish tutorialFinish;
 
-    @ApiModelProperty("回传类型(1:首单、次单、2:首日、次日)")
     private Integer backUnit;
 
     /**
      * 首充-小额判定金额(小于等于)
      */
-    @ApiModelProperty("首充-小额判定金额(小于等于)")
     private BigDecimal firstMinMoney;
 
     /**
      * 首充-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-小额回传方式(概率/比例)")
     private Integer firstMinMoneyType;
 
     /**
      * 首充-小额回传概率/比例
      */
-    @ApiModelProperty("首充-小额回传概率/比例")
     private String firstMinMoneyRate;
 
     /**
      * 首充-大额判定金额(大于等于)
      */
-    @ApiModelProperty("首充-大额判定金额(大于等于)")
     private BigDecimal firstMaxMoney;
 
     /**
      * 首充-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-大额回传方式(概率/比例)")
     private Integer firstMaxMoneyType;
 
     /**
      * 首充-大额回传概率/比例
      */
-    @ApiModelProperty("首充-大额回传概率/比例")
     private String firstMaxMoneyRate;
 
     /**
      * 首充-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-其它金额回传方式(概率/比例)")
     private Integer firstOtherMoneyType;
 
     /**
      * 首充-其它金额回传概率/比例
      */
-    @ApiModelProperty("首充-其它金额回传概率/比例")
     private String firstOtherMoneyRate;
 
     /**
      * 首充-其它金额回传概率/比例
      */
-    @ApiModelProperty("首充-降档规则")
     private List<GameBackPolicyVO.PolicyDownLevel> firstDownLevel;
     /**
      * 首充-按用户订单数卡单
      */
-    @ApiModelProperty("首充-按用户订单数卡单")
     private Integer firstBackCountOfUser;
 
     /**
      * 次单-小额判定金额(小于等于)
      */
-    @ApiModelProperty("次单-小额判定金额(小于等于)")
     private BigDecimal rechargeMinMoney;
 
     /**
      * 次单-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-小额回传方式(概率/比例)")
     private Integer rechargeMinMoneyType;
 
     /**
      * 次单-小额回传概率/比例
      */
-    @ApiModelProperty("次单-小额回传概率/比例")
     private String rechargeMinMoneyRate;
 
     /**
      * 次单-大额判定金额(大于等于)
      */
-    @ApiModelProperty("次单-大额判定金额(大于等于)")
     private BigDecimal rechargeMaxMoney;
 
     /**
      * 次单-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-大额回传方式(概率/比例)")
     private Integer rechargeMaxMoneyType;
 
     /**
      * 次单-大额回传概率/比例
      */
-    @ApiModelProperty("次单-大额回传概率/比例")
     private String rechargeMaxMoneyRate;
 
     /**
      * 次单-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-其它金额回传方式(概率/比例)")
     private Integer rechargeOtherMoneyType;
 
     /**
      * 次单-其它金额回传概率/比例
      */
-    @ApiModelProperty("次单-其它金额回传概率/比例")
     private String rechargeOtherMoneyRate;
 
-    @ApiModelProperty("注册充值回传的最大间隔时间(超时不回传)")
     private Long regPayIntervalTime;
 
     /**
      * 首充-其它金额回传概率/比例
      */
-    @ApiModelProperty("次单-降档规则")
     private List<GameBackPolicyVO.PolicyDownLevel> rechargeDownLevel;
 
     /**
      * 次单-按用户订单数卡单
      */
-    @ApiModelProperty("次单-按用户订单数卡单")
     private Integer rechargeBackCountOfUser;
 
     /**
      * 是否补单
      */
-    @ApiModelProperty("是否补单")
     private Boolean markUpOrder;
 
     /**
      * 补单-小额判定金额(小于等于)
      */
-    @ApiModelProperty("补单-小额判定金额(小于等于)")
     private BigDecimal markUpOrderMinMoney;
 
     /**
      * 补单-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-小额回传方式(概率/比例)")
     private Integer markUpOrderMinMoneyType;
 
     /**
      * 补单-小额回传概率/比例
      */
-    @ApiModelProperty("补单-小额回传概率/比例")
     private String markUpOrderMinMoneyRate;
 
     /**
      * 补单-大额判定金额(大于等于)
      */
-    @ApiModelProperty("补单-大额判定金额(大于等于)")
     private BigDecimal markUpOrderMaxMoney;
 
     /**
      * 补单-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-大额回传方式(概率/比例)")
     private Integer markUpOrderMaxMoneyType;
 
     /**
      * 补单-大额回传概率/比例
      */
-    @ApiModelProperty("补单-大额回传概率/比例")
     private String markUpOrderMaxMoneyRate;
 
     /**
      * 补单-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-其它金额回传方式(概率/比例)")
     private Integer markUpOrderOtherMoneyType;
 
     /**
      * 补单-其它金额回传概率/比例
      */
-    @ApiModelProperty("补单-其它金额回传概率/比例")
     private String markUpOrderOtherMoneyRate;
 
     /**
      * 首充-其它金额回传概率/比例
      */
-    @ApiModelProperty("补单-降档规则")
     private List<GameBackPolicyVO.PolicyDownLevel> markUpDownLevel;
 
     /**
      * 补单-按用户订单数卡单
      */
-    @ApiModelProperty("补单-按用户订单数卡单")
     private Integer markUpBackCountOfUser;
 
     /**

+ 0 - 6
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyListDTO.java

@@ -2,16 +2,11 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 游戏回传策略表
@@ -25,6 +20,5 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameBackPolicyListDTO extends BaseListDTO<GameBackPolicy> {
-    @ApiModelProperty("回传策略名")
     private String backPolicyName;
 }

+ 1 - 24
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineAppOrderLogDTO.java

@@ -1,18 +1,13 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppOrderLog;
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderSplitLogVO;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 头条订单上报日志
@@ -22,61 +17,43 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineAppOrderLogDTO extends BaseListDTO<GameOceanengineAppOrderLog> {
-    @ApiModelProperty("用户ID")
+
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeEnd;
 
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
-    @ApiModelProperty("角色名")
     private String roleName;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMin;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMax;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
 }

+ 1 - 15
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineAppUserLogDTO.java

@@ -1,9 +1,7 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppOrderLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppUserLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,42 +17,30 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineAppUserLogDTO extends BaseListDTO<GameOceanengineAppUserLog> {
-    @ApiModelProperty("用户ID")
+
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeEnd;
 }

+ 1 - 17
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineOrderLogDTO.java

@@ -1,16 +1,13 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * 头条订单上报日志
@@ -20,45 +17,32 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineOrderLogDTO extends BaseListDTO<GameOceanengineOrderLog> {
-    @ApiModelProperty("小游戏ID")
+
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("支付状态,0:预下单,1:待支付,2:支付成功,-1:已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeEnd;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMin;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMax;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 }

+ 1 - 10
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineRoleRegisterLogDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineRoleRegisterLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,30 +17,22 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineRoleRegisterLogDTO extends BaseListDTO<GameOceanengineRoleRegisterLog> {
-    @ApiModelProperty("小游戏ID")
+
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerTimeEnd;
 }

+ 1 - 13
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameOceanengineUserLogDTO.java

@@ -1,16 +1,13 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineUserLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * 头条订单上报日志
@@ -20,33 +17,24 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineUserLogDTO extends BaseListDTO<GameOceanengineUserLog> {
-    @ApiModelProperty("小游戏ID")
+
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("头条2.0-项目ID")
     private Long projectId;
 
-    @ApiModelProperty("头条2.0-广告ID")
     private Long promotionId;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeEnd;
 }

+ 0 - 20
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentAppOrderDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppOrder;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,60 +18,41 @@ import java.time.LocalDate;
 @Builder
 public class GameTencentAppOrderDTO extends BaseListDTO<GameTencentAppOrder> {
 
-    @ApiModelProperty("用户ID")
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeEnd;
 
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
-    @ApiModelProperty("角色名")
     private String roleName;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMin;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMax;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 }

+ 0 - 14
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentAppUserDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppUser;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,42 +20,29 @@ import java.time.LocalDate;
 @AllArgsConstructor
 public class GameTencentAppUserDTO extends BaseListDTO<GameTencentAppUser> {
 
-    @ApiModelProperty("用户ID")
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeEnd;
 }

+ 0 - 15
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameOrderDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameOrder;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,66 +25,52 @@ public class GameTencentMiniGameOrderDTO extends BaseListDTO<GameTencentMiniGame
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String agentKey;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 订单ID
      */
-    @ApiModelProperty("订单ID")
     private String orderId;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("-1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
     /**
      * 支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消
      */
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMin;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMax;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeEnd;
 }

+ 1 - 12
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameRoleRegisterDTO.java

@@ -1,9 +1,7 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameRoleRegister;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameUser;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,33 +17,24 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 public class GameTencentMiniGameRoleRegisterDTO extends BaseListDTO<GameTencentMiniGameRoleRegister> {
-    @ApiModelProperty("渠道号")
+
     private String agentKey;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerTimeEnd;
 
-    @ApiModelProperty("角色ID")
     private String roleId;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 }

+ 1 - 9
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentMiniGameUserDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameUser;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,27 +17,20 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 public class GameTencentMiniGameUserDTO extends BaseListDTO<GameTencentMiniGameUser> {
-    @ApiModelProperty("渠道号")
+
     private String agentKey;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeEnd;
 }

+ 0 - 16
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentOrderDTO.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,72 +25,57 @@ public class GameTencentOrderDTO extends BaseListDTO<GameTencentOrder> {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String channel;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 订单ID
      */
-    @ApiModelProperty("订单ID")
     private String orderId;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("-1:回传失败;0:未回传;1:回传")
     private Integer isBack;
 
     /**
      * 支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消
      */
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
     /**
      * 数据源ID
      */
-    @ApiModelProperty("数据源ID")
     private Long userActionSetId;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMin;
 
-    @ApiModelProperty("充值到支付的间隔时间(分)")
     private Long regPayIntervalTimeMax;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate regTimeEnd;
 }

+ 0 - 12
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentRoleRegisterDTO.java

@@ -1,9 +1,7 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentRoleRegister;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,51 +25,41 @@ public class GameTencentRoleRegisterDTO extends BaseListDTO<GameTencentRoleRegis
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String channel;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("-1:回传失败;0:未回传;1:回传")
     private Integer isBack;
 
     /**
      * 数据源ID
      */
-    @ApiModelProperty("数据源ID")
     private Long userActionSetId;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate registerEnd;
 }

+ 1 - 12
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameTencentUserDTO.java

@@ -1,16 +1,13 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
 import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * 游戏腾讯用户表
@@ -20,30 +17,22 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameTencentUserDTO extends BaseListDTO<GameTencentUser> {
-    @ApiModelProperty("渠道号")
+
     private String channel;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
-    @ApiModelProperty("回传状态")
     private Integer isBack;
 
-    @ApiModelProperty("数据源ID")
     private Long userActionSetId;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeBegin;
 
-    @ApiModelProperty("注册时间")
     private LocalDate activeTimeEnd;
 }

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/OrderReportDTO.java

@@ -1,8 +1,8 @@
 package com.zanxiang.game.back.serve.pojo.dto;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 

+ 3 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppBackLogXglt.java

@@ -1,18 +1,16 @@
 package com.zanxiang.game.back.serve.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * 星广联投回传日志
  * @TableName t_game_oceanengine_app_back_log_xglt

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppCallback.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 头条游戏 APP 监测链接回传数据(文档:https://open.oceanengine.com/labels/7/docs/1696710655781900)

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppOrderLog.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppRoleRegisterLog.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppBackLog.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 腾讯 APP回传日志表

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppCallback.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 腾讯游戏 APP 监测链接回传数据(文档:https://datanexus.qq.com/doc/develop/guider/interface/conversion/ad_track_click#5-%E5%AD%97%E6%AE%B5%E5%88%97%E8%A1%A8)

+ 4 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppOrderSplitLog.java

@@ -3,14 +3,15 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppRoleRegister.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 游戏腾讯APP角色创建表

+ 3 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentAppUser.java

@@ -3,13 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 游戏腾讯 APP用户表

+ 5 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentBackLog.java

@@ -3,12 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
  * 回传日志表

+ 5 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java

@@ -3,12 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
  * 游戏腾讯订单表

+ 5 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentUser.java

@@ -3,12 +3,14 @@ package com.zanxiang.game.back.serve.pojo.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
  * 游戏腾讯用户表

+ 0 - 35
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameBackPolicyVO.java

@@ -3,7 +3,6 @@ package com.zanxiang.game.back.serve.pojo.vo;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSplitLevel;
 import com.zanxiang.game.back.serve.pojo.BackPolicyOfSumRecharge;
 import com.zanxiang.game.back.serve.pojo.TutorialFinish;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,7 +31,6 @@ public class GameBackPolicyVO implements Serializable {
 
     private Long id;
 
-    @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
     private Integer policyType;
@@ -43,127 +41,106 @@ public class GameBackPolicyVO implements Serializable {
 
     private TutorialFinish tutorialFinish;
 
-    @ApiModelProperty("回传类型(1:首单、次单、2:首日、次日)")
     private Integer backUnit;
 
     /**
      * 首充-小额判定金额(小于等于)
      */
-    @ApiModelProperty("首充-小额判定金额(小于等于)")
     private BigDecimal firstMinMoney;
 
     /**
      * 首充-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-小额回传方式(概率/比例)")
     private Integer firstMinMoneyType;
 
     /**
      * 首充-小额回传概率/比例
      */
-    @ApiModelProperty("首充-小额回传概率/比例")
     private String firstMinMoneyRate;
 
     /**
      * 首充-大额判定金额(大于等于)
      */
-    @ApiModelProperty("首充-大额判定金额(大于等于)")
     private BigDecimal firstMaxMoney;
 
     /**
      * 首充-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-大额回传方式(概率/比例)")
     private Integer firstMaxMoneyType;
 
     /**
      * 首充-大额回传概率/比例
      */
-    @ApiModelProperty("首充-大额回传概率/比例")
     private String firstMaxMoneyRate;
 
     /**
      * 首充-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("首充-其它金额回传方式(概率/比例)")
     private Integer firstOtherMoneyType;
 
     /**
      * 首充-其它金额回传概率/比例
      */
-    @ApiModelProperty("首充-其它金额回传概率/比例")
     private String firstOtherMoneyRate;
 
     /**
      * 首充-降档规则
      */
-    @ApiModelProperty("首充-降档规则")
     private List<PolicyDownLevel> firstDownLevel;
 
     /**
      * 首充-按用户订单数卡单
      */
-    @ApiModelProperty("首充-按用户订单数卡单")
     private Integer firstBackCountOfUser;
 
     /**
      * 次单-小额判定金额(小于等于)
      */
-    @ApiModelProperty("次单-小额判定金额(小于等于)")
     private BigDecimal rechargeMinMoney;
 
     /**
      * 次单-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-小额回传方式(概率/比例)")
     private Integer rechargeMinMoneyType;
 
     /**
      * 次单-小额回传概率/比例
      */
-    @ApiModelProperty("次单-小额回传概率/比例")
     private String rechargeMinMoneyRate;
 
     /**
      * 次单-大额判定金额(大于等于)
      */
-    @ApiModelProperty("次单-大额判定金额(大于等于)")
     private BigDecimal rechargeMaxMoney;
 
     /**
      * 次单-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-大额回传方式(概率/比例)")
     private Integer rechargeMaxMoneyType;
 
     /**
      * 次单-大额回传概率/比例
      */
-    @ApiModelProperty("次单-大额回传概率/比例")
     private String rechargeMaxMoneyRate;
 
     /**
      * 次单-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("次单-其它金额回传方式(概率/比例)")
     private Integer rechargeOtherMoneyType;
 
     /**
      * 次单-其它金额回传概率/比例
      */
-    @ApiModelProperty("次单-其它金额回传概率/比例")
     private String rechargeOtherMoneyRate;
 
     /**
      * 次单-降档规则
      */
-    @ApiModelProperty("次单-降档规则")
     private List<PolicyDownLevel> rechargeDownLevel;
 
     /**
      * 次单-按用户订单数卡单
      */
-    @ApiModelProperty("次单-按用户订单数卡单")
     private Integer rechargeBackCountOfUser;
 
     private LocalDateTime createTime;
@@ -172,73 +149,61 @@ public class GameBackPolicyVO implements Serializable {
 
     private String createName;
 
-    @ApiModelProperty("充值注册最大间隔时间(超时不回传)")
     private Long regPayIntervalTime;
 
     /**
      * 是否补单
      */
-    @ApiModelProperty("是否补单")
     private Boolean markUpOrder;
 
     /**
      * 补单-小额判定金额(小于等于)
      */
-    @ApiModelProperty("补单-小额判定金额(小于等于)")
     private BigDecimal markUpOrderMinMoney;
 
     /**
      * 补单-小额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-小额回传方式(概率/比例)")
     private Integer markUpOrderMinMoneyType;
 
     /**
      * 补单-小额回传概率/比例
      */
-    @ApiModelProperty("补单-小额回传概率/比例")
     private String markUpOrderMinMoneyRate;
 
     /**
      * 补单-大额判定金额(大于等于)
      */
-    @ApiModelProperty("补单-大额判定金额(大于等于)")
     private BigDecimal markUpOrderMaxMoney;
 
     /**
      * 补单-大额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-大额回传方式(概率/比例)")
     private Integer markUpOrderMaxMoneyType;
 
     /**
      * 补单-大额回传概率/比例
      */
-    @ApiModelProperty("补单-大额回传概率/比例")
     private String markUpOrderMaxMoneyRate;
 
     /**
      * 补单-其它金额回传方式(概率/比例)
      */
-    @ApiModelProperty("补单-其它金额回传方式(概率/比例)")
     private Integer markUpOrderOtherMoneyType;
 
     /**
      * 补单-其它金额回传概率/比例
      */
-    @ApiModelProperty("补单-其它金额回传概率/比例")
     private String markUpOrderOtherMoneyRate;
 
     /**
      * 补单-降档规则
      */
-    @ApiModelProperty("补单-降档规则")
     private List<PolicyDownLevel> markUpDownLevel;
 
     /**
      * 补单-按用户订单数卡单
      */
-    @ApiModelProperty("补单-按用户订单数卡单")
     private Integer markUpBackCountOfUser;
 
     /**

+ 1 - 28
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineAppOrderLogVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -17,84 +16,58 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineAppOrderLogVO {
-    @ApiModelProperty("主键ID")
+
     private Long id;
 
-    @ApiModelProperty("用户ID")
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("回传策略ID")
     private Long backPolicyId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("订单金额(分)")
     private Long amount;
 
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("下单时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("注册时间")
     private LocalDateTime regTime;
 
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
-    @ApiModelProperty("角色ID")
     private String roleId;
 
-    @ApiModelProperty("角色名")
     private String roleName;
 
-    @ApiModelProperty("注册到付费的间隔时间")
     private String regPayIntervalTime;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("回传金额")
     private Long backMoney;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
-    @ApiModelProperty("回传拆分订单")
     private List<GameOceanengineAppOrderSplitLogVO> splitOrderList;
 }

+ 0 - 16
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineAppUserLogVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,48 +15,33 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineAppUserLogVO {
-    @ApiModelProperty("主键ID")
     private Long id;
 
-    @ApiModelProperty("用户ID")
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("注册/激活时间")
     private LocalDateTime activeTime;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 }

+ 1 - 23
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineOrderLogVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -17,69 +16,48 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineOrderLogVO {
-    @ApiModelProperty("主键ID")
+
     private Long id;
 
-    @ApiModelProperty("小游戏ID")
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("用户UnionID")
     private String unionId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("广告回传Token")
     private String accountReportToken;
 
-    @ApiModelProperty("广告回传URL")
     private String accountReportUrl;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("订单金额(分)")
     private Long amount;
 
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("下单时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("注册时间")
     private LocalDateTime regTime;
 
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
-    @ApiModelProperty("注册到付费的间隔时间")
     private String regPayIntervalTime;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("回传金额")
     private Long backMoney;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
-    @ApiModelProperty("回传拆分订单")
     private List<GameOceanengineOrderSplitLogVO> splitOrderList;
 }

+ 1 - 15
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineRoleRegisterLogVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,45 +15,32 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineRoleRegisterLogVO {
-    @ApiModelProperty("主键ID")
+
     private Long id;
 
-    @ApiModelProperty("小游戏ID")
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("用户UnionID")
     private String unionId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("广告回传Token")
     private String accountReportToken;
 
-    @ApiModelProperty("广告回传URL")
     private String accountReportUrl;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("角色 id")
     private String roleId;
 
-    @ApiModelProperty("角色名称")
     private String roleName;
 
-    @ApiModelProperty("注册/激活时间")
     private LocalDateTime registerTime;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 }

+ 1 - 17
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameOceanengineUserLogVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,51 +15,36 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameOceanengineUserLogVO {
-    @ApiModelProperty("主键ID")
+
     private Long id;
 
-    @ApiModelProperty("小游戏ID")
     private String appId;
 
-    @ApiModelProperty("用户OpenID")
     private String openId;
 
-    @ApiModelProperty("用户UnionID")
     private String unionId;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("广告回传Token")
     private String accountReportToken;
 
-    @ApiModelProperty("广告回传URL")
     private String accountReportUrl;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("注册Token")
     private String clueToken;
 
-    @ApiModelProperty("头条2.0-项目ID")
     private String projectId;
 
-    @ApiModelProperty("头条2.0-广告ID")
     private String promotionId;
 
-    @ApiModelProperty("请求ID")
     private String reqId;
 
-    @ApiModelProperty("注册/激活时间")
     private LocalDateTime activeTime;
 
-    @ApiModelProperty("回传状态")
     private Integer backStatus;
 }

+ 0 - 28
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentAppOrderVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,84 +17,57 @@ import java.util.List;
 @Builder
 public class GameTencentAppOrderVO {
 
-    @ApiModelProperty("主键ID")
     private Long id;
 
-    @ApiModelProperty("用户ID")
     private String userId;
 
-    @ApiModelProperty("用户设备mac地址")
     private String mac;
 
-    @ApiModelProperty("设备唯一编号IMEI")
     private String imei;
 
-    @ApiModelProperty("设备OAID")
     private String oaid;
 
-    @ApiModelProperty("安卓id, (仅安卓设备才有值)")
     private String androidId;
 
-    @ApiModelProperty("IOS设备IDFA")
     private String idfa;
 
-    @ApiModelProperty("IOS设备CAID")
     private String caid;
 
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
-    @ApiModelProperty("广告账号ID")
     private Long accountId;
 
-    @ApiModelProperty("回传策略ID")
     private Long backPolicyId;
 
-    @ApiModelProperty("渠道标识")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
-    @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("订单金额(分)")
     private Long amount;
 
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
-    @ApiModelProperty("下单时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("注册时间")
     private LocalDateTime regTime;
 
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:回传")
     private Integer backStatus;
 
-    @ApiModelProperty("角色ID")
     private String roleId;
 
-    @ApiModelProperty("角色名")
     private String roleName;
 
-    @ApiModelProperty("注册到付费的间隔时间")
     private String regPayIntervalTime;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("回传金额")
     private Long backMoney;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
-    @ApiModelProperty("回传拆分订单")
     private List<GameTencentAppOrderSplitLogVO> splitOrderList;
 }

+ 0 - 21
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameOrderVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,99 +26,79 @@ public class GameTencentMiniGameOrderVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * 关注时间
      */
-    @ApiModelProperty("关注时间")
     private LocalDateTime subscribeTime;
 
     /**
      * 充值金额(分)
      */
-    @ApiModelProperty("充值金额(分)")
     private Long rechargeMoney;
 
     /**
      * 充值时间
      */
-    @ApiModelProperty("充值时间")
     private LocalDateTime rechargeTime;
 
     /**
      * 订单ID
      */
-    @ApiModelProperty("订单ID")
     private String orderId;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:已回传")
     private Integer backStatus;
 
     /**
      * 支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消
      */
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
     /**
      * 支付时间
      */
-    @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("注册到付费的间隔时间")
     private String regPayIntervalTime;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("回传金额")
     private Long backMoney;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
-    @ApiModelProperty("回传拆分订单")
     private List<GameTencentMiniOrderSplitLogVO> splitOrderList;
 }

+ 0 - 10
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameRoleRegisterVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,49 +25,40 @@ public class GameTencentMiniGameRoleRegisterVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态:-1:回传失败;0:未回传;1:已回传")
     private Integer backStatus;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
     private String roleId;

+ 0 - 11
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentMiniGameUserVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,54 +25,44 @@ public class GameTencentMiniGameUserVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String agentKey;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * 关注时间
      */
-    @ApiModelProperty("关注时间")
     private LocalDateTime subscribeTime;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态:-1:回传失败;0:未回传;1:已回传")
     private Integer backStatus;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 }

+ 0 - 27
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentOrderVO.java

@@ -1,13 +1,10 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -29,113 +26,89 @@ public class GameTencentOrderVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String channel;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * 关注时间
      */
-    @ApiModelProperty("关注时间")
     private LocalDateTime subscribeTime;
 
     /**
      * 充值金额(分)
      */
-    @ApiModelProperty("充值金额(分)")
     private Long rechargeMoney;
 
     /**
      * 充值时间
      */
-    @ApiModelProperty("充值时间")
     private LocalDateTime rechargeTime;
 
     /**
      * 订单ID
      */
-    @ApiModelProperty("订单ID")
     private String orderId;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:已回传")
     private Integer isBack;
 
     /**
      * 支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消
      */
-    @ApiModelProperty("支付状态,0 : 预下单, 1 : 待支付,2 : 支付成功,-1 : 已取消")
     private Integer orderStatus;
 
     /**
      * 支付时间
      */
-    @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("更新时间")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("更新者id")
     private Long updateBy;
-    @ApiModelProperty("更新者名称")
     private String updateName;
 
     /**
      * 回传日志
      */
-    @ApiModelProperty("回传日志")
     private String backLog;
 
-    @ApiModelProperty("注册到付费的间隔时间")
     private String regPayIntervalTime;
 
-    @ApiModelProperty("是否是首单")
     private Boolean isFirstOrder;
 
-    @ApiModelProperty("回传金额")
     private Long backMoney;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
-    @ApiModelProperty("回传拆分订单")
     private List<GameTencentOrderSplitLogVO> splitOrderList;
 }

+ 0 - 12
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentRoleRegisterVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,58 +25,47 @@ public class GameTencentRoleRegisterVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String channel;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态 -1:回传失败;0:未回传;1:已回传")
     private Integer isBack;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
     /**
      * 回传日志
      */
-    @ApiModelProperty("回传日志")
     private String backLog;
 
-    @ApiModelProperty("回传日志")
     private String backMsg;
 
     private String roleId;

+ 0 - 17
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameTencentUserVO.java

@@ -1,13 +1,10 @@
 package com.zanxiang.game.back.serve.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -28,69 +25,55 @@ public class GameTencentUserVO {
     /**
      * 渠道号
      */
-    @ApiModelProperty("渠道号")
     private String channel;
 
-    @ApiModelProperty("渠道名称")
     private String agentName;
 
     /**
      * 游戏ID
      */
-    @ApiModelProperty("游戏ID")
     private Long gameId;
 
     /**
      * 广告账号ID
      */
-    @ApiModelProperty("广告账号ID")
     private Long adAccountId;
 
     /**
      * 注册时间
      */
-    @ApiModelProperty("注册时间")
     private LocalDateTime registerTime;
 
     /**
      * 关注时间
      */
-    @ApiModelProperty("关注时间")
     private LocalDateTime subscribeTime;
 
     /**
      * openid
      */
-    @ApiModelProperty("openid")
     private String wechatOpenid;
 
     /**
      * appid
      */
-    @ApiModelProperty("appid")
     private String wechatAppId;
 
     /**
      * 0:未回传;1:回传
      */
-    @ApiModelProperty("回传状态:-1:回传失败;0:未回传;1:已回传")
     private Integer isBack;
 
-    @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("更新时间")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("更新者id")
     private Long updateBy;
 
-    @ApiModelProperty("更新者名称")
     private String updateName;
 
     /**
      * 回传日志
      */
-    @ApiModelProperty("回传日志")
     private String backLog;
 }

+ 12 - 6
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentAppApiBackRpcImpl.java

@@ -3,21 +3,27 @@ package com.zanxiang.game.back.serve.rpc.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.zanxiang.game.back.base.pojo.dto.*;
+import com.zanxiang.game.back.base.pojo.dto.TencentAppApiUserAgentQueryRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderAppApiRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterAppApiRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserAppApiRpcDTO;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.rpc.ITencentAppApiBackRpc;
-import com.zanxiang.game.back.base.rpc.ITencentAppBackRpc;
-import com.zanxiang.game.back.serve.pojo.entity.*;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiOrder;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiRoleRegister;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiUser;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppCallback;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
-import com.zanxiang.game.back.serve.service.*;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiRoleRegisterService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiUserService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppCallbackService;
 import com.zanxiang.module.util.JsonUtil;
-import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import reactor.util.function.Tuples;
 
 import java.time.LocalDateTime;
 import java.util.Objects;

+ 0 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentUserActionBackRpcImpl.java

@@ -8,7 +8,6 @@ import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterRpcDTO;
 import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.rpc.ITencentUserActionBackRpc;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiRoleRegister;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentRoleRegister;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;

+ 4 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtMiniGameBackRpcImpl.java

@@ -8,7 +8,10 @@ import com.zanxiang.game.back.base.pojo.dto.TtRoleRegisterRpcDTO;
 import com.zanxiang.game.back.base.pojo.dto.TtUserActiveRpcDTO;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.rpc.ITtMiniGameBackRpc;
-import com.zanxiang.game.back.serve.pojo.entity.*;
+import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
+import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
+import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineRoleRegisterLog;
+import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineUserLog;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineOrderLogService;

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameBackPolicyService.java

@@ -1,10 +1,10 @@
 package com.zanxiang.game.back.serve.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
 
 import java.util.List;

+ 0 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameOceanengineOrderLogService.java

@@ -10,7 +10,6 @@ import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 public interface IGameOceanengineOrderLogService extends IService<GameOceanengineOrderLog> {
 

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentBackLogService.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.back.serve.service;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 
 /**
  * <p>

+ 1 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentOrderService.java

@@ -1,17 +1,15 @@
 package com.zanxiang.game.back.serve.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentOrderDTO;
 import com.zanxiang.game.back.serve.pojo.dto.OrderReportDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentUserService.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.back.serve.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentUserDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentUserVO;
 
 import java.util.List;

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppBackLogXgltServiceImpl.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.back.serve.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineAppBackLogXgltMapper;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppBackLogXglt;
 import com.zanxiang.game.back.serve.service.IGameOceanengineAppBackLogXgltService;
-import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineAppBackLogXgltMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

+ 1 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppOrderLogServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.github.sd4324530.jtuple.Tuple3;
 import com.github.sd4324530.jtuple.Tuple4;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineAppOrderLogMapper;
@@ -16,9 +15,8 @@ import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineAppOrderLogDTO;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
-import com.zanxiang.game.back.serve.pojo.vo.*;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderLogVO;
+import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.service.*;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
 import com.zanxiang.game.back.serve.utils.OrderUtil;

+ 0 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppOrderSplitLogServiceImpl.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineAppOrderSplitLogMapper;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppOrderSplitLog;
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppOrderSplitLog;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.service.IGameOceanengineAppOrderSplitLogService;
 import com.zanxiang.module.util.NumberUtil;

+ 2 - 16
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineOrderLogServiceImpl.java

@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.github.sd4324530.jtuple.Tuple3;
 import com.github.sd4324530.jtuple.Tuple4;
-import com.github.sd4324530.jtuple.Tuples;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.config.NacosDynamicParamConfig;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineOrderLogMapper;
@@ -22,17 +20,12 @@ import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderSplitLogVO;
-import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
-import com.zanxiang.game.back.serve.service.IGameOceanengineBackLogService;
-import com.zanxiang.game.back.serve.service.IGameOceanengineOrderLogService;
-import com.zanxiang.game.back.serve.service.IGameOceanengineOrderSplitLogService;
-import com.zanxiang.game.back.serve.service.IGameOceanengineUserLogService;
+import com.zanxiang.game.back.serve.service.*;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
 import com.zanxiang.game.back.serve.utils.OrderUtil;
 import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
-import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.NumberUtil;
 import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
@@ -46,16 +39,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;

+ 0 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineRoleRegisterLogServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineRoleRegisterLogMapper;
 import com.zanxiang.game.back.serve.oceanengine.MiniGameCallback;
 import com.zanxiang.game.back.serve.oceanengine.OceanengineCallbackException;

+ 0 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineUserLogServiceImpl.java

@@ -16,7 +16,6 @@ import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineUserLogVO;
 import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineBackLogService;
-import com.zanxiang.game.back.serve.service.IGameOceanengineRoleRegisterLogService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineUserLogService;
 import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;

+ 0 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java

@@ -5,18 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.github.sd4324530.jtuple.Tuple3;
 import com.github.sd4324530.jtuple.Tuple4;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
-import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdRpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdV3RpcDTO;
-import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionV3RpcDTO;
-import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiOrderMapper;
-import com.zanxiang.game.back.serve.pojo.TencentAppReport;
 import com.zanxiang.game.back.serve.pojo.dto.OrderReportDTO;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;

+ 0 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderSplitLogServiceImpl.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiOrderSplitLogMapper;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiOrderSplitLog;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrderSplitLog;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentAppApiOrderSplitLogVO;
-import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderSplitLogVO;
 import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderSplitLogService;
 import com.zanxiang.module.util.NumberUtil;
 import com.zanxiang.module.util.bean.BeanUtil;

+ 2 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiRoleRegisterServiceImpl.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
-import com.zanxiang.advertising.tencent.base.pojo.dto.*;
-import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
+import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdV3RpcDTO;
+import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionV3RpcDTO;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiRoleRegisterMapper;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.service.*;
-import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -23,9 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Service

+ 0 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppOrderServiceImpl.java

@@ -11,13 +11,10 @@ import com.github.sd4324530.jtuple.Tuple4;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppOrderMapper;
 import com.zanxiang.game.back.serve.oceanengine.MiniGameCallback;
-import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineAppOrderLogDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentAppOrderDTO;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderLogVO;
-import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentAppOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentAppOrderVO;
 import com.zanxiang.game.back.serve.service.*;

+ 0 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppRoleRegisterServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppRoleRegisterMapper;
 import com.zanxiang.game.back.serve.oceanengine.MiniGameCallback;
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppRoleRegisterLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppBackLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppRoleRegister;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppUser;
@@ -19,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Objects;
 
 @Slf4j
 @Service

+ 0 - 5
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppUserServiceImpl.java

@@ -6,10 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
-import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
-import com.zanxiang.erp.base.ErpServer;
-import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppUserMapper;
 import com.zanxiang.game.back.serve.oceanengine.MiniGameCallback;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentAppUserDTO;
@@ -18,7 +14,6 @@ import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppUser;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentUserVO;
 import com.zanxiang.game.back.serve.service.IGameTencentAppBackLogService;
-import com.zanxiang.game.back.serve.service.IGameTencentAppCallbackService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppUserService;
 import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;

+ 2 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentBackLogServiceImpl.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.back.serve.service.impl;
 
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentBackLogMapper;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 import com.zanxiang.game.back.serve.service.IGameTencentBackLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 0 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameUserServiceImpl.java

@@ -23,7 +23,6 @@ import com.zanxiang.game.back.serve.service.IGameTencentMiniGameUserService;
 import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
-import com.zanxiang.module.redis.service.IDistributedLockComponent;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -36,7 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

+ 5 - 21
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
-import com.github.sd4324530.jtuple.Tuple3;
 import com.github.sd4324530.jtuple.Tuple4;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
 import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAppIdRpcDTO;
@@ -15,26 +15,16 @@ import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
+import com.zanxiang.game.back.serve.dao.mapper.GameTencentOrderMapper;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentOrderDTO;
 import com.zanxiang.game.back.serve.pojo.dto.OrderReportDTO;
-import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameOrder;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
-import com.zanxiang.game.back.serve.dao.mapper.GameTencentOrderMapper;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrderSplitLog;
-import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
+import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderSplitLogVO;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
-import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
-import com.zanxiang.game.back.serve.service.IGameTencentBackLogService;
-import com.zanxiang.game.back.serve.service.IGameTencentOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.back.serve.service.IGameTencentOrderSplitLogService;
-import com.zanxiang.game.back.serve.service.IGameTencentUserService;
+import com.zanxiang.game.back.serve.service.*;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
 import com.zanxiang.game.back.serve.utils.OrderUtil;
 import com.zanxiang.game.module.base.ServerInfo;
@@ -56,13 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;

+ 1 - 8
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentRoleRegisterServiceImpl.java

@@ -1,12 +1,10 @@
 package com.zanxiang.game.back.serve.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
 import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAppIdRpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
@@ -41,12 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

+ 1 - 6
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentUserServiceImpl.java

@@ -33,12 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

+ 3 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/TencentAppApiOrderSplitBackTask.java

@@ -7,7 +7,9 @@ import com.zanxiang.game.back.base.ServerInfo;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiOrder;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiOrderSplitLog;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
-import com.zanxiang.game.back.serve.service.*;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiBackLogService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderService;
+import com.zanxiang.game.back.serve.service.IGameTencentAppApiOrderSplitLogService;
 import com.zanxiang.module.redis.service.IDistributedLockComponent;
 import com.zanxiang.module.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 7
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/utils/BackPolicyUtil.java

@@ -20,13 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j

+ 0 - 21
game-data/game-data-serve/pom.xml

@@ -107,27 +107,6 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metadata-definition-protobuf</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
         <!-- Mysql Connector -->
         <dependency>
             <groupId>com.mysql</groupId>

+ 4 - 2
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/component/DataPowerComponent.java

@@ -22,8 +22,10 @@ import org.nutz.dao.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 @Slf4j
 @Component

+ 0 - 48
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/config/SwaggerConfig.java

@@ -1,48 +0,0 @@
-package com.zanxiang.game.data.serve.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @author : lingfeng
- * @time : 2022-3-31
- * @description : Swagger2 配置
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-
-    /**
-     * 包扫描
-     */
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .useDefaultResponseMessages(false)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors
-                        .basePackage("com.zanxiang.game.data.serve"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    /**
-     * api文档构造
-     *
-     * @return : 返回api模板
-     */
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("游戏数据服务")
-                .version("1.0")
-                .build();
-    }
-}

+ 0 - 8
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AccountAgentDayController.java

@@ -6,8 +6,6 @@ import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IAccountAgentDayService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,42 +16,36 @@ import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
-@Api(tags = "推广数据")
 @RestController
 @RequestMapping("/promote")
 public class AccountAgentDayController {
     @Autowired
     private IAccountAgentDayService accountAgentDayService;
 
-    @ApiOperation(value = "推广每日数据")
     @PreAuthorize(permissionKey = "gameData:promote:day")
     @PostMapping("/day")
     public ResultVO<Page<GamePromoteDayVO>> accountAgentDay(@RequestBody GamePromoteDayDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDay(dto));
     }
 
-    @ApiOperation(value = "推广每日数据总计")
     @PreAuthorize(permissionKey = "gameData:promote:dayTotal")
     @PostMapping("/day/total")
     public ResultVO<GamePromoteDayTotalVO> accountAgentDayTotal(@RequestBody GamePromoteDayTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDayTotal(dto));
     }
 
-    @ApiOperation(value = "推广总数据")
     @PreAuthorize(permissionKey = "gameData:promote:total")
     @PostMapping("/total")
     public ResultVO<Page<GamePromoteTotalVO>> accountAgentTotal(@RequestBody GamePromoteTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentTotal(dto));
     }
 
-    @ApiOperation(value = "推广总数据总计")
     @PreAuthorize(permissionKey = "gameData:promote:totalSum")
     @PostMapping("/total/sum")
     public ResultVO<GamePromoteTotalSumVO> accountAgentTotalSum(@RequestBody GamePromoteTotalSumDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentTotalSum(dto));
     }
 
-    @ApiOperation(value = "推广渠道每日复充数据")
     @PreAuthorize(permissionKey = "gameData:accountAgent:again")
     @PostMapping("/again")
     public ResultVO<Map<LocalDate, List<AgentDayAgainVO>>> accountAgentDayAgain(@RequestBody AgentDayAgainDTO dto) throws Exception {

+ 0 - 10
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsCreativeDayController.java

@@ -2,18 +2,11 @@ package com.zanxiang.game.data.serve.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.TencentCreativeDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.TencentPromotionDayDTO;
-import com.zanxiang.game.data.serve.pojo.dto.TencentPromotionDayTotalDTO;
 import com.zanxiang.game.data.serve.pojo.vo.TencentCreativeDayTotalVO;
 import com.zanxiang.game.data.serve.pojo.vo.TencentCreativeDayVO;
-import com.zanxiang.game.data.serve.pojo.vo.TencentPromotionDayTotalVO;
-import com.zanxiang.game.data.serve.pojo.vo.TencentPromotionDayVO;
 import com.zanxiang.game.data.serve.service.IAdsCreativeDayService;
-import com.zanxiang.game.data.serve.service.IAdsPromotionDayService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @time 2023/7/27
  * @Description
  **/
-@Api(tags = {"创意监控"})
 @RestController
 @RequestMapping("/creativeData")
 @Slf4j
@@ -36,14 +28,12 @@ public class AdsCreativeDayController {
     @Autowired
     private IAdsCreativeDayService adsCreativeDayService;
 
-    @ApiOperation(value = "腾讯创意监控数据")
     @PreAuthorize(permissionKey = "creativeData:adsCreativeDay:day")
     @PostMapping("/tencent/day")
     public ResultVO<Page<TencentCreativeDayVO>> getTencentCreativeDayData(@RequestBody TencentCreativeDayDTO dto) {
         return ResultVO.ok(adsCreativeDayService.getTencentCreativeDayData(dto));
     }
 
-    @ApiOperation(value = "腾讯创意监控数据总计")
     @PreAuthorize(permissionKey = "creativeData:adsCreativeDay:total")
     @PostMapping("/tencent/total")
     public ResultVO<TencentCreativeDayTotalVO> getTencentCreativeTotalData(@RequestBody TencentCreativeDayDTO dto) {

+ 0 - 9
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsGameServerController.java

@@ -6,8 +6,6 @@ import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IGameServerService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @time 2023/8/14
  * @Description 游戏区服控制层
  **/
-@Api(tags = "游戏区服")
 @RestController
 @RequestMapping("/gameServer")
 @Slf4j
@@ -29,42 +26,36 @@ public class AdsGameServerController {
     @Autowired
     private IGameServerService gameServerService;
 
-    @ApiOperation(value = "游戏区服数据")
     @PreAuthorize(permissionKey = "gameServer:adsGameServerDay:day")
     @PostMapping("/day")
     public ResultVO<Page<GameServerDayVO>> getGameServerDataDay(@RequestBody GameServerDayDTO dto) {
         return ResultVO.ok(gameServerService.getGameServerDataDay(dto));
     }
 
-    @ApiOperation(value = "游戏区服数据总计一栏")
     @PreAuthorize(permissionKey = "gameServer:adsGameServerDay:dayTotal")
     @PostMapping("/day/total")
     public ResultVO<GameServerDayTotalVO> getGameServerDataDayTotal(@RequestBody GameServerDayTotalDTO dto) {
         return ResultVO.ok(gameServerService.getGameServerDataDayTotal(dto));
     }
 
-    @ApiOperation(value = "游戏区服每日数据")
     @PreAuthorize(permissionKey = "gameServer:GameServerSumDay:day")
     @PostMapping("/sum/day")
     public ResultVO<Page<GameServerSumDayVO>> getGameServerDataSumDay(@RequestBody GameServerSumDayDTO dto) {
         return ResultVO.ok(gameServerService.getGameServerDataSumDay(dto));
     }
 
-    @ApiOperation(value = "游戏区服每日数据总计一栏")
     @PreAuthorize(permissionKey = "gameServer:GameServerSumDay:dayTotal")
     @PostMapping("/sum/day/total")
     public ResultVO<GameServerSumDayTotalVO> getGameServerDataSumDayTotal(@RequestBody GameServerSumDayTotalDTO dto) {
         return ResultVO.ok(gameServerService.getGameServerDataSumDayTotal(dto));
     }
 
-    @ApiOperation(value = "GS区服数据")
     @PreAuthorize(permissionKey = "gameServer:GSAdsGameServerDay:day")
     @PostMapping("/gs/day")
     public ResultVO<Page<GSGameServerDayVO>> getGSGameServerDataDay(@RequestBody GSGameServerDayDTO dto) {
         return ResultVO.ok(gameServerService.getGSGameServerDataDay(dto));
     }
 
-    @ApiOperation(value = "GS区服总数据")
     @PreAuthorize(permissionKey = "gameServer:GSAdsGameServerDay:total")
     @PostMapping("/gs/total")
     public ResultVO<GSGameServerDayVO> getGSGameServerDataDayTotal(@RequestBody GSGameServerDayDTO dto) {

+ 0 - 15
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsMediaDataController.java

@@ -6,8 +6,6 @@ import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.IMediaDataService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @time 2023/8/30
  * @Description 媒体相关数据的控制层
  **/
-@Api(tags = "媒体数据")
 @RestController
 @RequestMapping("/media")
 @Slf4j
@@ -29,84 +26,72 @@ public class AdsMediaDataController {
     @Autowired
     private IMediaDataService iMediaDataService;
 
-    @ApiOperation(value = "推广媒体每日数据")
     @PreAuthorize(permissionKey = "media:pitcherGameMedia:day")
     @PostMapping("/pitcherGame/day")
     public ResultVO<Page<PitcherGameMediaDataDayVO>> getPitcherGameMediaDataDay(@RequestBody PitcherGameMediaDataDayDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherGameMediaDataDay(dto));
     }
 
-    @ApiOperation(value = "推广媒体每日数据总计")
     @PreAuthorize(permissionKey = "media:pitcherGameMedia:dayTotal")
     @PostMapping("/pitcherGame/dayTotal")
     public ResultVO<PitcherGameMediaDataDayVO> getPitcherGameMediaDataDayTotal(@RequestBody PitcherGameMediaDataDayTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherGameMediaDataDayTotal(dto));
     }
 
-    @ApiOperation(value = "推广媒体总数据")
     @PreAuthorize(permissionKey = "media:pitcherGameMedia:total")
     @PostMapping("/pitcherGame/total")
     public ResultVO<Page<PitcherGameMediaDataTotalVO>> getPitcherGameMediaDataTotal(@RequestBody PitcherGameMediaDataTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherGameMediaDataTotal(dto));
     }
 
-    @ApiOperation(value = "推广媒体总数据总计")
     @PreAuthorize(permissionKey = "media:pitcherGameMedia:totalSum")
     @PostMapping("/pitcherGame/totalSum")
     public ResultVO<PitcherGameMediaDataTotalVO> getPitcherGameMediaDataTotalSum(@RequestBody PitcherGameMediaDataTotalSumDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherGameMediaDataTotalSum(dto));
     }
 
-    @ApiOperation(value = "投手媒体每日数据")
     @PreAuthorize(permissionKey = "media:pitcherMedia:day")
     @PostMapping("/pitcher/day")
     public ResultVO<Page<PitcherMediaDataDayVO>> getPitcherMediaDataDay(@RequestBody PitcherMediaDataDayDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherMediaDataDay(dto));
     }
 
-    @ApiOperation(value = "投手媒体每日数据总计")
     @PreAuthorize(permissionKey = "media:pitcherMedia:dayTotal")
     @PostMapping("/pitcher/dayTotal")
     public ResultVO<PitcherMediaDataDayVO> getPitcherMediaDataDayTotal(@RequestBody PitcherMediaDataDayTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherMediaDataDayTotal(dto));
     }
 
-    @ApiOperation(value = "投手媒体总数据")
     @PreAuthorize(permissionKey = "media:pitcherMedia:total")
     @PostMapping("/pitcher/total")
     public ResultVO<Page<PitcherMediaDataTotalVO>> getPitcherMediaDataTotal(@RequestBody PitcherMediaDataTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherMediaDataTotal(dto));
     }
 
-    @ApiOperation(value = "投手媒体总数据总计")
     @PreAuthorize(permissionKey = "media:pitcherMedia:totalSum")
     @PostMapping("/pitcher/totalSum")
     public ResultVO<PitcherMediaDataTotalVO> getPitcherMediaDataTotalSum(@RequestBody PitcherMediaDataTotalSumDTO dto) {
         return ResultVO.ok(iMediaDataService.getPitcherMediaDataTotalSum(dto));
     }
 
-    @ApiOperation(value = "游戏媒体每日数据")
     @PreAuthorize(permissionKey = "media:gameMedia:day")
     @PostMapping("/game/day")
     public ResultVO<Page<GameMediaDataDayVO>> getGameMediaDataDay(@RequestBody GameMediaDataDayDTO dto) {
         return ResultVO.ok(iMediaDataService.getGameMediaDataDay(dto));
     }
 
-    @ApiOperation(value = "游戏媒体每日数据总计")
     @PreAuthorize(permissionKey = "media:gameMedia:dayTotal")
     @PostMapping("/game/dayTotal")
     public ResultVO<GameMediaDataDayVO> getGameMediaDataDayTotal(@RequestBody GameMediaDataDayTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getGameMediaDataDayTotal(dto));
     }
 
-    @ApiOperation(value = "游戏媒体总数据")
     @PreAuthorize(permissionKey = "media:gameMedia:total")
     @PostMapping("/game/total")
     public ResultVO<Page<GameMediaDataTotalVO>> getGameMediaDataTotal(@RequestBody GameMediaDataTotalDTO dto) {
         return ResultVO.ok(iMediaDataService.getGameMediaDataTotal(dto));
     }
 
-    @ApiOperation(value = "游戏媒体总数据总计")
     @PreAuthorize(permissionKey = "media:gameMedia:totalSum")
     @PostMapping("/game/totalSum")
     public ResultVO<GameMediaDataTotalVO> getGameMediaDataTotalSum(@RequestBody GameMediaDataTotalSumDTO dto) {

+ 0 - 9
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AdsOrderDetailController.java

@@ -10,10 +10,6 @@ import com.zanxiang.game.data.serve.pojo.vo.OrderCPDetailVO;
 import com.zanxiang.game.data.serve.service.IAdsOrderDetailService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -23,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
-@Api(tags = {"订单详情"})
 @RestController
 @RequestMapping("/order")
 public class AdsOrderDetailController {
@@ -32,22 +27,18 @@ public class AdsOrderDetailController {
     private IAdsOrderDetailService gameOrderService;
 
     @PreAuthorize(permissionKey = "gameData:order:list")
-    @ApiOperation(value = "订单详情列表")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AdsOrderDetailVO.class)})
     @PostMapping("/list")
     public ResultVO<Page<AdsOrderDetailVO>> orderList(@Validated @RequestBody AdsOrderDetailListDTO dto) {
         return ResultVO.ok(gameOrderService.listOfPage(dto));
     }
 
     @PreAuthorize(permissionKey = "gameData:order:listTotal")
-    @ApiOperation(value = "订单详情列表总计")
     @PostMapping("/list/total")
     public ResultVO<AdsOrderDetailTotalVO> orderTotal(@Validated @RequestBody AdsOrderDetailTotalDTO dto) {
         return ResultVO.ok(gameOrderService.orderTotal(dto));
     }
 
     @PreAuthorize(permissionKey = "gameData:order:detail")
-    @ApiOperation(value = "订单详情")
     @PostMapping("/detail")
     public ResultVO<Page<OrderCPDetailVO>> getOrderDetailList(@RequestBody AdsOrderDetailDTO dto) {
         return ResultVO.ok(gameOrderService.getOrderDetailList(dto));

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

@@ -12,8 +12,6 @@ import com.zanxiang.game.data.serve.pojo.vo.TencentPromotionDayVO;
 import com.zanxiang.game.data.serve.service.IAdsPromotionDayService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @time 2023/7/27
  * @Description
  **/
-@Api(tags = {"广告监控"})
 @RestController
 @RequestMapping("/promotionData")
 @Slf4j
@@ -36,56 +33,48 @@ public class AdsPromotionDayController {
     private IAdsPromotionDayService adsPromotionDayService;
 
 //    @Log(title = "头条广告监控")
-    @ApiOperation(value = "广告监控数据")
     @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")
     @PostMapping("/total")
     public ResultVO<PromotionDayTotalVO> getPromotionDayTotalData(@RequestBody PromotionDayTotalDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getPromotionDayTotalData(dto));
     }
 
-    @ApiOperation(value = "广告监控每日数据")
     @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:dayList")
     @PostMapping("/day/list")
     public ResultVO<Page<PromotionDayVO>> getPromotionDayListData(@RequestBody PromotionDayDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getPromotionDayListData(dto));
     }
 
-    @ApiOperation(value = "广告监控每日数据总计")
     @PreAuthorize(permissionKey = "promotionData:adsPromotionDay:dayListTotal")
     @PostMapping("/day/listTotal")
     public ResultVO<PromotionDayTotalVO> getPromotionDayListTotalData(@RequestBody PromotionDayTotalDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getPromotionDayTotalData(dto));
     }
 
-    @ApiOperation(value = "腾讯广告监控数据")
     @PreAuthorize(permissionKey = "promotionData:adsAdGroupDay:day")
     @PostMapping("/tencent/day")
     public ResultVO<Page<TencentPromotionDayVO>> getTencentPromotionDayData(@RequestBody TencentPromotionDayDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getTencentPromotionDayData(dto));
     }
 
-    @ApiOperation(value = "腾讯广告监控数据总计")
     @PreAuthorize(permissionKey = "promotionData:adsAdGroupDay:total")
     @PostMapping("/tencent/total")
     public ResultVO<TencentPromotionDayTotalVO> getTencentPromotionDayTotalData(@RequestBody TencentPromotionDayTotalDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getTencentPromotionDayTotalData(dto));
     }
 
-    @ApiOperation(value = "腾讯广告监控每日数据")
     @PreAuthorize(permissionKey = "promotionData:adsAdGroupDay:dayList")
     @PostMapping("/tencent/day/list")
     public ResultVO<Page<TencentPromotionDayVO>> getTencentPromotionDayListData(@RequestBody TencentPromotionDayDTO dto) {
         return ResultVO.ok(adsPromotionDayService.getTencentPromotionDayListData(dto));
     }
 
-    @ApiOperation(value = "腾讯广告监控每日数据总计")
     @PreAuthorize(permissionKey = "promotionData:adsAdGroupDay:dayListTotal")
     @PostMapping("/tencent/day/listTotal")
     public ResultVO<TencentPromotionDayTotalVO> getTencentPromotionDayListTotalData(@RequestBody TencentPromotionDayTotalDTO dto) {

+ 0 - 9
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/ChoiceListController.java

@@ -6,8 +6,6 @@ import com.zanxiang.game.data.serve.pojo.dto.GameServerListDTO;
 import com.zanxiang.game.data.serve.pojo.vo.*;
 import com.zanxiang.game.data.serve.service.*;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -20,7 +18,6 @@ import java.util.List;
  * @description:  下拉选择列表
  * @date 2023/11/3 15:33
  */
-@Api(tags = {"下拉选择列表"})
 @RestController
 @RequestMapping("/choice")
 @Slf4j
@@ -44,42 +41,36 @@ public class ChoiceListController {
     @Autowired
     private IGameServerService gameServerService;
 
-    @ApiOperation(value = "所有游戏列表")
     @PreAuthorize(permissionKey = "gameData:choice:gameList")
     @PostMapping("/game/list")
     public ResultVO<GameListVO> getGameDataDay(@RequestBody ChoiceListDTO dto) {
         return ResultVO.ok(gameListService.getGameList(dto));
     }
 
-    @ApiOperation(value = "所有广告账号列表")
     @PreAuthorize(permissionKey = "gameData:choice:accountList")
     @PostMapping("/account/list")
     public ResultVO<List<AccountListVO>> getAccountList(@RequestBody ChoiceListDTO dto) {
         return ResultVO.ok(accountListService.getAccountList(dto));
     }
 
-    @ApiOperation(value = "所有渠道列表")
     @PreAuthorize(permissionKey = "gameData:choice:agentList")
     @PostMapping("/agent/list")
     public ResultVO<List<AgentListVO>> getAgentList(@RequestBody ChoiceListDTO dto) {
         return ResultVO.ok(agentListService.getAgentList(dto));
     }
 
-    @ApiOperation(value = "所有投手列表")
     @PreAuthorize(permissionKey = "gameData:choice:pitcherList")
     @PostMapping("/pitcher/list")
     public ResultVO<List<PitcherListVO>> getPitcherList(@RequestBody ChoiceListDTO dto) {
         return ResultVO.ok(pitcherListService.getPitcherList(dto));
     }
 
-    @ApiOperation(value = "最大VIP等级")
     @PreAuthorize(permissionKey = "gameData:choice:maxVipLevel")
     @GetMapping("/vip/level")
     public ResultVO<Integer> getMaxVipLevel() {
         return ResultVO.ok(vipLevelService.getMaxVipLevel());
     }
 
-    @ApiOperation(value = "所有区服列表(原始区服)")
     @PreAuthorize(permissionKey = "gameData:choice:gameServerList")
     @PostMapping("/gameServer/list")
     public ResultVO<List<GameServerVO>> getPitcherList(@RequestBody GameServerListDTO dto) {

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

@@ -7,10 +7,6 @@ import com.zanxiang.game.data.serve.service.IActiveDataService;
 import com.zanxiang.game.data.serve.service.IGameDataService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,7 +23,6 @@ import java.util.Map;
  * @time 2023/7/12
  * @Description 游戏数据控制层接口
  **/
-@Api(tags = {"游戏数据"})
 @RestController
 @RequestMapping("/gameData")
 @Slf4j
@@ -38,142 +33,119 @@ public class GameDataController {
     @Autowired
     private IActiveDataService activeDataService;
 
-    @ApiOperation(value = "游戏每日数据")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:day")
     @PostMapping("/day")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<Page<GameDataDayVO>> getGameDataDay(@RequestBody GameDataDayDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataDay(dto));
     }
 
-    @ApiOperation(value = "游戏每日数据总计")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:dayTotal")
     @PostMapping("/day/total")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<GameDataDayTotalVO> getGameDataDay(@RequestBody GameDataDayTotalDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataDayTotal(dto));
     }
 
-    @ApiOperation(value = "游戏总数据")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:total")
     @PostMapping("/total")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataTotalVO.class)})
     public ResultVO<Page<GameDataTotalVO>> getGameDataTotal(@RequestBody GameDataTotalDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataTotal(dto));
     }
 
-    @ApiOperation(value = "游戏总数据总计")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:totalSum")
     @PostMapping("/total/sum")
     public ResultVO<GameDataTotalTotalVO> getGameDataTotalTotal(@RequestBody GameDataTotalTotalDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataTotalTotal(dto));
     }
 
-    @ApiOperation(value = "h5游戏充值")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:h5")
     @PostMapping("/h5")
     public ResultVO<Page<GameDataH5VO>> getH5Recharge(@RequestBody GameDataH5DTO dto) {
         return ResultVO.ok(gameDataService.getH5Recharge(dto));
     }
 
-    @ApiOperation(value = "每日流水贡献")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:water")
     @PostMapping("/water")
     public ResultVO<Page<GameDataWaterVO>> getGameDataWater(@RequestBody GameDataWaterDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataWater(dto));
     }
 
-    @ApiOperation(value = "游戏每日复充数据")
     @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));
     }
 
-    @ApiOperation(value = "LTV数据")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:ltv")
     @PostMapping("/ltv")
     public ResultVO<Page<LtvDataVO>> getLtvData(@RequestBody LtvDataDTO dto) {
         return ResultVO.ok(gameDataService.getLtvData(dto));
     }
 
-    @ApiOperation(value = "LTV数据总计一栏")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:ltvTotal")
     @PostMapping("/ltv/total")
     public ResultVO<LtvDataTotalVO> getLtvDataTotal(@RequestBody LtvDataTotalDTO dto) {
         return ResultVO.ok(gameDataService.getLtvTotalData(dto));
     }
 
-    @ApiOperation(value = "游戏首日复充")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgain")
     @PostMapping("/firstNewUser/again")
     public ResultVO<Page<GameDataFirstNewUserAgainVO>> getFirstNewUserAgain(@RequestBody GameDataFirstNewUserAgainDTO dto) {
         return ResultVO.ok(gameDataService.getFirstNewUserAgain(dto));
     }
 
-    @ApiOperation(value = "游戏首日复充总计")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgainTotal")
     @PostMapping("/firstNewUser/again/total")
     public ResultVO<GameDataFirstNewUserAgainTotalVO> getFirstNewUserAgainTotal(@RequestBody GameDataFirstNewUserAgainTotalDTO dto) {
         return ResultVO.ok(gameDataService.getFirstNewUserAgainTotal(dto));
     }
 
-    @ApiOperation(value = "用户详情")
     @PreAuthorize(permissionKey = "gameData:adsGameDay:userDetails")
     @PostMapping("/user/details")
     public ResultVO<Page<GameDataUserDetailsVO>> getUserDetails(@RequestBody GameDataUserDetailsDTO dto) {
         return ResultVO.ok(gameDataService.getUserDetails(dto));
     }
 
-    @ApiOperation(value = "留存数据")
     @PreAuthorize(permissionKey = "gameData:activeDay:activeDay")
     @PostMapping("/activeData/day")
     public ResultVO<Page<ActiveDataDayVO>> getActiveDataDay(@RequestBody ActiveDataDayDTO dto) {
         return ResultVO.ok(activeDataService.getActiveDataDay(dto));
     }
 
-    @ApiOperation(value = "留存数据总计")
     @PreAuthorize(permissionKey = "gameData:activeDay:activeTotal")
     @PostMapping("/activeData/total")
     public ResultVO<ActiveDataTotalVO> getActiveDataTotal(@RequestBody ActiveDataTotalDTO dto) {
         return ResultVO.ok(activeDataService.getActiveDataTotal(dto));
     }
 
-    @ApiOperation(value = "留存数据-月")
     @PreAuthorize(permissionKey = "gameData:activeData:activeMonth")
     @PostMapping("/activeData/month")
     public ResultVO<Page<ActiveDataMonthVO>> getActiveDataMonth(@RequestBody ActiveDataDayDTO dto) {
         return ResultVO.ok(activeDataService.getActiveDataMonth(dto));
     }
 
-    @ApiOperation(value = "留存数据-月总计")
     @PreAuthorize(permissionKey = "gameData:activeData:activeMonthTotal")
     @PostMapping("/activeData/monthTotal")
     public ResultVO<ActiveDataMonthTotalVO> getActiveMonthDataTotal(@RequestBody ActiveDataTotalDTO dto) {
         return ResultVO.ok(activeDataService.getActiveMonthDataTotal(dto));
     }
 
-    @ApiOperation(value = "游戏媒体留存数据")
     @PreAuthorize(permissionKey = "gameData:media:activeDay")
     @PostMapping("/mediaActiveData/day")
     public ResultVO<Page<MediaActiveDataDayVO>> getMediaActiveDataDay(@RequestBody MediaActiveDataDayDTO dto) {
         return ResultVO.ok(activeDataService.getMediaActiveDataDay(dto));
     }
 
-    @ApiOperation(value = "游戏媒体留存数据总计")
     @PreAuthorize(permissionKey = "gameData:media:activeTotal")
     @PostMapping("/mediaActiveData/total")
     public ResultVO<MediaActiveDataTotalVO> getMediaActiveDataTotal(@RequestBody MediaActiveDataDayDTO dto) {
         return ResultVO.ok(activeDataService.getMediaActiveDataTotal(dto));
     }
-    @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) {

+ 0 - 6
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/GameMonitorAlarmController.java

@@ -4,15 +4,12 @@ import com.zanxiang.game.data.serve.service.IGameMonitorAlarmService;
 import com.zanxiang.game.data.serve.service.IGameServerService;
 import com.zanxiang.game.data.serve.service.IOrderCostMonitorAlarmService;
 import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author tianhua
@@ -20,7 +17,6 @@ import java.util.List;
  * @description: 游戏监控告警控制器
  * @date 2023/12/13 16:20
  */
-@Api(tags = {"游戏监控告警"})
 @RestController
 @RequestMapping("/monitor/alarm")
 public class GameMonitorAlarmController {
@@ -32,7 +28,6 @@ public class GameMonitorAlarmController {
     @Resource
     private IGameServerService gameServerService;
 
-    @ApiOperation(value = "发送钉钉消息")
     @PutMapping("/sendMsg")
     public ResultVO<Boolean> sendDingMsgToUser() {
         return ResultVO.ok(gameMonitorAlarmService.sendMsgToUser());
@@ -41,7 +36,6 @@ public class GameMonitorAlarmController {
 
 
 
-    @ApiOperation(value = "测试")
     @PutMapping("/monitor")
     public ResultVO<Boolean> test() {
         gameMonitorAlarmService.sendMsgToUserTest();

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů