From 8aa1b9cc5cabce893203d6df563a1259f88b7bf2 Mon Sep 17 00:00:00 2001 From: dzq Date: Sat, 17 May 2025 09:56:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=9C=BA=E6=9F=9C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了管理员权限判断逻辑中的错误，将“CabinetCell”更改为“SmartCabinetCard”。同时，在CabinetTemplateEnum中添加了新的机柜类型“4口机柜”。 --- .../java/com/agileboot/api/controller/PaymentController.java | 2 +- .../domain/cabinet/smartCabinet/CabinetTemplateEnum.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java b/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java index 810a3d6..ed2bee2 100644 --- a/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java +++ b/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java @@ -209,7 +209,7 @@ public class PaymentController { if (routerTree == null || routerTree.isEmpty()) { return false; } - boolean isAdmin = routerTree.stream().anyMatch(router -> router.getName().equals("CabinetCell")); + boolean isAdmin = routerTree.stream().anyMatch(router -> router.getName().trim().equals("SmartCabinetCard")); if (isAdmin) { return true; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/CabinetTemplateEnum.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/CabinetTemplateEnum.java index b514716..0e3456e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/CabinetTemplateEnum.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/CabinetTemplateEnum.java @@ -8,7 +8,8 @@ public enum CabinetTemplateEnum { CABINET_40(5, "cabinet_40.jpg", "40口机柜", 2), CABINET_48(6, "cabinet_48.jpg", "48口机柜", 2), CABINET_60(7, "cabinet_60.jpg", "60口机柜", 4), - CABINET_120(8, "cabinet_120.jpg", "120口机柜", 6); + CABINET_120(8, "cabinet_120.jpg", "120口机柜", 6), + CABINET_4(9, "cabinet_4.jpg","4口机柜", 1); private final int code; private final String img;