From 026bded12d7e63af6da152fff5457ac841a7613f Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Mon, 24 Feb 2025 12:08:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E6=95=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/wfc/user/service/impl/UAccountServiceImpl.java | 2 +- .../java/org/wfc/user/service/impl/UCdrServiceImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 6aaecdb..b56302f 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 @@ -305,7 +305,7 @@ public class UAccountServiceImpl extends ServiceImpl i if (account.getClientNumEnable()) { int onlineClientNum = uClientService.getCurrentClients(client.getUserId()).size(); - if (onlineClientNum > account.getClientNum()) { + if (onlineClientNum >= account.getClientNum()) { return; } } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java index f093179..7de7b21 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java @@ -82,6 +82,9 @@ public class UCdrServiceImpl extends ServiceImpl implements IU @Autowired private IWifiApi wifiApi; + @Autowired + private IUClientService uClientService; + @Override public UCdrUserVo getByUser() { @@ -153,6 +156,12 @@ public class UCdrServiceImpl extends ServiceImpl implements IU for (UAccount account : accounts) { if (Objects.equals(unAuthClient.getUserId(), account.getUserId())) { if (AccountUtil.isValid(account, new Date())) { + if (account.getClientNumEnable()) { + int onlineClientNum = uClientService.getCurrentClients(account.getUserId()).size(); + if (onlineClientNum >= account.getClientNum()) { + continue; + } + } wifiApi.authClient(unAuthClient.getSiteId(), unAuthClient.getClientMac()); } }