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 17b8cbe..f0287f4 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 @@ -1,6 +1,6 @@ package com.muyu.data.processing.strategy.leaves; -import com.muyu.data.processing.domain.BasicData; +import com.muyu.common.caffeine.enums.CacheNameEnums;import com.muyu.data.processing.domain.BasicData; import java.util.HashMap; import java.util.List; import com.muyu.data.processing.domain.Temporary2; @@ -32,6 +32,7 @@ public class DataStorageStrategy extends abstractStrategyRouter basicDataMap) { log.info("数据持久化节点已通过。。。"); + basicDataMap.remove(CacheNameEnums.STORAGE.getCode()); return applyStrategy(basicDataMap); } } 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 55f0a39..f55c1ee 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 @@ -1,5 +1,6 @@ package com.muyu.data.processing.strategy.leaves; +import com.muyu.common.caffeine.enums.CacheNameEnums; import com.muyu.data.processing.domain.BasicData; import java.util.HashMap; import java.util.List; @@ -32,6 +33,7 @@ public class FaultAlarmStrategy extends abstractStrategyRouter 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 d857c64..2b536fe 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 @@ -1,5 +1,6 @@ package com.muyu.data.processing.strategy.leaves; +import com.muyu.common.caffeine.enums.CacheNameEnums; import com.muyu.data.processing.domain.BasicData; import java.util.HashMap; import java.util.List; @@ -32,6 +33,7 @@ public class FenceAlarmStrategy extends abstractStrategyRouter 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 d322414..ffc9135 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 @@ -1,5 +1,6 @@ package com.muyu.data.processing.strategy.leaves; +import com.muyu.common.caffeine.enums.CacheNameEnums; import com.muyu.data.processing.domain.BasicData; import java.util.HashMap; import java.util.List; @@ -32,6 +33,7 @@ public class RealTimeAlarmStrategy extends abstractStrategyRouter 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 b604e4c..3712034 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 @@ -1,5 +1,6 @@ package com.muyu.data.processing.strategy.leaves; +import com.muyu.common.caffeine.enums.CacheNameEnums; import com.muyu.data.processing.domain.BasicData; import java.util.HashMap; import java.util.List; @@ -32,6 +33,7 @@ public class WarningAlarmStrategy extends abstractStrategyRouter basicDataMap) { log.info("预警报警节点已通过。。。"); + basicDataMap.remove(CacheNameEnums.WARMING.getCode()); return applyStrategy(basicDataMap); } }