From 4601af9974e9ba489c3f91a9a17df19e2d2475a8 Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Fri, 15 Mar 2024 10:17:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BD=BF=E7=94=A8=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/base/enums/DSType.java   | 16 ++++++++++++----
 .../modules/redisStream/AnalysisConsumer.java  | 18 ++----------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DSType.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DSType.java
index 25ac6382..de9f309d 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DSType.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/DSType.java
@@ -1,10 +1,14 @@
 package org.jeecg.modules.base.enums;
 
 
+import cn.hutool.core.util.StrUtil;
+import lombok.Getter;
+
 /**
  * @author nieziyan
  *  数据源类型
  */
+@Getter
 public enum DSType {
     /* ARMD自动处理库 */
     ARMDARR("1"),
@@ -15,13 +19,17 @@ public enum DSType {
     /* IDC人工交互库 */
     IDCRRR("4");
 
-    DSType(java.lang.String type) {
+    DSType(String type) {
         this.type = type;
     }
 
-    private String type;
+    private final String type;
 
-    public String getType() {
-        return type;
+    public static String typeOf(String type){
+        for (DSType dsType : DSType.values()) {
+            if (StrUtil.equals(type, dsType.getType()))
+                return dsType.name();
+        }
+        return null;
     }
 }
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
index 14077b2b..576588e2 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
@@ -28,6 +28,7 @@ import org.jeecg.modules.base.entity.postgre.AlarmAnalysisLog;
 import org.jeecg.modules.base.entity.postgre.AlarmAnalysisNuclideAvg;
 import org.jeecg.modules.base.entity.postgre.AlarmAnalysisRule;
 import org.jeecg.modules.base.enums.Condition;
+import org.jeecg.modules.base.enums.DSType;
 import org.jeecg.modules.feignclient.SystemClient;
 import org.jeecg.modules.service.AnalysisResultService;
 import org.jeecg.modules.service.IAlarmAnalysisLogService;
@@ -247,28 +248,13 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
             NuclideInfo nuclideInfo = new NuclideInfo();
             nuclideInfo.setNuclide(nuclideName);
             nuclideInfo.setThreshold(avg.toString());
-            nuclideInfo.setDatasource(type(dataSourceType));
+            nuclideInfo.setDatasource(DSType.typeOf(dataSourceType));
             nuclideInfo.setValue(conc.toString());
             nuclideInfos.add(nuclideInfo);
         }
         return nuclideInfos;
     }
 
-    private String type(String dataSourceType){
-        switch (dataSourceType){
-            case CommonConstant.ARMDARR:
-                return "ARMDARR";
-            case CommonConstant.ARMDRRR:
-                return "ARMDRRR";
-            case CommonConstant.IDCARR:
-                return "IDCARR";
-            case CommonConstant.IDCRRR:
-                return "IDCRRR";
-            default:
-                return null;
-        }
-    }
-
     private void init() {
         // start:生成临时Token到线程中
         UserTokenContext.setToken(getTempToken());