From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/common/utils/EnumUtil.java | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/EnumUtil.java b/src/main/java/com/ruoyi/common/utils/EnumUtil.java
index 75be83a..8fd3224 100644
--- a/src/main/java/com/ruoyi/common/utils/EnumUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/EnumUtil.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.enums.BaseEnum;
-import com.ruoyi.common.enums.StockRecordTypeEnum;
import java.util.*;
import java.util.stream.Collectors;
@@ -20,7 +19,7 @@
*/
public static <E extends Enum<E> & BaseEnum> E fromCode(Class<E> enumClass, int code) {
for (E e : enumClass.getEnumConstants()) {
- if (e.getCode() == code) {
+ if ((int)e.getCode() == code) {
return e;
}
}
@@ -29,7 +28,7 @@
public static <E extends Enum<E> & BaseEnum> E fromCodeHasNull(Class<E> enumClass, int code) {
for (E e : enumClass.getEnumConstants()) {
- if (e.getCode() == code) {
+ if ((int)e.getCode() == code) {
return e;
}
}
@@ -38,7 +37,7 @@
public static <E extends Enum<E> & BaseEnum> E fromCodeHasDefault(Class<E> enumClass, int code,E defaultE) {
for (E e : enumClass.getEnumConstants()) {
- if (e.getCode() == code) {
+ if ((int)e.getCode() == code) {
return e;
}
}
@@ -74,34 +73,34 @@
return Arrays.stream(enumClass.getEnumConstants())
.map(e -> {
Map<String, Object> map = new HashMap<>();
- map.put("key", e.getCode());
+ map.put("key", e.getCode().toString());
map.put("value", e.getValue());
return map;
})
.collect(Collectors.toList());
}
- /**
- * 杞负 Map<Integer, String>
- * 鏍煎紡: { 1: "缁炵嚎", 0: "鎷変笣" }
- */
- public static <E extends Enum<E> & BaseEnum> Map<Integer, String> toMap(Class<E> enumClass) {
- return Arrays.stream(enumClass.getEnumConstants())
- .collect(Collectors.toMap(BaseEnum::getCode, BaseEnum::getValue));
- }
-
-
- public static void main(String[] args) {
- // 鉁� 1. 鏍规嵁 code 鑾峰彇鏋氫妇
- StockRecordTypeEnum status = EnumUtil.fromCode(StockRecordTypeEnum.class, 1);
- System.out.println(status.getValue()); // 缁炵嚎
-
- // 鉁� 2. 杞垚 list (閫傚悎鍓嶇)
- System.out.println(EnumUtil.toList(StockRecordTypeEnum.class));
- // 杈撳嚭: [{code=1, value=缁炵嚎}, {code=0, value=鎷変笣}]
-
- // 鉁� 3. 杞垚 map
- System.out.println(EnumUtil.toMap(StockRecordTypeEnum.class));
- // 杈撳嚭: {1=缁炵嚎, 0=鎷変笣}
- }
+// /**
+// * 杞负 Map<Integer, String>
+// * 鏍煎紡: { 1: "缁炵嚎", 0: "鎷変笣" }
+// */
+// public static <E extends Enum<E> & BaseEnum> Map<Integer, String> toMap(Class<E> enumClass) {
+// return Arrays.stream(enumClass.getEnumConstants())
+// .collect(Collectors.toMap((BaseEnum::getCode, BaseEnum::getValue));
+// }
+//
+//
+// public static void main(String[] args) {
+// // 鉁� 1. 鏍规嵁 code 鑾峰彇鏋氫妇
+// StockRecordTypeEnum status = EnumUtil.fromCode(StockRecordTypeEnum.class, 1);
+// System.out.println(status.getValue()); // 缁炵嚎
+//
+// // 鉁� 2. 杞垚 list (閫傚悎鍓嶇)
+// System.out.println(EnumUtil.toList(StockRecordTypeEnum.class));
+// // 杈撳嚭: [{code=1, value=缁炵嚎}, {code=0, value=鎷変笣}]
+//
+// // 鉁� 3. 杞垚 map
+// System.out.println(EnumUtil.toMap(StockRecordTypeEnum.class));
+// // 杈撳嚭: {1=缁炵嚎, 0=鎷変笣}
+// }
}
\ No newline at end of file
--
Gitblit v1.9.3