From 235f6dc9a6452390d6561e44fa9f7214da98d23f Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 5 Jan 2026 17:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E5=85=B7=E7=8A=B6=E6=80=81=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pojo/entity/RackSetEntity.java | 26 +++++++++++++++++++ .../desk/device/pojo/vo/RackSetVO.java | 2 +- .../device/controller/RackSetController.java | 2 +- .../desk/device/wrapper/RackSetWrapper.java | 25 ------------------ 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java index 1cd5ded4..20064732 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java @@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.util.HashMap; +import java.util.Map; /** * 挂具设置 实体类 @@ -22,6 +24,30 @@ public class RackSetEntity extends BaseEntity { @Serial private static final long serialVersionUID = 1L; + /** + * 空闲 + */ + public static Integer RS_STATUS_FREE = 1; + /** + * 已绑定 + */ + public static Integer RS_STATUS_BOUND = 2; + /** + * 使用中 + */ + public static Integer RS_STATUS_USED = 3; + + public static Map rsStatusMap = new HashMap<>(3); + + static { + rsStatusMap.put(RS_STATUS_FREE, "空闲"); + rsStatusMap.put(RS_STATUS_BOUND, "已绑定"); + rsStatusMap.put(RS_STATUS_USED, "使用中"); + } + + public String getStatusName() { + return rsStatusMap.get(this.getStatus()); + } /** * 编码 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RackSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RackSetVO.java index cf020ebb..cab7f57f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RackSetVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RackSetVO.java @@ -28,5 +28,5 @@ public class RackSetVO extends RackSetEntity implements Serializable { /** * 状态名称 */ - String statusName; +// String statusName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java index dcbc949e..001bf20b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java @@ -157,7 +157,7 @@ public class RackSetController extends BladeController { /** * 导出数据 */ - @IsAdmin +// @IsAdmin @GetMapping("/export-rackSet") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入rackSet") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RackSetWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RackSetWrapper.java index 7fcc3e64..883b9c5a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RackSetWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RackSetWrapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.device.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper;