From 9188066e4c0ffe7002dfad598910f6567b575b48 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Sep 2021 17:06:34 +0800
Subject: [PATCH] kafka 修改
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 10 +++++++---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 8 ++++----
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 1 +
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index bc9db3d..2805587 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -142,6 +142,7 @@
//������redis
redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
//���������������������������
+ data.put("mac", mac);
deviceService.judgeDeviceState(data);
} catch (Exception e) {
log.error("param{}" + msg);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 9339dc2..60db004 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -428,8 +428,8 @@
if (!ObjectUtils.isEmpty(adjustFormula)) {
Map<String, Object> deviceInfo = getDeviceByMac(mac);
Map<String, Object> monitorPoint = (Map<String, Object>) deviceInfo.get("monitorPoint");
- Object areaCode = monitorPoint.get("areaCode");
- Object cityCode = monitorPoint.get("cityCode");
+ String areaCode = monitorPoint.get("areaCode").toString();
+ String cityCode = monitorPoint.get("cityCode").toString();
Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
if (ObjectUtils.isEmpty(aqiMap)) {
@@ -448,8 +448,8 @@
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
Organization organization = specialDeviceMapper.selectOrgByMac(mac);
- Integer areaCode = organization.getAreaCode();
- Integer cityCode = organization.getCityCode();
+ String areaCode = organization.getAreaCode().toString();
+ String cityCode = organization.getCityCode().toString();
Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
if (ObjectUtils.isEmpty(aqiMap)) {
aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index 86f21fc..e8f0e91 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import com.alibaba.fastjson.JSON;
import com.googlecode.aviator.AviatorEvaluator;
@@ -40,11 +41,14 @@
deviceData.put(key, measuredValue);
continue;
}
-
//���������������������������������
- DeviceAdjustValue deviceAdjustValue = sensorFormulas.stream()
+ DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
+ Optional<DeviceAdjustValue> optional = sensorFormulas.stream()
.filter(o -> o.getStartTime().getTime() <= finalTime && o.getEndTime().getTime() > finalTime)
- .findFirst().get();
+ .findFirst();
+ if (optional.isPresent()) {
+ deviceAdjustValue = optional.get();
+ }
String formula = deviceAdjustValue.getValue();
if (StringUtils.isEmpty(formula)) {
deviceData.put(key, measuredValue);
--
Gitblit v1.8.0