From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 74d010f..d281aa0 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -375,7 +375,7 @@
wrapper_specialDeviceHistory.eq("organization_id",updateSpecialDevice.getOrganizationId());
SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory);
SpecialDeviceHistory updateSpecialDeviceHistory = new SpecialDeviceHistory();
- BeanUtils.copyProperties(specialDevice,updateSpecialDeviceHistory);
+ BeanUtils.copyProperties(updateSpecialDevice,updateSpecialDeviceHistory);
updateSpecialDeviceHistory.setCreateTime(null);
updateSpecialDeviceHistory.setUpdateTime(null);
updateSpecialDeviceHistory.setIsDelete(null);
@@ -546,7 +546,8 @@
@Override
public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
- String mac = deviceData.remove("mac").toString();
+// String mac = deviceData.remove("mac").toString();
+ String mac = deviceData.get("mac").toString();
//���redis������������������
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!org.springframework.util.ObjectUtils.isEmpty(adjustFormula)) {
@@ -561,12 +562,13 @@
}
}
//������������������������������������
- Map<String, Object> govMpInfo = (Map<String, Object>) specialDeviceInfo.getGovMonitorPoint();
+ //Map<String, Object> govMpInfo = (Map<String, Object>) specialDeviceInfo.getGovMonitorPoint();
+ Map<String, Object> govMpInfo = JSON.parseObject(JSON.toJSONString(specialDeviceInfo.getGovMonitorPoint()),Map.class);
Map<String, Object> aqiMap = null;
- if (govMpInfo.get("guid") != null) {
+ if (null != govMpInfo && null != govMpInfo.get("guid")) {
aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
- return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
+ return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
}
deviceData.remove("DataTime");
return deviceData;
--
Gitblit v1.8.0