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

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服务启动成功 < (IP解析历史数据处理新增线程池调试01 ･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (IP解析历史数据处理新增线程池调试02 ･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -115,10 +115,11 @@ public class IpDataAssayServiceImpl implements IIpDataAssayService {
             Page<User> pageUser = userService.page(new Page<>(page, pageSize), new LambdaQueryWrapper<User>()
                     .select(User::getId, User::getIp, User::getIpData)
                     .in(User::getGameId, gameIdList)
-                    .isNull(User::getIpData)
                     .orderByDesc(User::getCreateTime));
             totalPage = pageUser.getPages();
-            userList = pageUser.getRecords();
+            userList = pageUser.getRecords().stream()
+                    .filter(user -> Strings.isBlank(user.getIpData()))
+                    .collect(Collectors.toList());
             log.error("用户执行页, page : {}, totalPage : {}, size : {}", page, totalPage, userList.size());
             this.pageUserHandle(userList);
         } while (++page <= totalPage);
@@ -179,10 +180,11 @@ public class IpDataAssayServiceImpl implements IIpDataAssayService {
                     new LambdaQueryWrapper<UserLoginLog>()
                             .select(UserLoginLog::getId, UserLoginLog::getIp, UserLoginLog::getIpData)
                             .ge(UserLoginLog::getCreateTime, LocalDateTime.now().minusMonths(2))
-                            .isNull(UserLoginLog::getIpData)
                             .orderByDesc(UserLoginLog::getCreateTime));
             totalPage = pageUserLoginLog.getPages();
-            userLoginLogList = pageUserLoginLog.getRecords();
+            userLoginLogList = pageUserLoginLog.getRecords().stream()
+                    .filter(userLoginLog -> Strings.isBlank(userLoginLog.getIpData()))
+                    .collect(Collectors.toList());
             log.error("登录日志执行页, page : {}, totalPage : {}, size : {}", page, totalPage, userLoginLogList.size());
             this.pageUserLoginLogHandle(userLoginLogList);
         } while (++page <= totalPage);