修改内容：游戏列表接口;角色战力排行榜修改

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

@@ -8,7 +8,7 @@ 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;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,7 +28,7 @@ public class GameListController {
 
     @ApiOperation(value = "所有游戏列表")
     @PreAuthorize(permissionKey = "gameData:gameList:game")
-    @PostMapping("/game")
+    @GetMapping("/list")
     public ResultVO<GameListVO> getGameDataDay() {
         return ResultVO.ok(gameListService.getGameList());
     }

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

@@ -1400,6 +1400,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	MAX(super_game_name) as super_game_name , -- 超父游戏名
                 	server_id, -- 区服ID
                 	MAX(server_name) as server_name, -- 区服名
+                	MAX(dt) as dt, -- 开服时间
                 	boss_server_id, -- 合服ID
                 	MAX(boss_server_name) as boss_server_name, -- 合服名
                 	MAX(merge_time) as merge_time , -- 合服时间
@@ -1436,6 +1437,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		MAX(super_game_name) as super_game_name , -- 超父游戏名
                 		server_id, -- 区服ID
                 		MAX(server_name) as server_name, -- 区服名
+                		MAX(`date`) as dt, -- 开服日期
                 		boss_server_id, -- 合服ID
                 		MAX(boss_server_name) as boss_server_name, -- 合服名
                 		MAX(merge_time) as merge_time , -- 合服时间
@@ -1474,25 +1476,26 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     COUNT(1)
                 FROM(
                     SELECT
-                        -- 查询每个父游戏-原始区服维度的信息
-                        source_system,
-                        parent_game_id, -- 父游戏ID
-                        MAX(parent_game_name) as parent_game_name, -- 父游戏名
-                        super_game_id , -- 超父游戏ID
-                        MAX(super_game_name) as super_game_name , -- 超父游戏名
-                        server_id, -- 区服ID
-                        MAX(server_name) as server_name, -- 区服名
-                        boss_server_id, -- 合服ID
-                        MAX(boss_server_name) as boss_server_name, -- 合服名
-                        MAX(merge_time) as merge_time , -- 合服时间
-                        MAX(sum_server_count) as sum_server_count, -- 合服次数
-                        SUM(server_combat_num) as server_combat_num, -- 区服战力
+                    	-- 查询每个父游戏-原始区服维度的信息
+                    	source_system,
+                    	parent_game_id, -- 父游戏ID
+                    	MAX(parent_game_name) as parent_game_name, -- 父游戏名
+                    	super_game_id , -- 超父游戏ID
+                    	MAX(super_game_name) as super_game_name , -- 超父游戏名
+                    	server_id, -- 区服ID
+                    	MAX(server_name) as server_name, -- 区服名
+                    	MAX(dt) as dt, -- 开服时间
+                    	boss_server_id, -- 合服ID
+                    	MAX(boss_server_name) as boss_server_name, -- 合服名
+                    	MAX(merge_time) as merge_time , -- 合服时间
+                    	MAX(sum_server_count) as sum_server_count, -- 合服次数
+                    	SUM(server_combat_num) as server_combat_num, -- 区服战力
                         SUM(new_user_count) as new_user_count, -- 新用户人数
                         SUM(create_role_count) as create_role_count, -- 创角人数
                         SUM(role_count) as role_count, -- 角色数量
                         SUM(total_num) as total_num, -- 总付费人数
                         SUM(total_amount) as total_amount, -- 总付费金额
-                        ROUND(IF(SUM(total_num) > 0, SUM(total_amount) / SUM(total_num), 0), 2) as total_arppu, -- 总付费ARPPU
+                    	ROUND(IF(SUM(total_num) > 0, SUM(total_amount) / SUM(total_num), 0), 2) as total_arppu, -- 总付费ARPPU
                         ROUND(IF(SUM(create_role_count) > 0, SUM(total_num) / SUM(create_role_count), 0), 4) as amount_rate, -- 付费率
                         SUM(ba1) as ba1, -- 今日付费金额
                         SUM(ba1_num) as ba1_num, -- 今日付费人数
@@ -1507,41 +1510,42 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         SUM(ba3_count) as ba3_count, -- 前天付费次数
                         SUM(ba3_active_num) as ba3_active_num -- 前天活跃人数
                     FROM (
-                        -- 子查询，查询每个子游戏-原始区服维度的信息
-                        SELECT
-                            source_system,
-                            game_id, -- 子游戏ID
-                            MAX(game_name) as game_name, -- 子游戏名
-                            parent_game_id, -- 父游戏ID
-                            MAX(parent_game_name) as parent_game_name, -- 父游戏名
-                            super_game_id , -- 超父游戏ID
-                            MAX(super_game_name) as super_game_name , -- 超父游戏名
-                            server_id, -- 区服ID
-                            MAX(server_name) as server_name, -- 区服名
-                            boss_server_id, -- 合服ID
-                            MAX(boss_server_name) as boss_server_name, -- 合服名
-                            MAX(merge_time) as merge_time , -- 合服时间
-                            MAX(sum_server_count) as sum_server_count, -- 合服次数
-                            MAX(server_combat_num) as server_combat_num, -- 区服战力
-                            MAX(new_user_count) as new_user_count, -- 新用户人数
-                            MAX(create_role_count) as create_role_count, -- 创角人数
-                            MAX(role_count) as role_count, -- 角色数量
-                            MAX(total_num) as total_num, -- 总付费人数
-                            MAX(total_amount) as total_amount, -- 总付费金额
-                            MAX(ba1) as ba1, -- 今日付费金额
-                            MAX(ba1_num) as ba1_num, -- 今日付费人数
-                            MAX(ba1_count) as ba1_count, -- 今日付费次数
-                            MAX(ba1_active_num) as ba1_active_num, -- 今日活跃人数
-                            MAX(ba2) as ba2, -- 昨日付费金额
-                            MAX(ba2_num) as ba2_num, -- 昨日付费人数
-                            MAX(ba2_count) as ba2_count, -- 昨日付费次数
-                            MAX(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
-                            MAX(ba3) as ba3, -- 前天付费金额
-                            MAX(ba3_num) as ba3_num, -- 前天付费人数
-                            MAX(ba3_count) as ba3_count, -- 前天付费次数
-                            MAX(ba3_active_num) as ba3_active_num -- 前天活跃人数
-                        FROM game_ads.ads_role_combat_num_ranking
-                        GROUP BY game_id ,parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
+                    	-- 子查询，查询每个子游戏-原始区服维度的信息
+                    	SELECT
+                    		source_system,
+                    		game_id, -- 子游戏ID
+                    		MAX(game_name) as game_name, -- 子游戏名
+                    		parent_game_id, -- 父游戏ID
+                    		MAX(parent_game_name) as parent_game_name, -- 父游戏名
+                    		super_game_id , -- 超父游戏ID
+                    		MAX(super_game_name) as super_game_name , -- 超父游戏名
+                    		server_id, -- 区服ID
+                    		MAX(server_name) as server_name, -- 区服名
+                    		MAX(`date`) as dt, -- 开服日期
+                    		boss_server_id, -- 合服ID
+                    		MAX(boss_server_name) as boss_server_name, -- 合服名
+                    		MAX(merge_time) as merge_time , -- 合服时间
+                    		MAX(sum_server_count) as sum_server_count, -- 合服次数
+                    		MAX(server_combat_num) as server_combat_num, -- 区服战力
+                    		MAX(new_user_count) as new_user_count, -- 新用户人数
+                    		MAX(create_role_count) as create_role_count, -- 创角人数
+                    		MAX(role_count) as role_count, -- 角色数量
+                    		MAX(total_num) as total_num, -- 总付费人数
+                    		MAX(total_amount) as total_amount, -- 总付费金额
+                    		MAX(ba1) as ba1, -- 今日付费金额
+                    		MAX(ba1_num) as ba1_num, -- 今日付费人数
+                    		MAX(ba1_count) as ba1_count, -- 今日付费次数
+                    		MAX(ba1_active_num) as ba1_active_num, -- 今日活跃人数
+                    		MAX(ba2) as ba2, -- 昨日付费金额
+                    		MAX(ba2_num) as ba2_num, -- 昨日付费人数
+                    		MAX(ba2_count) as ba2_count, -- 昨日付费次数
+                    		MAX(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
+                    		MAX(ba3) as ba3, -- 前天付费金额
+                    		MAX(ba3_num) as ba3_num, -- 前天付费人数
+                    		MAX(ba3_count) as ba3_count, -- 前天付费次数
+                    		MAX(ba3_active_num) as ba3_active_num -- 前天活跃人数
+                    	FROM game_ads.ads_role_combat_num_ranking
+                    	GROUP BY game_id ,parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
                     ) a
                 """ + cri+
                 """
@@ -1782,6 +1786,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	MAX(super_game_name) as super_game_name , -- 超父游戏名
                 	server_id, -- 区服ID
                 	MAX(server_name) as server_name, -- 区服名
+                	MAX(dt) as dt, -- 开服日期
                 	boss_server_id, -- 合服ID
                 	MAX(boss_server_name) as boss_server_name, -- 合服名
                 	MAX(merge_time) as merge_time , -- 合服时间
@@ -1816,6 +1821,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		MAX(super_game_name) as super_game_name , -- 超父游戏名
                 		server_id, -- 区服ID
                 		MAX(server_name) as server_name, -- 区服名
+                		MAX(dt) as dt, -- 开服日期
                 		boss_server_id, -- 合服ID
                 		MAX(boss_server_name) as boss_server_name, -- 合服名
                 		MAX(merge_time) as merge_time , -- 合服时间
@@ -1850,6 +1856,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			MAX(super_game_name) as super_game_name , -- 超父游戏名
                 			server_id, -- 区服ID
                 			MAX(server_name) as server_name, -- 区服名
+                			MAX(`date`) as dt, -- 开服日期
                 			boss_server_id, -- 合服ID
                 			MAX(boss_server_name) as boss_server_name, -- 合服名
                 			MAX(merge_time) as merge_time , -- 合服时间
@@ -1889,17 +1896,18 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     COUNT(1)
                 FROM(
                     SELECT
-                        -- 查询每个超父游戏-原始区服维度的信息
-                        source_system,
-                        super_game_id , -- 超父游戏ID
-                        MAX(super_game_name) as super_game_name , -- 超父游戏名
-                        server_id, -- 区服ID
-                        MAX(server_name) as server_name, -- 区服名
-                        boss_server_id, -- 合服ID
-                        MAX(boss_server_name) as boss_server_name, -- 合服名
-                        MAX(merge_time) as merge_time , -- 合服时间
-                        MAX(sum_server_count) as sum_server_count, -- 合服次数
-                        SUM(server_combat_num) as server_combat_num, -- 区服战力
+                    	-- 查询每个超父游戏-原始区服维度的信息
+                    	source_system,
+                    	super_game_id , -- 超父游戏ID
+                    	MAX(super_game_name) as super_game_name , -- 超父游戏名
+                    	server_id, -- 区服ID
+                    	MAX(server_name) as server_name, -- 区服名
+                    	MAX(dt) as dt, -- 开服日期
+                    	boss_server_id, -- 合服ID
+                    	MAX(boss_server_name) as boss_server_name, -- 合服名
+                    	MAX(merge_time) as merge_time , -- 合服时间
+                    	MAX(sum_server_count) as sum_server_count, -- 合服次数
+                    	SUM(server_combat_num) as server_combat_num, -- 区服战力
                         SUM(new_user_count) as new_user_count, -- 新用户人数
                         SUM(create_role_count) as create_role_count, -- 创角人数
                         SUM(role_count) as role_count, -- 角色数量
@@ -1920,74 +1928,76 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         SUM(ba3_count) as ba3_count, -- 前天付费次数
                         SUM(ba3_active_num) as ba3_active_num -- 前天活跃人数
                     FROM (
-                        SELECT
-                            -- 子查询，查询每个父游戏-原始区服维度的信息
-                            source_system,
-                            parent_game_id, -- 父游戏ID
-                            MAX(parent_game_name) as parent_game_name, -- 父游戏名
-                            super_game_id , -- 超父游戏ID
-                            MAX(super_game_name) as super_game_name , -- 超父游戏名
-                            server_id, -- 区服ID
-                            MAX(server_name) as server_name, -- 区服名
-                            boss_server_id, -- 合服ID
-                            MAX(boss_server_name) as boss_server_name, -- 合服名
-                            MAX(merge_time) as merge_time , -- 合服时间
-                            MAX(sum_server_count) as sum_server_count, -- 合服次数
-                            SUM(server_combat_num) as server_combat_num, -- 区服战力
-                            SUM(new_user_count) as new_user_count, -- 新用户人数
-                            SUM(create_role_count) as create_role_count, -- 创角人数
-                            SUM(role_count) as role_count, -- 角色数量
-                            SUM(total_num) as total_num, -- 总付费人数
-                            SUM(total_amount) as total_amount, -- 总付费金额
-                            SUM(ba1) as ba1, -- 今日付费金额
-                            SUM(ba1_num) as ba1_num, -- 今日付费人数
-                            SUM(ba1_count) as ba1_count, -- 今日付费次数
-                            SUM(ba1_active_num) as ba1_active_num, -- 今日活跃人数
-                            SUM(ba2) as ba2, -- 昨日付费金额
-                            SUM(ba2_num) as ba2_num, -- 昨日付费人数
-                            SUM(ba2_count) as ba2_count, -- 昨日付费次数
-                            SUM(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
-                            SUM(ba3) as ba3, -- 前天付费金额
-                            SUM(ba3_num) as ba3_num, -- 前天付费人数
-                            SUM(ba3_count) as ba3_count, -- 前天付费次数
-                            SUM(ba3_active_num) as ba3_active_num -- 前天活跃人数
-                        FROM (
-                            -- 子查询，查询每个子游戏-原始区服维度的信息
-                            SELECT
-                                source_system,
-                                game_id, -- 子游戏ID
-                                MAX(game_name) as game_name, -- 子游戏名
-                                parent_game_id, -- 父游戏ID
-                                MAX(parent_game_name) as parent_game_name, -- 父游戏名
-                                super_game_id , -- 超父游戏ID
-                                MAX(super_game_name) as super_game_name , -- 超父游戏名
-                                server_id, -- 区服ID
-                                MAX(server_name) as server_name, -- 区服名
-                                boss_server_id, -- 合服ID
-                                MAX(boss_server_name) as boss_server_name, -- 合服名
-                                MAX(merge_time) as merge_time , -- 合服时间
-                                MAX(sum_server_count) as sum_server_count, -- 合服次数
-                                MAX(server_combat_num) as server_combat_num, -- 区服战力
-                                MAX(new_user_count) as new_user_count, -- 新用户人数
-                                MAX(create_role_count) as create_role_count, -- 创角人数
-                                MAX(role_count) as role_count, -- 角色数量
-                                MAX(total_num) as total_num, -- 总付费人数
-                                MAX(total_amount) as total_amount, -- 总付费金额
-                                MAX(ba1) as ba1, -- 今日付费金额
-                                MAX(ba1_num) as ba1_num, -- 今日付费人数
-                                MAX(ba1_count) as ba1_count, -- 今日付费次数
-                                MAX(ba1_active_num) as ba1_active_num, -- 今日活跃人数
-                                MAX(ba2) as ba2, -- 昨日付费金额
-                                MAX(ba2_num) as ba2_num, -- 昨日付费人数
-                                MAX(ba2_count) as ba2_count, -- 昨日付费次数
-                                MAX(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
-                                MAX(ba3) as ba3, -- 前天付费金额
-                                MAX(ba3_num) as ba3_num, -- 前天付费人数
-                                MAX(ba3_count) as ba3_count, -- 前天付费次数
-                                MAX(ba3_active_num) as ba3_active_num -- 前天活跃人数
-                            FROM game_ads.ads_role_combat_num_ranking
-                            GROUP BY game_id ,parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
-                        ) a GROUP BY parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
+                    	SELECT
+                    		-- 子查询，查询每个父游戏-原始区服维度的信息
+                    		source_system,
+                    		parent_game_id, -- 父游戏ID
+                    		MAX(parent_game_name) as parent_game_name, -- 父游戏名
+                    		super_game_id , -- 超父游戏ID
+                    		MAX(super_game_name) as super_game_name , -- 超父游戏名
+                    		server_id, -- 区服ID
+                    		MAX(server_name) as server_name, -- 区服名
+                    		MAX(dt) as dt, -- 开服日期
+                    		boss_server_id, -- 合服ID
+                    		MAX(boss_server_name) as boss_server_name, -- 合服名
+                    		MAX(merge_time) as merge_time , -- 合服时间
+                    		MAX(sum_server_count) as sum_server_count, -- 合服次数
+                    		SUM(server_combat_num) as server_combat_num, -- 区服战力
+                    	    SUM(new_user_count) as new_user_count, -- 新用户人数
+                    	    SUM(create_role_count) as create_role_count, -- 创角人数
+                    	    SUM(role_count) as role_count, -- 角色数量
+                    	    SUM(total_num) as total_num, -- 总付费人数
+                    	    SUM(total_amount) as total_amount, -- 总付费金额
+                    	    SUM(ba1) as ba1, -- 今日付费金额
+                    	    SUM(ba1_num) as ba1_num, -- 今日付费人数
+                    	    SUM(ba1_count) as ba1_count, -- 今日付费次数
+                    	    SUM(ba1_active_num) as ba1_active_num, -- 今日活跃人数
+                    	    SUM(ba2) as ba2, -- 昨日付费金额
+                    	    SUM(ba2_num) as ba2_num, -- 昨日付费人数
+                    	    SUM(ba2_count) as ba2_count, -- 昨日付费次数
+                    	    SUM(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
+                    	    SUM(ba3) as ba3, -- 前天付费金额
+                    	    SUM(ba3_num) as ba3_num, -- 前天付费人数
+                    	    SUM(ba3_count) as ba3_count, -- 前天付费次数
+                    	    SUM(ba3_active_num) as ba3_active_num -- 前天活跃人数
+                    	FROM (
+                    		-- 子查询，查询每个子游戏-原始区服维度的信息
+                    		SELECT
+                    			source_system,
+                    			game_id, -- 子游戏ID
+                    			MAX(game_name) as game_name, -- 子游戏名
+                    			parent_game_id, -- 父游戏ID
+                    			MAX(parent_game_name) as parent_game_name, -- 父游戏名
+                    			super_game_id , -- 超父游戏ID
+                    			MAX(super_game_name) as super_game_name , -- 超父游戏名
+                    			server_id, -- 区服ID
+                    			MAX(server_name) as server_name, -- 区服名
+                    			MAX(`date`) as dt, -- 开服日期
+                    			boss_server_id, -- 合服ID
+                    			MAX(boss_server_name) as boss_server_name, -- 合服名
+                    			MAX(merge_time) as merge_time , -- 合服时间
+                    			MAX(sum_server_count) as sum_server_count, -- 合服次数
+                    			MAX(server_combat_num) as server_combat_num, -- 区服战力
+                    			MAX(new_user_count) as new_user_count, -- 新用户人数
+                    			MAX(create_role_count) as create_role_count, -- 创角人数
+                    			MAX(role_count) as role_count, -- 角色数量
+                    			MAX(total_num) as total_num, -- 总付费人数
+                    			MAX(total_amount) as total_amount, -- 总付费金额
+                    			MAX(ba1) as ba1, -- 今日付费金额
+                    			MAX(ba1_num) as ba1_num, -- 今日付费人数
+                    			MAX(ba1_count) as ba1_count, -- 今日付费次数
+                    			MAX(ba1_active_num) as ba1_active_num, -- 今日活跃人数
+                    			MAX(ba2) as ba2, -- 昨日付费金额
+                    			MAX(ba2_num) as ba2_num, -- 昨日付费人数
+                    			MAX(ba2_count) as ba2_count, -- 昨日付费次数
+                    			MAX(ba2_active_num) as ba2_active_num, -- 昨日活跃人数
+                    			MAX(ba3) as ba3, -- 前天付费金额
+                    			MAX(ba3_num) as ba3_num, -- 前天付费人数
+                    			MAX(ba3_count) as ba3_count, -- 前天付费次数
+                    			MAX(ba3_active_num) as ba3_active_num -- 前天活跃人数
+                    		FROM game_ads.ads_role_combat_num_ranking
+                    		GROUP BY game_id ,parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
+                    	) a GROUP BY parent_game_id ,super_game_id ,server_id ,boss_server_id ,source_system
                     ) a
                 """ + cri+
                 """
@@ -2351,6 +2361,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	SELECT
                 		source_system ,
                 		server_id ,
+                		boss_server_id,
                 		parent_game_id ,
                 		super_game_id ,
                 		merge_time,
@@ -2359,11 +2370,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		role_level ,
                 		role_vip ,
                 		combat_num ,
-                		ROW_NUMBER()over(partition by source_system ,server_id ,parent_game_id, super_game_id order by combat_num desc) as rank_num
+                		ROW_NUMBER()over(partition by source_system ,server_id ,boss_server_id, parent_game_id, super_game_id order by combat_num desc) as rank_num
                 	FROM (
                 		SELECT
                 			source_system ,
                 			server_id ,
+                			boss_server_id,
                 			parent_game_id ,
                 			super_game_id ,
                 			MAX(merge_time) as merge_time ,
@@ -2373,7 +2385,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			MAX(role_vip) as role_vip ,
                 			MAX(combat_num) as combat_num
                 		FROM game_ads.ads_role_combat_num_ranking
-                		GROUP BY role_id , source_system ,parent_game_id ,super_game_id, server_id
+                		GROUP BY role_id , source_system ,parent_game_id ,super_game_id, server_id, boss_server_id
                 	) a
                 ) a
                 """;