动态枚举修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DynamicEnumUtil.java

@@ -89,7 +89,8 @@ public class DynamicEnumUtil {
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T extends Enum<?>> T addEnum(Class<T> enumType, String enumName, Class<?>[] additionalTypes, Object[] additionalValues) {
+    public static <T extends Enum<?>> T addEnum(Class<T> enumType, String enumName, Class<?>[] additionalTypes,
+                                                Object[] additionalValues) {
 
         // 0. 检查类型
         if (!Enum.class.isAssignableFrom(enumType)) {

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerLevelEnum.java

 package com.yeejoin.amos.latentdanger.common.enums;
 
 import com.yeejoin.amos.boot.biz.common.utils.DynamicEnumUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -98,7 +99,9 @@ public enum LatentDangerLevelEnum {
         LatentDangerLevelEnum dangerLevelEnum = DynamicEnumUtil.addEnum(LatentDangerLevelEnum.class, enumName,
                 new Class[]{String.class, String.class, String.class, Integer.class}, new Object[]{name, code,
                         riskSourceDangerLevelCode, order});
-        enumMap.put(code, dangerLevelEnum);
+        if (!ValidationUtil.isEmpty(dangerLevelEnum)) {
+            enumMap.put(code, dangerLevelEnum);
+        }
         return dangerLevelEnum;
     }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerReformTypeEnum.java

 package com.yeejoin.amos.latentdanger.common.enums;
 
 import com.yeejoin.amos.boot.biz.common.utils.DynamicEnumUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -75,7 +76,9 @@ public enum LatentDangerReformTypeEnum {
     public static LatentDangerReformTypeEnum addEnumDynamic(String enumName, String name, String code) {
         LatentDangerReformTypeEnum dangerReformTypeEnum = DynamicEnumUtil.addEnum(LatentDangerReformTypeEnum.class, enumName,
                 new Class[]{String.class, String.class}, new Object[]{name, code});
-        enumMap.put(code, dangerReformTypeEnum);
+        if (!ValidationUtil.isEmpty(dangerReformTypeEnum)) {
+            enumMap.put(code, dangerReformTypeEnum);
+        }
         return dangerReformTypeEnum;
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerStateEnum.java

 package com.yeejoin.amos.latentdanger.common.enums;
 
 import com.yeejoin.amos.boot.biz.common.utils.DynamicEnumUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -64,7 +65,9 @@ public enum LatentDangerStateEnum {
     public static LatentDangerStateEnum addEnumDynamic(String enumName, String name, String code) {
         LatentDangerStateEnum dangerStateEnum = DynamicEnumUtil.addEnum(LatentDangerStateEnum.class, enumName,
                 new Class[]{String.class, String.class}, new Object[]{name, code});
-        enumMap.put(code, dangerStateEnum);
+        if (!ValidationUtil.isEmpty(dangerStateEnum)) {
+            enumMap.put(code, dangerStateEnum);
+        }
         return dangerStateEnum;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/aop/EnumFillAop.java

@@ -42,17 +42,19 @@ public class EnumFillAop {
     public void doBefore(JoinPoint joinPoint) {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         // 获取隐患等级枚举
-        if (ValidationUtil.isEmpty(LatentDangerLevelEnum.enumMap)) {
-            List<DictionarieValueModel> dicResult =
-                    Systemctl.dictionarieClient.dictValues(bizType + LatentDangerLevelEnum.dictCode).getResult();
-            dicResult.forEach(dic -> LatentDangerLevelEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey(),
-                    "", dic.getOrderNum()));
-        }
-        // 获取治理方式枚举
-        if (ValidationUtil.isEmpty(LatentDangerReformTypeEnum.enumMap)) {
-            List<DictionarieValueModel> dicResult =
-                    Systemctl.dictionarieClient.dictValues(bizType + LatentDangerReformTypeEnum.dictCode).getResult();
-            dicResult.forEach(dic -> LatentDangerReformTypeEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey()));
+        synchronized (this) {
+            if (ValidationUtil.isEmpty(LatentDangerLevelEnum.enumMap)) {
+                List<DictionarieValueModel> dicResult =
+                        Systemctl.dictionarieClient.dictValues(bizType + LatentDangerLevelEnum.dictCode).getResult();
+                dicResult.forEach(dic -> LatentDangerLevelEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey(),
+                        "", dic.getOrderNum()));
+            }
+            // 获取治理方式枚举
+            if (ValidationUtil.isEmpty(LatentDangerReformTypeEnum.enumMap)) {
+                List<DictionarieValueModel> dicResult =
+                        Systemctl.dictionarieClient.dictValues(bizType + LatentDangerReformTypeEnum.dictCode).getResult();
+                dicResult.forEach(dic -> LatentDangerReformTypeEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey()));
+            }
         }
         // 获取治理状态枚举
 //        if (ValidationUtil.isEmpty(LatentDangerStateEnum.enumMap)) {