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/HistoryHourlyServiceImpl.java | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 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 ba88b76..8643c9a 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,18 +1,19 @@
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;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +27,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,40 +35,45 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
@Transactional
public void insertHistoryHourly(Map<String, Object> data) {
+ //������������������
Map<String, Object> dataAdjust = new HashMap<>(data);
- String mac = data.remove("mac").toString();
-
- Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
- Integer version = (Integer) data.remove("ver");
+ //���������������������
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");
+ //���������������
+ String time1 = data.get("time").toString();
+ long l = Long.parseLong(time1);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
+ String format1 = dateFormat.format(l);
+ Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+// Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
+
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));
- //���������������������������
- historyHourlyMapper.insertHistoryHourlyUnAdjust(result);
+ //������������������insert
+ historyHourlyMapper.insertHistoryHourly(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- dataAdjust.remove("mac");
- dataAdjust.remove("DataTime");
- dataAdjust.remove("ver");
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2");
- int count = historyHourlyMapper.getCountByMacAndTime(mac, DateUtils.dateToDateString(time));
-
- //���������������������������mac,���������������������������������������������������
- if (count == 0) {
- //������������������������������������������
- result.put("value", JSONObject.toJSONString(dataAdjust));
- //������
- historyHourlyMapper.insertHistoryHourlyTransition(result);
- } else {
- //������
- historyHourlyMapper.updateHistoryTransition(mac, DateUtils.dateToDateString(time));
- }
+ //������������������insert
+ result.put("timeUnits", yearAndMonth);
+ result.put("value", JSONObject.toJSONString(dataAdjust));
+ historyHourlyMapper.insertHistoryHourly(result);
}
}
--
Gitblit v1.8.0