From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
index a282958..0fe5cfe 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
@@ -3,8 +3,10 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
+import java.util.Arrays;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 娑堟伅绫诲瀷鏋氫妇
@@ -14,14 +16,17 @@
@Getter
@AllArgsConstructor
public enum MessageTypeEnum {
+
/**
* 绔欏唴淇�
*/
SYSTEM_MESSAGE("1", "绔欏唴淇�"),
+
/**
* 閭
*/
EMAIL_MESSAGE("2", "閭"),
+
/**
* 鐭俊
*/
@@ -31,21 +36,18 @@
private final String desc;
- private final static Map<String, MessageTypeEnum> MESSAGE_TYPE_ENUM_MAP = new ConcurrentHashMap<>(MessageTypeEnum.values().length);
-
- static {
- for (MessageTypeEnum messageType : MessageTypeEnum.values()) {
- MESSAGE_TYPE_ENUM_MAP.put(messageType.code, messageType);
- }
- }
+ private static final Map<String, MessageTypeEnum> MESSAGE_TYPE_ENUM_MAP = Arrays.stream(values())
+ .collect(Collectors.toConcurrentMap(MessageTypeEnum::getCode, Function.identity()));
/**
* 鏍规嵁娑堟伅绫诲瀷 code 鑾峰彇 MessageTypeEnum
+ *
* @param code 娑堟伅绫诲瀷code
* @return MessageTypeEnum
*/
public static MessageTypeEnum getByCode(String code) {
- return MESSAGE_TYPE_ENUM_MAP.get(code);
+ return MESSAGE_TYPE_ENUM_MAP.getOrDefault(code, null);
}
+
}
--
Gitblit v1.9.3