From fdef922f0f8adea77cfaee8194033b2947575fd2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:32:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index f8f56b9..6f1f9a9 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -195,11 +195,15 @@
 
     // ������������������
     private void judgeDeviceState(String mac,Map<String, Object> dataMap){
+        List<String> sensorList = Arrays.asList("a34004","a34002","a21026","a21004","a21005","a05024","a99054");
         Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
         List<Sensor> sensors = device.getVersion().getSensors();
         Expression expression;
         int state = 1;
         for (Sensor sensor : sensors) {
+            if(!sensorList.contains(sensor.getCode())){
+                continue;
+            }
             //������������������
             String alarmLevel = sensor.getAlarmLevel();
             if (StringUtils.isEmpty(alarmLevel)) {

--
Gitblit v1.8.0