From 143d5a9187196d30131838874ba306bfb79ebe77 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 30 Nov 2022 13:07:20 +0800
Subject: [PATCH] 解决国控站数据补偿问题
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..20e8855 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);
@@ -561,9 +561,10 @@
}
}
//������������������������������������
- 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);
--
Gitblit v1.8.0