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

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

@@ -75,7 +75,7 @@ public class RoleManageController {
     }
 
     @ApiOperation(value = "查询角色详情列表")
-//    @PreAuthorize(permissionKey = "roleManage:ipRoleDetail:listOfPage")
+    @PreAuthorize(permissionKey = "roleManage:ipRoleDetail:listOfPage")
     @PostMapping("/roleDetail/listOfPage")
     public ResultVO<Page<Map>> roleDetailListOfPage(@RequestBody RoleIpInfoParamDTO dto) {
         return ResultVO.ok(roleManageService.roleDetailListOfPage(dto));

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

@@ -15,9 +15,13 @@ import java.util.List;
 @Data
 public class RoleIpInfoParamDTO extends BasePage {
 
+
    @ApiModelProperty(value = "玩家id")
    private Long userId;
 
+   @ApiModelProperty(value = "排除玩家id")
+   private Long excludeUserId;
+
    @ApiModelProperty(value = "玩家名称")
    private String userName;
 

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

@@ -1118,7 +1118,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
 
     private String getRoleDetailList(Criteria criteria) {
         return """
-                select role_id  roleId ,any_value(role_name) roleNmae,game_id  gameId,any_value(game_name) gameName,ip,server_id serverId,any_value(server_name) serverName,user_id userId,any_value(user_name) userName from game_ads.role_ip_monitor
+                select role_id  roleId ,any_value(role_name) roleName,game_id  gameId,any_value(game_name) gameName,ip,server_id serverId,any_value(server_name) serverName,user_id userId,any_value(user_name) userName from game_ads.role_ip_monitor
                 """ + criteria + """
                     group by role_id,game_id,ip,server_id,user_id
                 """;
@@ -1129,6 +1129,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isNotEmpty(dto.getRegIp())) {
             criteria.where().andEquals("ip", dto.getRegIp());
         }
+        if (dto.getExcludeUserId() !=null) {
+            criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
+        }
         return criteria;
     }