From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 4 ++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 2 +-
2 files changed, 5 insertions(+), 1 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)) {
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index f287939..1e3f9d4 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -293,7 +293,7 @@
map.put("cel",1);
}
}else {
- if (code.equals("a99054")){
+ if (code.equals("a99054")&& !value.contains("+")){
String[] split = value.split("\\*");
map.put("cel",Double.parseDouble(split[1]));
}else {
--
Gitblit v1.8.0