From ba55d44ea9f61a007f5c63fb8689488cc35d48ee Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Mon, 26 Sep 2022 15:05:56 +0800
Subject: [PATCH] 多站单参接口修改
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..455bab3 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);
@@ -563,7 +563,7 @@
//������������������������������������
Map<String, Object> govMpInfo = (Map<String, Object>) specialDeviceInfo.getGovMonitorPoint();
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