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

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

@@ -48,7 +48,7 @@ public class RoleCombatRankingDTO extends BasePage {
     /**
      * 排名的范围
      */
-    @ApiModelProperty(value = "排名的范围")
+    @ApiModelProperty(value = "排名的范围(每个区服显示多少排名)")
     private Long rankingNum;
 
     /**

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

@@ -19,6 +19,7 @@ import org.nutz.dao.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -151,6 +152,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //排名的个数
             cri.where().andEquals("rank_num", dto.getRankingNum());
         }
+        Sql serverDataSql = Sqls.create(getRoleCombatRankServerDataSql());
+        serverDataSql.setCallback(Sqls.callback.maps());
+        dao.execute(serverDataSql);
+        //执行结果
+        serverDataSql.getList(HashMap.class);
 
 
         return null;
@@ -162,6 +168,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @return String
      */
     private Map<String, Object> getNameById(Map<String, Object> dataMap){
+
         //投手名
         if (dataMap.get("put_user_id") != null) {
             dataMap.put("put_user_name",
@@ -170,17 +177,17 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //运营人员名
         if (dataMap.get("oper_user_id") != null) {
             dataMap.put("oper_user_name",
-                    sysUserRpc.getById(Long.valueOf((String) dataMap.get("oper_user_id"))).getData().getNickname());
+                    sysUserRpc.getById((Long) dataMap.get("oper_user_id")).getData().getNickname());
         }
         //GS人员名
         if (dataMap.get("gs_id") != null) {
             dataMap.put("gs_name",
-                    sysUserRpc.getById(Long.valueOf((String) dataMap.get("gs_id"))).getData().getNickname());
+                    sysUserRpc.getById((Long) dataMap.get("gs_id")).getData().getNickname());
         }
         //客服人员名
         if (dataMap.get("customer_service_id") != null) {
             dataMap.put("customer_service_name",
-                    sysUserRpc.getById(Long.valueOf((String) dataMap.get("customer_service_id"))).getData().getNickname());
+                    sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
         }
 
         return dataMap;
@@ -890,7 +897,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 """ + criA;
     }
 
-    private String getRoleCombatRankingSql() {
+    private String getRoleCombatRankServerDataSql() {
         return """
                 SUM(server_combat_num) as server_combat_num, -- 区服战力
                 SUM(new_user_count) as new_user_count, -- 新用户人数
@@ -913,5 +920,31 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 """;
     }
 
+    private String getRoleCombatRankRoleDataSql() {
+        return """
+                SUM(parent_game_name) as parent_game_name,
+                SUM(server_name) as server_name, -- 区服名
+                SUM(boss_server_id) as boss_server_id, -- 合服ID
+                SUM(boss_server_name) as boss_server_name, -- 合服名
+                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 -- 前天活跃人数
+                """;
+    }
 
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java

@@ -190,17 +190,17 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
                         .startTime(item.getStartTime())
                         .endTime(item.getEndTime())
                         .gsId(item.getGsId())
-                        .gsName(getNickname(item.getGsId()))
+                        .gsName(null == item.getGsId() ? null : getNickname(item.getGsId()))
                         .operUserId(item.getOperUserId())
-                        .operUserName(getNickname(item.getOperUserId()))
+                        .operUserName(null == item.getOperUserId() ? null : getNickname(item.getOperUserId()))
                         .customerServiceId(item.getCustomerServiceId())
-                        .customerServiceName(getNickname(item.getCustomerServiceId()))
+                        .customerServiceName(null == item.getCustomerServiceId() ? null : getNickname(item.getCustomerServiceId()))
                         .remark(item.getRemark())
                         .createBy(item.getCreateBy())
-                        .createName(getNickname(item.getCreateBy()))
+                        .createName(null == item.getCreateBy() ? null : getNickname(item.getCreateBy()))
                         .createTime(item.getCreateTime())
                         .updateBy(item.getUpdateBy())
-                        .updateName(getNickname(item.getUpdateBy()))
+                        .updateName(null == item.getUpdateBy() ? null : getNickname(item.getUpdateBy()))
                         .updateTime(item.getUpdateTime())
                         .build());
     }