From 659b91b554ba5e98b6fffa045231f5aa3fb4ab9e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 03 Sep 2021 15:21:48 +0800
Subject: [PATCH] 因子默认单位添加；角色、菜单更新
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 216be2a..51167ed 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,7 +1,9 @@
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;
@@ -12,6 +14,7 @@
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
+ @Transactional
public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> dataAdjust = new HashMap<>(data);
- Object mac = data.remove("mac");
+ 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", data.remove("ver"));
+ result.put("version", version);
+
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
result.put("time", time);
result.put("value", JSONObject.toJSONString(data));
String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
- result.put("timeUnits", tableSuffix(timeUnits, Constants.UN_ADJUST));
+ result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST);
//���������������������������
historyMinutelyMapper.insertHistoryMinutely(result);
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- dataAdjust.remove("mac");
- dataAdjust.remove("DataTime");
- dataAdjust.remove("ver");
result.put("timeUnits", timeUnits);
result.put("value", JSONObject.toJSONString(dataAdjust));
historyMinutelyMapper.insertHistoryMinutely(result);
-
-
- }
-
- //���������
- 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