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

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

@@ -61,7 +61,7 @@ public class RoleRechargeRankingDTO extends BasePage {
      * 是否合服
      */
     @ApiModelProperty(value = "是否合服：true -> 合服 ； false -> 不合服")
-    private Boolean isMergeServer;
+    private Boolean isMergeServer = false;
 
     /**
      * 角色名

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

@@ -67,13 +67,18 @@ public class RoleManageServiceImpl implements IRoleManageService {
         Criteria criA = getSqlByQuery(dto);
         //给充值时间查询条件
         Criteria criTodayAmount = getDateSqlByQuery(dto);
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
         //分页对象
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
 
         StopWatch watch = new StopWatch();
         watch.start();
         //查询总记录数
-        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount));
+        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount,margeSql));
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         watch.stop();
@@ -91,7 +96,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //创建sql
         StopWatch watch2 = new StopWatch();
         watch2.start();
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         sql.setPager(pager);
         dao.execute(sql);
@@ -154,11 +159,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
         Criteria criTodayAmount = getDateSqlByQuery(dto);
         //分页对象
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
 
         StopWatch watch = new StopWatch();
         watch.start();
         //查询总记录数
-        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount));
+        Sql countSql = Sqls.create(getCountNumSql2(criA, criTodayAmount,margeSql));
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         watch.stop();
@@ -176,7 +186,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //创建sql
         StopWatch watch2 = new StopWatch();
         watch2.start();
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         sql.setPager(pager);
         dao.execute(sql);
@@ -705,8 +715,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
         } else {
             criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
         }
+        //判断是否合服 默认不合服
+        String margeSql = "is_merge = 0";
+        if(dto.getIsMergeServer()){
+            margeSql = "is_source_server = 0";
+        }
         //创建sql
-        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount));
+        Sql sql = Sqls.create(getRoleRechargeRankingSql(criA, criTodayAmount,margeSql));
         sql.setCallback(Sqls.callback.maps());
         dao.execute(sql);
         return sql.getList(Map.class);
@@ -1451,7 +1466,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @param criTodayAmount 当天充值金额相关的查询条件
      * @return String
      */
-    private String getRoleRechargeRankingSql(Criteria criA, Criteria criTodayAmount) {
+    private String getRoleRechargeRankingSql(Criteria criA, Criteria criTodayAmount,String margeSql) {
         return """
                 SELECT
                 	*
@@ -1674,7 +1689,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                     server_id,
                                     server_name
                                 FROM dm_game_order.t_game_server_merge
-                                WHERE is_source_server = 0  AND is_delete = 0
+                                WHERE   
+                                """ + margeSql + """ 
+                                AND is_delete = 0
                             ) r on a.source_system = r.source_system AND a.server_id = r.source_server_ids AND d.super_game_id = r.game_id
                             LEFT JOIN (
                                 -- 玩家信息
@@ -2280,7 +2297,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @param criTodayAmount 今日充值条件
      * @return String
      */
-    private String getCountNumSql2(Criteria criA, Criteria criTodayAmount) {
+    private String getCountNumSql2(Criteria criA, Criteria criTodayAmount,String margeSql) {
         return """
                 SELECT
                     COUNT(1)
@@ -2488,7 +2505,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                     server_id,
                                     server_name
                                 FROM dm_game_order.t_game_server_merge
-                                WHERE is_merge = 0 AND is_delete = 0
+                                WHERE  
+                                 """ + margeSql + """ 
+                                  AND is_delete = 0
                             ) r on a.source_system = r.source_system AND a.server_id = r.source_server_ids AND d.super_game_id = r.game_id
                             LEFT JOIN (
                                 SELECT

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (CP接口修改03´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (游戏聊天消息对接武哥接口´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/api/CpServerApiService.java

@@ -15,10 +15,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -39,6 +42,9 @@ public class CpServerApiService {
     @Autowired
     private IListenCallService listenCallService;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
     public boolean chatMsgSubmit(ChatSubmitParam param) {
         GameSupper gameSupper = gameSupperService.getById(param.getGameId());
         if (gameSupper == null) {
@@ -46,8 +52,25 @@ public class CpServerApiService {
         }
         this.signCheck(gameSupper.getCpServerKey(), param.getGameId(), param.getServerId(),
                 param.getSignTime(), param.getSign());
-        log.error("接收到推送的聊天消息, param : {}", JsonUtil.toString(param));
-        //调武哥接口发送过去
+        //查询区服信息
+        GameServer gameServer = gameServerService.getOne(new LambdaQueryWrapper<GameServer>()
+                .eq(GameServer::getGameId, param.getGameId())
+                .eq(GameServer::getServerId, param.getServerId())
+                .last("limit 1"));
+        //组装聊天参数
+        Map<String, Object> chatContentMap = param.getChatContentMap();
+        chatContentMap.put("game_name", gameSupper.getName());
+        if (gameServer != null) {
+            chatContentMap.put("server_name", gameServer.getServerName());
+        }
+        Map<String, Object> paramMap = new HashMap<>(1);
+        paramMap.put("data", chatContentMap);
+        //调武哥接口通知消息
+        try {
+            restTemplate.postForObject("http://47.99.157.216:9000/game/roleChat", paramMap, Object.class);
+        } catch (Exception e) {
+            log.error("调武哥接口通知消息异常, chatContentMap : {}, e : {}", JsonUtil.toString(paramMap), e.getMessage());
+        }
         return Boolean.TRUE;
     }