From 3e629b8318b51fe3fab676f11ce6376d73c35a13 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Mon, 24 Feb 2025 16:07:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/wfc/user/service/impl/UAccountServiceImpl.java | 5 ++++- .../java/org/wfc/user/service/impl/UClientServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java index e025a7b..e4dcbe1 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java @@ -269,13 +269,16 @@ public class UAccountServiceImpl extends ServiceImpl i .eq(UClient::getClientMac, client.getMac()), false); if (ObjectUtil.isNull(loginClient) || ObjectUtil.isNull(loginClient.getUserId())) { wifiApi.cancelAuthClient(site.getSiteId(), client.getMac()); + continue; } UAccount account = this.getOne(Wrappers.lambdaQuery().eq(UAccount::getUserId, loginClient.getUserId()), false); if (ObjectUtil.isNull(account)) { wifiApi.cancelAuthClient(site.getSiteId(), client.getMac()); + continue; } if (!AccountUtil.isValid(account, current)) { wifiApi.cancelAuthClient(site.getSiteId(), client.getMac()); + continue; } // 设备数超出限制的话，取消在线时间短的设备 if (account.getClientNumEnable()) { @@ -284,7 +287,7 @@ public class UAccountServiceImpl extends ServiceImpl i continue; } int limitNum = currentClients.size() - account.getClientNum(); - List cancelClients = currentClients.stream().sorted(Comparator.comparing(UClientCurrentVo::getUpTime).reversed()) + List cancelClients = currentClients.stream().sorted(Comparator.comparing(UClientCurrentVo::getUpTime)) .limit(limitNum).collect(Collectors.toList()); for (UClientCurrentVo cancelClient : cancelClients) { wifiApi.cancelAuthClient(cancelClient.getSiteId(), cancelClient.getClientMac()); diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java index ff7932d..cb3b7f9 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java @@ -61,7 +61,7 @@ public class UClientServiceImpl extends ServiceImpl impl } boolean flag = this.saveOrUpdate(uClient); // 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi，且根据套餐限制带宽 - if (StrUtil.isNotBlank(uClientBo.getClientName()) && StrUtil.isNotBlank(uClientBo.getSiteId())) { + if (StrUtil.isNotBlank(uClientBo.getClientMac()) && StrUtil.isNotBlank(uClientBo.getSiteId())) { accountService.authClientAndRateLimit(uClientBo); } return flag;