From bf4249273b9664073993c71db2cb444f5c66d2af Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 17 Sep 2021 14:14:17 +0800
Subject: [PATCH] 特殊设备历史表查询接口修改，无人机走航车秒数据补偿接口修改
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
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 4dfe2bb..8d26374 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
@@ -12,7 +12,6 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
@@ -394,13 +393,14 @@
//������������
Map<String, Object> govMpInfo = new LinkedHashMap<>();
- GovMonitorPoint govMonitorPoint = device.getGovMonitorPoint();
- if (govMonitorPoint != null) {
+
+ govMpInfo.put("guid", null);
+ govMpInfo.put("name", null);
+ if (device.getGovMonitorPoint() != null) {
govMpInfo.put("guid", device.getGovMonitorPoint().getGuid());
govMpInfo.put("name", device.getGovMonitorPoint().getName());
}
deviceInfo.put("govMonitorPoint", govMpInfo);
-
setDeviceInfoToRedis(mac, deviceInfo);
return deviceInfo;
}
@@ -441,14 +441,12 @@
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
Map<String, Object> deviceInfo = getDeviceByMac(mac);
- //���������������������������������
- Map<String, Object> govMpInfo = (Map) deviceInfo.get("govMonitorPoint");
- if (ObjectUtils.isEmpty(govMpInfo.get("guid"))) {
- return deviceData;
+ //������������������������������������
+ Map<String, Object> govMpInfo = (Map<String, Object>) deviceInfo.get("govMonitorPoint");
+ Map<String, Object> aqiMap = null;
+ if (govMpInfo.get("guid") != null) {
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
- String guid = (String) govMpInfo.get("guid");
- //���������������aqi������
- Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, guid);
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
deviceData.remove("DataTime");
--
Gitblit v1.8.0