From c29a08b0ffad8b2c7f057c6e976d8aa4f3f1f1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Mon, 7 Oct 2024 14:04:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/data/processing/strategy/core/RoutingStrategy.java  | 1 +
 .../data/processing/strategy/leaves/DataStorageStrategy.java | 5 +----
 .../data/processing/strategy/leaves/FaultAlarmStrategy.java  | 1 -
 .../data/processing/strategy/leaves/FenceAlarmStrategy.java  | 1 -
 .../processing/strategy/leaves/RealTimeAlarmStrategy.java    | 1 -
 .../processing/strategy/leaves/WarningAlarmStrategy.java     | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java
index 7b45f17..ce46f71 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java
@@ -41,6 +41,7 @@ public class RoutingStrategy   extends abstractStrategyRouter<HashMap<String, Ba
             List<String> codes = CacheNameEnums.getCodes();
             for (String code : codes) {
                 if(param.containsKey(code)){
+                    param.remove(code);
                     return map.get(code);
                 }
             }
diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java
index 62aa625..a57c426 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java
@@ -35,8 +35,6 @@ import org.springframework.stereotype.Component;
 public class DataStorageStrategy extends abstractStrategyRouter<HashMap<String, BasicData>, Temporary2>
         implements StrategyHandler<HashMap<String, BasicData>, Temporary2> {
 
-    private SessionPool sessionPool = new IotDBSessionConfig().getSessionPool();
-
     @Override
     protected StrategyMapper<HashMap<String, BasicData>, Temporary2> registerStrategy() {
         return param -> {
@@ -47,7 +45,6 @@ public class DataStorageStrategy extends abstractStrategyRouter<HashMap<String,
 
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
-        basicDataMap.remove(CacheNameEnums.STORAGE.getCode());
         // 执行持久化方法
         addCarData(basicDataMap);
         return applyStrategy(basicDataMap);
@@ -82,7 +79,7 @@ public class DataStorageStrategy extends abstractStrategyRouter<HashMap<String,
                 .append(values.substring(0, values.length() - 1))
                 .append(")");
         try {
-            sessionPool.executeNonQueryStatement(sql.toString());
+            new IotDBSessionConfig().getSessionPool().executeNonQueryStatement(sql.toString());
         } catch (StatementExecutionException e) {
             throw new RuntimeException(e);
         } catch (IoTDBConnectionException e) {
diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java
index f55c1ee..2ebad77 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java
@@ -33,7 +33,6 @@ public class FaultAlarmStrategy extends abstractStrategyRouter<HashMap<String, B
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
         log.info("故障报警节点已通过。。。");
-        basicDataMap.remove(CacheNameEnums.FAULT.getCode());
         return applyStrategy(basicDataMap);
     }
 }
diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java
index 2b536fe..6845011 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java
@@ -33,7 +33,6 @@ public class FenceAlarmStrategy extends abstractStrategyRouter<HashMap<String, B
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
         log.info("围栏报警节点已通过。。。");
-        basicDataMap.remove(CacheNameEnums.FENCE.getCode());
         return applyStrategy(basicDataMap);
     }
 }
diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java
index ffc9135..0a4cbc3 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java
@@ -33,7 +33,6 @@ public class RealTimeAlarmStrategy extends abstractStrategyRouter<HashMap<String
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
         log.info("实时数据处理节点已通过。。。");
-        basicDataMap.remove(CacheNameEnums.REALTIME.getCode());
         return applyStrategy(basicDataMap);
     }
 }
diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java
index 3712034..8026940 100644
--- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java
+++ b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java
@@ -33,7 +33,6 @@ public class WarningAlarmStrategy extends abstractStrategyRouter<HashMap<String,
     @Override
     public Temporary2 apply(HashMap<String, BasicData> basicDataMap) {
         log.info("预警报警节点已通过。。。");
-        basicDataMap.remove(CacheNameEnums.WARMING.getCode());
         return applyStrategy(basicDataMap);
     }
 }