From 3d593b39648ff583a255765f76760768d6ba5f55 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 23 Dec 2021 14:32:14 +0800
Subject: [PATCH] 正式库city_aqi，city_weather,history_aqi第三方数据存入开发库
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
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 e555273..fb293a2 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
@@ -1,15 +1,15 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.moral.api.entity.HistoryHourly;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryHourlyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +26,7 @@
* @since 2021-06-04
*/
@Service
-public class HistoryHourlyServiceImpl extends ServiceImpl<HistoryHourlyMapper, HistoryHourly> implements HistoryHourlyService {
+public class HistoryHourlyServiceImpl implements HistoryHourlyService {
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
@@ -34,20 +34,29 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
@Transactional
public void insertHistoryHourly(Map<String, Object> data) {
- Integer version = (Integer) data.remove("ver");
+ //������������������
Map<String, Object> dataAdjust = new HashMap<>(data);
+ //���������������������
+ Map<String, Object> result = new HashMap<>();
String mac = data.remove("mac").toString();
+ //������mac������������
+ Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
+ Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
+ Integer version = (Integer) versionInfo.get("id");
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
- Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
- result.put("time", time);
+ result.put("time", DateUtils.addHours(time, -1));
result.put("version", version);
- result.put("timeUnits", Constants.UN_ADJUST);
+ result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);
result.put("value", JSONObject.toJSONString(data));
//������������������insert
historyHourlyMapper.insertHistoryHourly(result);
@@ -55,13 +64,9 @@
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- HistoryHourly historyHourly = new HistoryHourly();
- historyHourly.setMac(mac);
- historyHourly.setTime(time);
- historyHourly.setVersion(version);
- historyHourly.setValue(JSONObject.toJSONString(dataAdjust));
-
//������������������insert
- historyHourlyMapper.insert(historyHourly);
+ result.put("timeUnits", yearAndMonth);
+ result.put("value", JSONObject.toJSONString(dataAdjust));
+ historyHourlyMapper.insertHistoryHourly(result);
}
}
--
Gitblit v1.8.0