diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java index c2b54ef7..c6996e2f 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java @@ -171,10 +171,10 @@ public class DcWarningServiceImpl implements IDcWarningService { return UniversalEnum.ZERO.getNumber(); } //目前护栏碰撞触发的事件,有关应急车道的先进行过滤掉,后续可能会放开 -// if ("4".equals(dcWarning.getWarningSource().toString()) && ("4-7".equals(dcWarning.getWarningSubclass()) || -// "4-8".equals(dcWarning.getWarningSubclass()))) { -// return 1; -// } + if ("4".equals(dcWarning.getWarningSource().toString()) && ("4-7".equals(dcWarning.getWarningSubclass()) || + "4-8".equals(dcWarning.getWarningSubclass()))) { + return 1; + } String redisKye = dcWarning.getWarningSource().toString() + dcWarning.getWarningType().toString() + dcWarning.getWarningSubclass();//配置数据的key 事件源+事件类型+策略 Map redisWarningStrategy = redisCache.getCacheMap(WARNINGSTRATEGY);//获取缓存全部的配置数据 if (redisWarningStrategy == null || redisWarningStrategy.size() == UniversalEnum.ZERO.getNumber()) {//如果缓存为空,查询数据重新加入缓存