#: Modify enums

zdu-strong · Jan 31, 2025 · cd4ad97 · cd4ad97
1 parent ec191d0
commit cd4ad97
Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/springboot/src/main/java/com/springboot/project/enums/DistributedExecutionEnum.java b/springboot/src/main/java/com/springboot/project/enums/DistributedExecutionEnum.java
@@ -1,17 +1,15 @@
 package com.springboot.project.enums;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
-import org.jinq.orm.stream.JinqStream;
-
+import org.nd4j.common.primitives.Optional;
 import com.springboot.project.properties.IsDevelopmentMockModeProperties;
 import com.springboot.project.service.NonceService;
 import com.springboot.project.service.OrganizeRelationService;
 import com.springboot.project.service.OrganizeService;
 import com.springboot.project.service.StorageSpaceService;
+import cn.hutool.core.util.EnumUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -114,9 +112,7 @@ public Duration getTheIntervalBetweenTwoExecutions() {
     }
 
     public static DistributedExecutionEnum parseValue(String value) {
-        return JinqStream.from(List.of(DistributedExecutionEnum.values()))
-                .where(s -> s.getValue().equals(value))
-                .getOnlyValue();
+        return Optional.ofNullable(EnumUtil.getBy(DistributedExecutionEnum::getValue, value)).get();
     }
 
 }
diff --git a/springboot/src/main/java/com/springboot/project/enums/LongTermTaskTypeEnum.java b/springboot/src/main/java/com/springboot/project/enums/LongTermTaskTypeEnum.java
@@ -1,7 +1,7 @@
 package com.springboot.project.enums;
 
-import java.util.List;
-import org.jinq.orm.stream.JinqStream;
+import org.nd4j.common.primitives.Optional;
+import cn.hutool.core.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -18,9 +18,7 @@ public enum LongTermTaskTypeEnum {
     public String value;
 
     public static LongTermTaskTypeEnum parseValue(String value) {
-        return JinqStream.from(List.of(LongTermTaskTypeEnum.values()))
-                .where(s -> s.getValue().equals(value))
-                .getOnlyValue();
+        return Optional.ofNullable(EnumUtil.getBy(LongTermTaskTypeEnum::getValue, value)).get();
     }
 
 }
diff --git a/springboot/src/main/java/com/springboot/project/enums/SystemPermissionEnum.java b/springboot/src/main/java/com/springboot/project/enums/SystemPermissionEnum.java
@@ -1,7 +1,7 @@
 package com.springboot.project.enums;
 
-import java.util.List;
-import org.jinq.orm.stream.JinqStream;
+import org.nd4j.common.primitives.Optional;
+import cn.hutool.core.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -18,8 +18,6 @@ public enum SystemPermissionEnum {
     private Boolean isOrganizeRole;
 
     public static SystemPermissionEnum parseValue(String value) {
-        return JinqStream.from(List.of(SystemPermissionEnum.values()))
-                .where(s -> s.getValue().equals(value))
-                .getOnlyValue();
+        return Optional.ofNullable(EnumUtil.getBy(SystemPermissionEnum::getValue, value)).get();
     }
 }
diff --git a/springboot/src/main/java/com/springboot/project/enums/SystemRoleEnum.java b/springboot/src/main/java/com/springboot/project/enums/SystemRoleEnum.java
@@ -2,7 +2,8 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.jinq.orm.stream.JinqStream;
+import org.nd4j.common.primitives.Optional;
+import cn.hutool.core.util.EnumUtil;
 import lombok.Getter;
 
 @Getter
@@ -25,9 +26,7 @@ private SystemRoleEnum(String value, boolean isOrganizeRole, SystemPermissionEnu
     }
 
     public static SystemRoleEnum parseValue(String value) {
-        return JinqStream.from(List.of(SystemRoleEnum.values()))
-                .where(s -> s.getValue().equals(value))
-                .getOnlyValue();
+        return Optional.ofNullable(EnumUtil.getBy(SystemRoleEnum::getValue, value)).get();
     }
 
 }