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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -18,7 +18,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("腾讯广告新增监测链接注册回传(排除已经在游戏里面注册的人) (´･･)ﾉ(._.`)  \n" +
+        System.out.println("腾讯广告新增监测链接注册回传(去除监测链接回传注册) (´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameCallbackServiceImpl.java

@@ -84,12 +84,6 @@ public class GameTencentMiniGameCallbackServiceImpl extends ServiceImpl<GameTenc
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-        //监测链接执行注册回传
-        try {
-            this.linkCallBack(callback, agent);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
         return true;
     }
 

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

@@ -147,13 +147,6 @@ public class GameTencentMiniGameUserServiceImpl extends ServiceImpl<GameTencentM
             //返回注册已回传
             return Tuple2.with(BackStatusEnum.NO, null);
         }
-        //判断回传是否正在执行中
-        String lockKey = com.zanxiang.game.back.base.ServerInfo.SERVER_NAME + ":tencentMiniLinkCallBack:"
-                + userLog.getGameId() + ":" + userLog.getAdAccountId() + ":"
-                + userLog.getWechatAppId() + ":" + userLog.getWechatOpenid();
-        if (!distributedLockComponent.doLock(lockKey, 0L, 1L, TimeUnit.SECONDS)) {
-            return Tuple2.with(BackStatusEnum.NO, null);
-        }
         //回传策略
         GameBackPolicy gameBackPolicy = userLog.getBackPolicyId() == null ? null
                 : gameBackPolicyService.getById(userLog.getBackPolicyId());

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

@@ -67,7 +67,7 @@ public class RoleManageController {
         return ResultVO.ok(roleManageService.ipInfoListOfPage(dto));
     }
 
-    @ApiOperation(value = "角色ip登录详情列表")
+    @ApiOperation(value = "角色ip登录数量列表")
     @PreAuthorize(permissionKey = "roleManage:ipInfo:list")
     @PostMapping("/roleIpDetail/list")
     public ResultVO<List<Map>> roleIpDetailListOfPage(@RequestBody RoleIpInfoParamDTO dto) {
@@ -75,17 +75,10 @@ public class RoleManageController {
     }
 
     @ApiOperation(value = "查询角色详情列表")
-    @PreAuthorize(permissionKey = "roleManage:ipRoleDetail:listOfPage")
-    @PostMapping("/roleDetail/listOfPage")
-    public ResultVO<Page<Map>> roleDetailListOfPage(@RequestBody RoleIpInfoParamDTO dto) {
-        return ResultVO.ok(roleManageService.roleDetailListOfPage(dto));
-    }
-
-//    @ApiOperation(value = "查询玩家详情列表")
-    @PreAuthorize(permissionKey = "roleManage:userDetail:listOfPage")
-    @PostMapping("/userDetail/listOfPage")
-    public ResultVO<Page<Map>> userDetailListOfPage(@RequestBody RoleIpInfoParamDTO dto) {
-        return ResultVO.ok(roleManageService.userDetailListOfPage(dto));
+    @PreAuthorize(permissionKey = "roleManage:ipRoleDetail:list")
+    @PostMapping("/roleDetailList")
+    public ResultVO<List<Map>> roleDetailList(@RequestBody RoleIpInfoParamDTO dto) {
+        return ResultVO.ok(roleManageService.roleDetailList(dto));
     }
 
     @ApiOperation(value = "查询玩家详情列表")

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

@@ -19,8 +19,8 @@ public class RoleIpInfoParamDTO extends BasePage {
    @ApiModelProperty(value = "玩家id")
    private Long userId;
 
-   @ApiModelProperty(value = "排除玩家id")
-   private Long excludeUserId;
+   @ApiModelProperty(value = "排除玩家 （0 不排除  1排除）")
+   private Integer excludeUserType = 0;
 
    @ApiModelProperty(value = "玩家名称")
    private String userName;

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

@@ -92,26 +92,11 @@ public interface IRoleManageService {
 
     List<Map> ipCountList(List<String> ip);
 
-
-    /**
-     * 根据ip查询角色详情列表
-     * @param dto
-     * @return
-     */
-    Page<Map> roleDetailListOfPage(RoleIpInfoParamDTO dto);
-
     /**
      * 查询玩家详情列表
      * @param dto
      * @return
      */
-    Page<Map> userDetailListOfPage(RoleIpInfoParamDTO dto);
-
-    /**
-     * 查询玩家详情列表2
-     * @param dto
-     * @return
-     */
     List<Map> userDetailList(RoleIpInfoParamDTO dto);
 
 
@@ -119,5 +104,12 @@ public interface IRoleManageService {
     List<Map> userDetailList(List<Long> userIds,RoleIpInfoParamDTO dto);
 
 
+    /**
+     * 查询角色详情列表2
+     * @param dto
+     * @return
+     */
+    List<Map> roleDetailList(RoleIpInfoParamDTO dto);
 
+    List<Map> roleDetailList(List<Long> roleId,RoleIpInfoParamDTO roleIpInfoParamDTO);
 }

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

@@ -1076,12 +1076,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         List<Map> maps = baseService.ipDetailList(dto);
         if (CollectionUtils.isEmpty(maps)) {
-            return null;
+            return new ArrayList<>();
         }
         Map map = maps.get(0);
         String ipCountIp = String.valueOf(map.get("ip_count_ip"));
         if (StringUtils.isEmpty(ipCountIp)) {
-            return null;
+            return new ArrayList<>();
         }
         return baseService.ipCountList(Arrays.stream(ipCountIp.split(",")).map(String::trim).collect(Collectors.toList()));
     }
@@ -1115,76 +1115,71 @@ public class RoleManageServiceImpl implements IRoleManageService {
                  group by ip
                 """;
     }
-
     @Override
-    public Page<Map> roleDetailListOfPage(RoleIpInfoParamDTO dto) {
-        Criteria criteria = getRoleDetailSqlByQuery(dto);
-        //分页对象
-        Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
-        //查询总记录数
-        Sql countSql = Sqls.create(getRoleDetailCountSql(criteria));
-        countSql.setCallback(Sqls.callback.integer());
-        dao.execute(countSql);
-        pager.setRecordCount(countSql.getInt());
-        String roleIpDetailListSql = getRoleDetailList(criteria);
-        Sql sql = Sqls.create(roleIpDetailListSql);
-        sql.setCallback(Sqls.callback.maps());
-        sql.setPager(pager);
-        dao.execute(sql);
-        //查询结果
-        List<Map> list = sql.getList(Map.class);
-        return new Page<>(list, pager);
+    public List<Map> userDetailList(RoleIpInfoParamDTO dto) {
+        if (dto.getRoleId() == null) {
+            throw new BaseException("角色id不能为空");
+        }
+        List<Map> maps = baseService.ipDetailList(dto);
+        if (CollectionUtils.isEmpty(maps)) {
+            return new ArrayList<>();
+        }
+        Map map = maps.get(0);
+        String userCountGroup = String.valueOf(map.get("user_count_group"));
+        if (StringUtils.isEmpty(userCountGroup)) {
+            return new ArrayList<>();
+        }
+        return baseService.userDetailList(Arrays.stream(userCountGroup.split(",")).map(String::trim).map(Long::valueOf).collect(Collectors.toList()), dto);
     }
 
     @Override
-    public Page<Map> userDetailListOfPage(RoleIpInfoParamDTO dto) {
-        Criteria criteria = getUserDetailSqlByQuery(dto);
-        //分页对象
-        Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
-        //查询总记录数
-        Sql countSql = Sqls.create(getUserDetailCountSql(criteria));
-        countSql.setCallback(Sqls.callback.integer());
-        dao.execute(countSql);
-        pager.setRecordCount(countSql.getInt());
+    public List<Map> userDetailList(List<Long> userIds, RoleIpInfoParamDTO dto) {
+        Criteria criteria = Cnd.cri();
+        criteria.where().andInList("user_id", userIds);
         Criteria orderCriteria = getUserDetailOrderSql(dto);
         String userDetailListSql = getUserDetailListSql(criteria, orderCriteria);
         Sql sql = Sqls.create(userDetailListSql);
         sql.setCallback(Sqls.callback.maps());
-        sql.setPager(pager);
         dao.execute(sql);
         //查询结果
-        List<Map> list = sql.getList(Map.class);
-        return new Page<>(list, pager);
+        return sql.getList(Map.class);
     }
 
     @Override
-    public List<Map> userDetailList(RoleIpInfoParamDTO dto) {
+    public List<Map> roleDetailList(RoleIpInfoParamDTO dto) {
         if (dto.getRoleId() == null) {
             throw new BaseException("角色id不能为空");
         }
         List<Map> maps = baseService.ipDetailList(dto);
         if (CollectionUtils.isEmpty(maps)) {
-            return null;
+            return new ArrayList<>();
         }
         Map map = maps.get(0);
-        String userCountGroup = String.valueOf(map.get("user_count_group"));
-        if (StringUtils.isEmpty(userCountGroup)) {
-            return null;
+        String filedRoleId = "role_count_group";
+        if(dto.getExcludeUserType()==1){
+            filedRoleId = "role_count_group_filters";
         }
-        return baseService.userDetailList(Arrays.stream(userCountGroup.split(",")).map(String::trim).map(Long::valueOf).collect(Collectors.toList()), dto);
+        String roleIdStr = String.valueOf(map.get(filedRoleId));
+        if (StringUtils.isEmpty(roleIdStr)|| roleIdStr.equals("[]")) {
+            return new ArrayList<>();
+        }
+        if(dto.getExcludeUserType()==1){
+            roleIdStr = roleIdStr.replaceAll("[\\[\\]\"]", "");
+        }
+        return baseService.roleDetailList(Arrays.stream(roleIdStr.split(",")).map(String::trim).map(Long::valueOf).collect(Collectors.toList()),dto);
     }
 
     @Override
-    public List<Map> userDetailList(List<Long> userIds, RoleIpInfoParamDTO dto) {
+    public List<Map> roleDetailList(List<Long> roleId,RoleIpInfoParamDTO roleIpInfoParamDTO) {
         Criteria criteria = Cnd.cri();
-        criteria.where().andInList("user_id", userIds);
-        Criteria orderCriteria = getUserDetailOrderSql(dto);
-        String userDetailListSql = getUserDetailListSql(criteria, orderCriteria);
-        Sql sql = Sqls.create(userDetailListSql);
+        criteria.where().andInList("role_id",roleId);
+        String roleDetailListSql = getRoleDetailList(criteria);
+        Sql sql = Sqls.create(roleDetailListSql);
         sql.setCallback(Sqls.callback.maps());
         dao.execute(sql);
         //查询结果
-        return sql.getList(Map.class);
+        List<Map> list = sql.getList(Map.class);
+        return list;
     }
 
     private Criteria getUserDetailOrderSql(RoleIpInfoParamDTO dto) {
@@ -1252,76 +1247,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                  group by b.id) a
                 """ + orderCriteria;
     }
-
-    private String getUserDetailCountSql(Criteria criteria) {
-        return """
-                  select count(1) from (select a.user_id  userId,
-                                       any_value(a.user_name) userName,
-                                       any_value(b.agent_id) agentId ,
-                                       any_value(IF(b.agent_id = 0, '自然量', pa.agent_name)) agentGame,
-                                       any_value(b.create_time) createTime,
-                                       any_value(b.game_id) gameId,
-                                       any_value(d.game_name) gameName,
-                                       any_value(b.ip) ip,
-                                       any_value(IFNULL(c.total_amount,0)) totalAmount,
-                                       any_value((select count(1) from dm_game_order.t_game_user_role where user_id = b.id)) as userRoleCount,
-                                       MAX(ab.game_id) as lastLoginGameId,
-                                       MAX(ab.game_name) as lastLoginGame,
-                                       MAX(ab.last_login_time) as lastLoginTime,
-                                       any_value(ab.last_order_time) as lastOrderTime
-                                from game_ads.role_ip_monitor a
-                                         left join dm_game_order.t_game_user b on a.user_id = b.id and source_system = 'ZX_ONE'
-                                    left join dm_game_order.t_pitcher_agent pa on pa.id = b.agent_id and pa.source_system = 'ZX_ONE'
-                                         left join game_ads.ads_player_recharge_ranking c on b.id = c.pitcher_id and c.source_system = 'ZX_ONE'
-                                    left join (
-                                          SELECT
-                                              a.user_id,
-                    a.game_id,
-                    b.game_name,
-                    a.create_time AS last_login_time,
-                    latest_order.last_order_time
-                FROM
-                    dm_game_order.t_user_login_log a
-                LEFT JOIN
-                    dm_game_order.t_game b
-                    ON a.game_id = b.id
-                    AND b.source_system = 'ZX_ONE'
-                LEFT JOIN
-                    (SELECT
-                         user_id,
-                         MAX(create_time) AS last_order_time
-                     FROM
-                         dm_game_order.t_game_order
-                     WHERE
-                         source_system = 'ZX_ONE'
-                     GROUP BY
-                         user_id) latest_order
-                    ON a.user_id = latest_order.user_id
-                ORDER BY
-                    a.create_time DESC
-                                ) ab on ab.user_id = b.id
-                                left join dm_game_order.t_game d on b.game_id = d.id and d.source_system = 'ZX_ONE'
-                                """ + criteria + """
-                                group by a.user_id) a
-                """;
-    }
-
-    private Criteria getUserDetailSqlByQuery(RoleIpInfoParamDTO dto) {
-        Criteria criteria = Cnd.cri();
-        if (dto.getRegIp() != null) {
-            criteria.where().andEquals("a.ip", dto.getRegIp());
-        }
-        return criteria;
-    }
-
-    private String getRoleDetailCountSql(Criteria criteria) {
-        return """
-                select count(1) from ( 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
-                """ + criteria + """
-                   group by role_id,game_id,ip,server_id,user_id)a
-                """;
-    }
-
     private String getRoleDetailList(Criteria criteria) {
         return """
                 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
@@ -1329,19 +1254,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     group by role_id,game_id,ip,server_id,user_id
                 """;
     }
-
-    private Criteria getRoleDetailSqlByQuery(RoleIpInfoParamDTO dto) {
-        Criteria criteria = Cnd.cri();
-        if (StringUtils.isNotEmpty(dto.getRegIp())) {
-            criteria.where().andEquals("ip", dto.getRegIp());
-        }
-        if (dto.getExcludeUserId() != null) {
-            criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
-        }
-        return criteria;
-    }
-
-
     /**
      * ipRoleCount 同ip的角色数量
      */