From c06a41d9e5453f4885c11443cffa1bc0b8163f3b 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: Thu, 10 Oct 2024 14:57:37 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=AE=8C=E6=88=90=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E7=AD=96=E7=95=A5=E5=B9=B6?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/redis/service/RedisService.java | 3 -- .../processing/strategy/StrategyHandler.java | 3 ++ .../branch/RealTimeJudgmentStrategy.java | 38 ------------------- .../branch/RealTimeProcessingStrategy.java | 8 +++- .../strategy/core/StartStrategy.java | 8 ++-- .../leaves/RealTimeAlarmStrategy.java | 6 +++ 6 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java diff --git a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index ca98a3d..4926026 100644 --- a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -22,9 +22,6 @@ import java.util.concurrent.TimeUnit; public class RedisService { @Resource - - @Autowired - public RedisTemplate redisTemplate; /** diff --git a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java index ee5f3b7..d8b4eed 100644 --- a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java +++ b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java @@ -1,5 +1,6 @@ package com.muyu.data.processing.strategy; +import com.muyu.common.redis.service.RedisService; import com.muyu.data.processing.strategy.core.EndStrategy; /** @@ -12,6 +13,8 @@ import com.muyu.data.processing.strategy.core.EndStrategy; */ public interface StrategyHandler { + RedisService redisService = new RedisService(); + @SuppressWarnings("rawtypes") StrategyHandler DEFAULT = param -> new EndStrategy(); diff --git a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java deleted file mode 100644 index 34c025e..0000000 --- a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.RealTimeAlarmStrategy; -import com.muyu.data.processing.strategy.leaves.WarningAlarmStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 实时数据判断 - * 判断实时数据情况 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 实时数据判断 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class RealTimeJudgmentStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - log.info("实时数据判断节点已通过。。。"); - return param-> new RealTimeAlarmStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java index 72a0d28..79b5796 100644 --- a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java +++ b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java @@ -1,11 +1,13 @@ package com.muyu.data.processing.strategy.branch; +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; import com.muyu.data.processing.strategy.StrategyHandler; import com.muyu.data.processing.strategy.abstractStrategyRouter; +import com.muyu.data.processing.strategy.leaves.RealTimeAlarmStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -25,12 +27,14 @@ public class RealTimeProcessingStrategy extends abstractStrategyRouter, Temporary2> { @Override protected StrategyMapper, Temporary2> registerStrategy() { - log.info("实时数据处理节点已通过。。。"); - return param-> new RealTimeJudgmentStrategy(); + log.info("实时数据判断节点已通过。。。"); + return param-> new RealTimeAlarmStrategy(); } @Override public Temporary2 apply(HashMap basicDataMap) { + log.info("开始执行实时数据判断节点。。。"); + basicDataMap.put("RealTimeProcessingStrategy", null); return applyStrategy(basicDataMap); } } diff --git a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java index 033d137..520c0ae 100644 --- a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java +++ b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java @@ -24,13 +24,13 @@ import java.util.List; * ↓ * 路由节点 ← ← ← ← ← ← * ↙ ↙ ↓ ↘ ↘ - * 数据处理节点 预警处理节点 故障处理节点 围栏处理节点 实时数据数据处理节点 ↑ + * 数据处理节点 预警处理节点 故障处理节点 围栏处理节点 实时数据数据处理节点 ↑ * ↓ ↓ ↓ ↓ ↓ - * 数据持久化处理节点 预警处理节点 故障处理节点 围栏处理节点 实时数据数据处理节点 ↑ + * 数据持久化处理节点 预警判断节点 故障判断节点 围栏判断节点 实时数据处理节点 ↑ * ↓ ↓ ↓ ↓ ↓ - * ↓ 预警通知节点 故障通知节点 围栏通知节点 实时数据处理节点 ↑ + * ↓ 预警通知节点 故障通知节点 围栏通知节点 ↓ ↑ * ↓ ↘ ↓ ↙ ↙ - * ↓ ↓ ↑ + * ↓ ↓ ↑ * → → → 路由节点 → → → → → → * ↓ * 结束节点 diff --git a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java index 2947306..dc5e308 100644 --- a/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java +++ b/cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java @@ -32,6 +32,12 @@ public class RealTimeAlarmStrategy extends abstractStrategyRouter basicDataMap) { + log.info("开始执行实时数据处理节点。。。"); + String vin = basicDataMap.get("VIN").getKey(); + basicDataMap.keySet().forEach(key -> { + BasicData basicData = basicDataMap.get(key); + redisService.setCacheObject(vin+":"+basicData.getKey(), basicData.getValue()); + }); return applyStrategy(basicDataMap); } }