From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
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..931fd1c 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 (Integer.parseInt(String.valueOf(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 (Integer.parseInt(String.valueOf(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 (Integer.parseInt(String.valueOf(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