From 25576c047e39101a4784d8acffc92af3f35aa215 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 29 Nov 2022 16:34:32 +0800
Subject: [PATCH] 解决国控站数据补偿问题
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 2 +-
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 2 +-
screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml | 8 ++++++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 27 ++++++++++++++++++++++++++-
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 2 +-
screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 3 +++
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 2 +-
7 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 4c0f4a6..a00b64c 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -138,7 +138,7 @@
data.remove("entryTime");
//������������
- data = deviceService.adjustDeviceData(data);
+ data = deviceService.adjustDeviceData(data,"0");
//������redis
data.put("DataTime", time);
redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index b81df44..b2d3cc1 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -14,4 +14,7 @@
void insertHistoryHourly(Map<String, Object> params);
+
+ Map<String,Object> selectHistoryHourly(Map<String, Object> params);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index e8fd83c..899c7ae 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -56,7 +56,7 @@
Map<String, Object> getDeviceByMac(String mac);
//������������������
- Map<String, Object> adjustDeviceData(Map<String, Object> deviceData);
+ Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code);
//������������������������
Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData);
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 89e6b95..727f821 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
@@ -22,6 +22,7 @@
import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
+import com.sun.javafx.collections.MappingChange;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,8 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -441,8 +444,10 @@
return deviceInfo;
}
+ @Autowired
+ private HistoryHourlyMapper historyHourlyMapper;
@Override
- public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData) {
+ public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code) {
String mac = deviceData.remove("mac").toString();
//���redis������������������
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
@@ -454,6 +459,26 @@
if (govMpInfo.get("guid") != null) {
aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
+ if (code.equals("2")){
+ if (ObjectUtils.isEmpty(aqiMap.get("a21005")) || ObjectUtils.isEmpty(aqiMap.get("a21026"))
+ || ObjectUtils.isEmpty(aqiMap.get("a21004")) || ObjectUtils.isEmpty(aqiMap.get("a34002"))
+ || ObjectUtils.isEmpty(aqiMap.get("a34004")) || ObjectUtils.isEmpty(aqiMap.get("a05024"))
+ || ObjectUtils.isEmpty(aqiMap)){
+ HashMap<String, Object> result = new HashMap<>();
+ String dataTime = deviceData.get("DataTime").toString();
+ Date time = DateUtils.getDate(dataTime, DateUtils.yyyyMMddHHmmss_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
+ String format = simpleDateFormat.format(DateUtils.addHours(time, -1));
+ result.put("timeUnits",yearAndMonth);
+ result.put("mac",mac);
+ result.put("time",format);
+ Map<String, Object> map = historyHourlyMapper.selectHistoryHourly(result);
+ if (!ObjectUtils.isEmpty(map)){
+ return JSON.parseObject(map.get("value").toString(), Map.class);
+ }
+ }
+ }
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
deviceData.remove("DataTime");
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index fb293a2..a0944c6 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -62,7 +62,7 @@
historyHourlyMapper.insertHistoryHourly(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2");
//������������������insert
result.put("timeUnits", yearAndMonth);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
index 5fac9b4..586d8bf 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
@@ -53,7 +53,7 @@
historyMinutelyMapper.insertHistoryMinutely(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"1");
result.put("timeUnits", timeUnits);
result.put("value", JSONObject.toJSONString(dataAdjust));
historyMinutelyMapper.insertHistoryMinutely(result);
diff --git a/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
index 701b196..641794c 100644
--- a/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -7,4 +7,12 @@
VALUES (#{mac}, #{time}, #{value}, #{version})
</insert>
+
+ <select id="selectHistoryHourly" resultType="java.util.Map">
+ SELECT `value`
+ FROM history_hourly_${timeUnits}
+ WHERE `time` = #{time}
+ and mac = #{mac}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0