From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 26 Aug 2021 11:33:56 +0800
Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
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 4a8b3f6..9339dc2 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
@@ -84,6 +84,9 @@
private VersionSensorUnitMapper versionSensorUnitMapper;
@Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
private AdjustDataUtils adjustDataUtils;
/*
@@ -127,7 +130,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(device.getName()).append("���").append("mac���").append(mac);
+ content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@@ -177,7 +180,7 @@
insertOrganizationUnitAlarm(newOrgId, newVersionId);
}
//���redis���������������������
- delDeviceInfoFromRedis(mac);
+ delDeviceInfoFromRedis(oldDevice.getMac());
Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
@@ -186,7 +189,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(mac).append("���");
+ content.append("������������������" + oldDevice.getMac()).append("==>").append(mac).append("���");
Field[] fields = Device.class.getDeclaredFields();
for (Field field : fields) {
if (field.getName().equals("id")) {
@@ -203,7 +206,7 @@
Object o1 = method.invoke(oldDevice);
Object o2 = method.invoke(device);
if (o2 != null) {
- content.append(fieldName).append("���").append(o1).append("-->").append(o2).append("���");
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
}
} catch (Exception e) {
@@ -405,7 +408,7 @@
@Override
public Map<String, Object> getDeviceByMac(String mac) {
Map<String, Object> deviceInfo = getDeviceInfoFromRedis(mac);
- if (deviceInfo == null) {
+ if (ObjectUtils.isEmpty(deviceInfo)) {
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mac", mac).eq("is_delete", Constants.NOT_DELETE);
Device device = deviceMapper.selectOne(queryWrapper);
@@ -419,9 +422,9 @@
@Override
public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData) {
- String mac = deviceData.get("mac").toString();
+ String mac = deviceData.remove("mac").toString();
//���redis������������������
- Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + mac);
+ Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
Map<String, Object> deviceInfo = getDeviceByMac(mac);
Map<String, Object> monitorPoint = (Map<String, Object>) deviceInfo.get("monitorPoint");
@@ -434,6 +437,26 @@
}
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
+ deviceData.remove("DataTime");
+ return deviceData;
+ }
+
+ @Override
+ public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
+ String mac = deviceData.remove("mac").toString();
+ //���redis������������������
+ Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
+ if (!ObjectUtils.isEmpty(adjustFormula)) {
+ Organization organization = specialDeviceMapper.selectOrgByMac(mac);
+ Integer areaCode = organization.getAreaCode();
+ Integer cityCode = organization.getCityCode();
+ Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
+ if (ObjectUtils.isEmpty(aqiMap)) {
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
+ }
+ return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
+ }
+ deviceData.remove("DataTime");
return deviceData;
}
--
Gitblit v1.8.0