WFC/be.wfc
2
0
Fork 0
Code Activity

fix: login auth wifi

Browse Source
This commit is contained in:
caiyuchao
2024-12-26 19:50:19 +08:00
parent d7059ec8ee
commit 24811ccedc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
// 定时任务查询所有未过期或刚过期（失效时间+定时任务间隔时间）的账户套餐，套餐过期/流量用完/时长用完则取消授权 // 定时任务查询所有未过期或刚过期（失效时间+定时任务间隔时间）的账户套餐，套餐过期/流量用完/时长用完则取消授权
Date current = new Date(); Date current = new Date();
DateTime endTime = DateUtil.offsetSecond(current, -30); 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) { for (UAccount account : accounts) {
if (ObjectUtil.isNull(account.getUserId())) { if (ObjectUtil.isNull(account.getUserId())) {
@@ -83,7 +83,8 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollUtil.isNotEmpty(userIds)) { 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) { for (UClient client : clients) {
try { try {
omadaAuthorizedClientApi.cancelAuthClient(client.getSiteId(), client.getClientMac()); 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.setUpLimit(account.getUpLimit() == null ? 0 : account.getUpLimit().intValue());
customRateLimitEntity.setUpUnit(1); customRateLimitEntity.setUpUnit(1);
clientRateLimitSetting.setCustomRateLimit(customRateLimitEntity); clientRateLimitSetting.setCustomRateLimit(customRateLimitEntity);
omadaClientApi.updateClientRateLimitSetting(client.getSiteId(), client.getClientMac(), clientRateLimitSetting); // omadaClientApi.updateClientRateLimitSetting(client.getSiteId(), client.getClientMac(), clientRateLimitSetting);
} }
} }

3
wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java
View File

@@ -46,9 +46,10 @@ public class UClientServiceImpl extends ServiceImpl<UClientMapper, UClient> impl
if (hasUClient != null) { if (hasUClient != null) {
uClient.setId(hasUClient.getId()); uClient.setId(hasUClient.getId());
} }
boolean flag = this.saveOrUpdate(uClient);
// 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi，且根据套餐限制带宽 // 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi，且根据套餐限制带宽
accountService.authClientAndRateLimit(uClientBo); accountService.authClientAndRateLimit(uClientBo);
return this.saveOrUpdate(uClient); return flag;
} }
@Override @Override