From 24811ccedc8ca47c4b2f7cdf1125be4600af3fae Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 26 Dec 2024 19:50:19 +0800
Subject: [PATCH] fix: login auth wifi

---
 .../org/wfc/user/service/impl/UAccountServiceImpl.java     | 7 ++++---
 .../java/org/wfc/user/service/impl/UClientServiceImpl.java | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
index 302da48..0dea48e 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
@@ -61,7 +61,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
         // 定时任务查询所有未过期或刚过期（失效时间+定时任务间隔时间）的账户套餐，套餐过期/流量用完/时长用完则取消授权
         Date current = new Date();
         DateTime endTime = DateUtil.offsetSecond(current, -30);
-        List<UAccount> accounts = this.list(Wrappers.<UAccount>lambdaQuery().gt(UAccount::getEndTime, endTime));
+        List<UAccount> accounts = this.list(Wrappers.<UAccount>lambdaQuery().gt(UAccount::getEndTime, endTime).isNotNull(UAccount::getUserId));
         // 更新账户已使用流量，已使用时长
         for (UAccount account : accounts) {
             if (ObjectUtil.isNull(account.getUserId())) {
@@ -83,7 +83,8 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                 .collect(Collectors.toList());
 
         if (CollUtil.isNotEmpty(userIds)) {
-            List<UClient> clients = clientMapper.selectList(Wrappers.<UClient>lambdaQuery().in(UClient::getUserId, userIds));
+            List<UClient> clients = clientMapper.selectList(Wrappers.<UClient>lambdaQuery().isNotNull(UClient::getSiteId)
+                    .in(UClient::getUserId, userIds));
             for (UClient client : clients) {
                 try {
                     omadaAuthorizedClientApi.cancelAuthClient(client.getSiteId(), client.getClientMac());
@@ -118,7 +119,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                 customRateLimitEntity.setUpLimit(account.getUpLimit() == null ? 0 : account.getUpLimit().intValue());
                 customRateLimitEntity.setUpUnit(1);
                 clientRateLimitSetting.setCustomRateLimit(customRateLimitEntity);
-                omadaClientApi.updateClientRateLimitSetting(client.getSiteId(), client.getClientMac(), clientRateLimitSetting);
+//                omadaClientApi.updateClientRateLimitSetting(client.getSiteId(), client.getClientMac(), clientRateLimitSetting);
             }
         }
 
diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
index be53443..bd64134 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
@@ -46,9 +46,10 @@ public class UClientServiceImpl extends ServiceImpl<UClientMapper, UClient> impl
         if (hasUClient != null) {
             uClient.setId(hasUClient.getId());
         }
+        boolean flag = this.saveOrUpdate(uClient);
         // 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi，且根据套餐限制带宽
         accountService.authClientAndRateLimit(uClientBo);
-        return this.saveOrUpdate(uClient);
+        return flag;
     }
 
     @Override