From dad884536c7353ff190baf4058924018d068c79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 21 Jan 2026 17:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/api/enums/PayloadType.java | 46 ------------------- .../device/api/enums/PayloadTypeEnum.java | 13 ++++-- ruoyi-modules/tuoheng-device | 2 +- 3 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadType.java diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadType.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadType.java deleted file mode 100644 index f4b8851..0000000 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadType.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.device.api.enums; - -/** - * 挂载类型枚举 - * - * @author ruoyi - * @date 2026-01-21 - */ -public enum PayloadType { - - /** - * 喊话器 - */ - SPEAKER("SPEAKER", "喊话器"), - - /** - * 相机 - */ - CAMERA("CAMERA", "相机"), - - /** - * 其他挂载 - */ - OTHER("OTHER", "其他"); - - private final String code; - private final String description; - - PayloadType(String code, String description) { - this.code = code; - this.description = description; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - @Override - public String toString() { - return code; - } -} \ No newline at end of file diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadTypeEnum.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadTypeEnum.java index 4643a29..7ed8ff4 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadTypeEnum.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/enums/PayloadTypeEnum.java @@ -4,7 +4,7 @@ package com.ruoyi.device.api.enums; * 挂载类型枚举 * * @author ruoyi - * @date 2026-01-20 + * @date 2026-01-21 */ public enum PayloadTypeEnum { @@ -14,9 +14,14 @@ public enum PayloadTypeEnum { SPEAKER("SPEAKER", "喊话器"), /** - * 四光相机 + * 相机 */ - QUAD_CAMERA("QUAD_CAMERA", "四光相机"); + CAMERA("CAMERA", "相机"), + + /** + * 其他挂载 + */ + OTHER("OTHER", "其他"); private final String code; private final String description; @@ -38,4 +43,4 @@ public enum PayloadTypeEnum { public String toString() { return code; } -} +} \ No newline at end of file diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device index 35c0cf0..48641d7 160000 --- a/ruoyi-modules/tuoheng-device +++ b/ruoyi-modules/tuoheng-device @@ -1 +1 @@ -Subproject commit 35c0cf0c63062473179a4c76d0cb4158adb60d4f +Subproject commit 48641d76eb3836f9ff0c666321755df2b7cabeb8