From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
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 6df638c..5fac9b4 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
@@ -1,17 +1,20 @@
package com.moral.api.service.impl;
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.util.Date;
import java.util.HashMap;
import java.util.Map;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.moral.api.mapper.HistoryMinutelyMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryMinutelyService;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@Service
@@ -23,41 +26,36 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
- public void insertHistoryMinutely(Map<String, Object> deviceData) {
+ @Transactional
+ public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
- Object mac = deviceData.remove("mac");
+ Map<String, Object> dataAdjust = new HashMap<>(data);
+ 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");
+
result.put("mac", mac);
- result.put("version", deviceData.remove("ver"));
- Date time = new Date((Long) deviceData.remove("DataTime"));
- result.put("time", DateUtils.dateToDateString(time));
- result.put("value", JSON.toJSONString(deviceData));
- String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
- result.put("timeUnits", tableSuffix(timeUnits, Constants.UN_ADJUST));
- //���������
+ result.put("version", version);
+
+ Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ result.put("time", DateUtils.getDateOfMin(time, -1));
+ result.put("value", JSONObject.toJSONString(data));
+ String timeUnits = DateUtils.dateToDateString(DateUtils.getDateOfMin(time, -1), DateUtils.yyyyMM_EN);
+ result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST);
+
+ //���������������������������
historyMinutelyMapper.insertHistoryMinutely(result);
- //������������
- Map<String, Object> deviceInfo = deviceService.getDeviceByMac(mac.toString());
-
- //���������������������������������������
+ //������������
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust);
result.put("timeUnits", timeUnits);
- deviceData = deviceService.adjustDeviceData(deviceData, deviceInfo);
- result.put("value", JSON.toJSONString(deviceData));
+ result.put("value", JSONObject.toJSONString(dataAdjust));
historyMinutelyMapper.insertHistoryMinutely(result);
-
- //������������������
- Map<String, Object> deviceState = deviceService.judgeDeviceState(deviceData, deviceInfo);
}
-
- //���������
- private String tableSuffix(String... keys) {
- StringBuilder key = new StringBuilder(keys[0]);
- for (int i = 1; i < keys.length; i++) {
- key.append("_");
- key.append(keys[i]);
- }
- return key.toString();
- }
-
}
--
Gitblit v1.8.0