|
@@ -1070,7 +1070,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
}
|
|
}
|
|
Criteria criteria = Cnd.cri();
|
|
Criteria criteria = Cnd.cri();
|
|
criteria.where().andEquals("role_id", dto.getRoleId());
|
|
criteria.where().andEquals("role_id", dto.getRoleId());
|
|
- if(dto.getExcludeUserId()!=null){
|
|
|
|
|
|
+ if (dto.getExcludeUserId() != null) {
|
|
criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
|
|
criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1111,6 +1111,155 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
return new Page<>(list, pager);
|
|
return new Page<>(list, pager);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @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());
|
|
|
|
+ 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);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private Criteria getUserDetailOrderSql(RoleIpInfoParamDTO dto) {
|
|
|
|
+ Criteria criteria = Cnd.cri();
|
|
|
|
+ //主表添加排序条件
|
|
|
|
+ if (StringUtils.isBlank(dto.getSortType())) {
|
|
|
|
+ dto.setSortType(OrderByEnum.DESC.getOrderType());
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isBlank(dto.getSortFiled())) {
|
|
|
|
+ criteria.getOrderBy().orderBy("createTime", dto.getSortType());
|
|
|
|
+ } else {
|
|
|
|
+ criteria.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
|
|
|
|
+ }
|
|
|
|
+ return criteria;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private String getUserDetailListSql(Criteria criteria, Criteria orderCriteria) {
|
|
|
|
+ return """
|
|
|
|
+ select * 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
|
|
|
|
+ """ + 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) {
|
|
private String getRoleDetailCountSql(Criteria criteria) {
|
|
return """
|
|
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
|
|
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
|
|
@@ -1132,7 +1281,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
if (StringUtils.isNotEmpty(dto.getRegIp())) {
|
|
if (StringUtils.isNotEmpty(dto.getRegIp())) {
|
|
criteria.where().andEquals("ip", dto.getRegIp());
|
|
criteria.where().andEquals("ip", dto.getRegIp());
|
|
}
|
|
}
|
|
- if (dto.getExcludeUserId() !=null) {
|
|
|
|
|
|
+ if (dto.getExcludeUserId() != null) {
|
|
criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
|
|
criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
|
|
}
|
|
}
|
|
return criteria;
|
|
return criteria;
|