From abd6af31edf6cebc2b8e1e844981263b95f28b2e Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Wed, 22 Jan 2025 16:45:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/wfc/user/api/omada/OmadaWifiApi.java | 31 ++++++++++++++++--- .../wfc/user/controller/UOrderController.java | 14 ++++++--- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java index 261033b..c911cf9 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java @@ -46,19 +46,39 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { public boolean authClient(String siteId, String clientMac) { ResponseEntity 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 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 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 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; } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java index 7c93c35..cf66a13 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java @@ -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 loginUser = SecurityUtils.getLoginUser(); List list = uOrderService.list(Wrappers.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 loginUser = SecurityUtils.getLoginUser(); List list = uOrderService.list(Wrappers.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); }