From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 f8254c7..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
@@ -395,7 +395,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������������").append(specialDeviceHistory.getId()).append("���");
+ content.append("������������������������������").append(specialDeviceHistory.getId()).append(";");
Field[] fields = SpecialDevice.class.getDeclaredFields();
for (Field field : fields) {
if (field.getName().equals("id")) {
@@ -412,7 +412,7 @@
Object o1 = method.invoke(specialDeviceHistory);
Object o2 = method.invoke(updateSpecialDeviceHistory);
if (o2 != null) {
- content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
}
} catch (Exception e) {
@@ -425,7 +425,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������������").append(specialDeviceId).append("���");
+ content.append("������������������������").append(specialDeviceId).append(";");
Field[] fields = SpecialDevice.class.getDeclaredFields();
for (Field field : fields) {
if (field.getName().equals("id")) {
@@ -442,7 +442,7 @@
Object o1 = method.invoke(oldSpecialDevice);
Object o2 = method.invoke(specialDevice);
if (o2 != null) {
- content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
}
} catch (Exception e) {
@@ -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