WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 补充套餐信息

Browse Source
This commit is contained in:
caiyuchao
2025-01-22 16:45:26 +08:00
parent 8e7851eebe
commit abd6af31ed
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java
View File

@@ -46,19 +46,39 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi {
public boolean authClient(String siteId, String clientMac) {
ResponseEntity<org.wfc.omada.api.hotspot.model.OperationResponseWithoutResult> response = omadaAuthorizedClientApi.authClient(siteId, clientMac);
log.info(Objects.requireNonNull(response.getBody()).getMsg());
if (ObjectUtil.isNotNull(response.getBody())) {
if (response.getBody().getErrorCode() == 0) {
log.info("authClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
} else {
log.error("authClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
}
}
return true;
}
@Override
public boolean cancelAuthClient(String siteId, String clientMac) {
ResponseEntity<org.wfc.omada.api.hotspot.model.OperationResponseWithoutResult> response = omadaAuthorizedClientApi.cancelAuthClient(siteId, clientMac);
log.info(Objects.requireNonNull(response.getBody()).getMsg());
if (ObjectUtil.isNotNull(response.getBody())) {
if (response.getBody().getErrorCode() == 0) {
log.info("cancelAuthClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
} else {
log.error("cancelAuthClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
}
}
return true;
}
@Override
public boolean reconnectClient(String siteId, String clientMac) {
ResponseEntity<OperationResponseWithoutResult> response = omadaClientApi.reconnectClient(siteId, clientMac);
if (ObjectUtil.isNotNull(response.getBody())) {
if (response.getBody().getErrorCode() == 0) {
log.info("reconnectClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
} else {
log.error("reconnectClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
}
}
return false;
}
@@ -139,9 +159,12 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi {
}
ResponseEntity<OperationResponseWithoutResult> response = omadaClientApi.updateClientRateLimitSetting(siteId, clientMac, clientRateLimitSetting);
OperationResponseWithoutResult body = response.getBody();
if (ObjectUtil.isNotNull(body) && body.getErrorCode() != 0) {
log.error("omada api rate limit errorCode {}, {}", body.getErrorCode(), body.getMsg());
if (ObjectUtil.isNotNull(response.getBody())) {
if (response.getBody().getErrorCode() == 0) {
log.info("updateClientRateLimitSetting success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
} else {
log.error("updateClientRateLimitSetting error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg());
}
}
return true;
}

14
wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java
View File

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.common.core.domain.R;
import org.wfc.common.core.web.controller.BaseController;
import org.wfc.common.core.web.domain.AjaxResult;
@@ -58,9 +57,8 @@ public class UOrderController extends BaseController {
@GetMapping("/rechargePage")
public TableDataInfo rechargePage() {
startPage();
LoginUser<Object> loginUser = SecurityUtils.getLoginUser();
List<UOrder> list = uOrderService.list(Wrappers.<UOrder>lambdaQuery()
.eq(UOrder::getUserId, loginUser.getUserid()).eq(UOrder::getType, 1)
.eq(UOrder::getUserId, SecurityUtils.getUserId()).eq(UOrder::getType, 1)
.orderByDesc(UOrder::getCreateTime));
for (UOrder uOrder : list) {
@@ -79,10 +77,16 @@ public class UOrderController extends BaseController {
@GetMapping("/packagePage")
public TableDataInfo packagePage() {
startPage();
LoginUser<Object> loginUser = SecurityUtils.getLoginUser();
List<UOrder> list = uOrderService.list(Wrappers.<UOrder>lambdaQuery()
.eq(UOrder::getUserId, loginUser.getUserid()).eq(UOrder::getType, 0)
.eq(UOrder::getUserId, SecurityUtils.getUserId()).eq(UOrder::getType, 0)
.orderByDesc(UOrder::getCreateTime));
for (UOrder uOrder : list) {
if (ObjectUtil.isNull(uOrder.getPackageId())) {
continue;
}
UPackage uPackage = uPackageService.getById(uOrder.getPackageId());
uOrder.setUPackage(uPackage);
}
return getDataTable(list);
}