From faf8649ff22b8af12c758355725389204838e02a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 05 Aug 2021 13:23:54 +0800
Subject: [PATCH] 小时缺失数据补充定时任务
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 127 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 65 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 4af7aef..c7916b7 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
@@ -34,12 +34,10 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -92,38 +90,21 @@
* ���redis������������������
* */
private Map<String, Object> getDeviceInfoFromRedis(String mac) {
- return (Map<String, Object>) redisTemplate.opsForValue().get(getDeviceKey(mac));
+ return (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
}
/*
* ������������������redis
*/
private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) {
- redisTemplate.opsForValue().set(getDeviceKey(mac), deviceInfo);
+ redisTemplate.opsForHash().put(RedisConstants.DEVICE, mac, deviceInfo);
}
/*
* ���redis������������������
*/
private void delDeviceInfoFromRedis(String mac) {
- redisTemplate.delete(getDeviceKey(mac));
- }
-
- /*
- * ���������������������redis������key
- */
- private String getDeviceKey(String mac) {
- return keysConnect(RedisConstants.DEVICE, mac);
- }
-
- //redis key������
- private String keysConnect(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().toLowerCase();
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE, mac);
}
@Override
@@ -134,7 +115,7 @@
deviceMapper.insert(device);
Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
//���������������������������
- insertOrganizationUnitAlarm(orgId,device.getDeviceVersionId());
+ insertOrganizationUnitAlarm(orgId, device.getDeviceVersionId());
//������������������������redis
String mac = device.getMac();
//���redis���������������������
@@ -142,11 +123,11 @@
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
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);
}
@@ -163,9 +144,9 @@
//���������������������������
Integer versionId = device.getDeviceVersionId();
Integer orgId = device.getOrganizationId();
- deleteOrganizationUnitAlarm(orgId,versionId);
+ deleteOrganizationUnitAlarm(orgId, versionId);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -179,7 +160,7 @@
Integer deviceId = device.getId();
Device oldDevice = deviceMapper.selectById(deviceId);
//���������������������������������������������������������������������������������id������������
- if(!ObjectUtils.isEmpty(device.getMonitorPointId())){
+ if (!ObjectUtils.isEmpty(device.getMonitorPointId())) {
MonitorPoint monitorPoint = monitorPointMapper.selectById(device.getMonitorPointId());
device.setOrganizationId(monitorPoint.getOrganizationId());
}
@@ -187,21 +168,21 @@
Device updateDevice = deviceMapper.selectById(deviceId);
String mac = updateDevice.getMac();
//���������������������������
- Integer oldOrgId = oldDevice.getOrganizationId();
- Integer newOrgId = updateDevice.getOrganizationId();
- Integer oldVersionId = oldDevice.getDeviceVersionId();
- Integer newVersionId = updateDevice.getDeviceVersionId();
- if(!oldOrgId.equals(newOrgId)||!oldVersionId.equals(newVersionId)){
- deleteOrganizationUnitAlarm(oldOrgId,oldVersionId);
- insertOrganizationUnitAlarm(newOrgId,newVersionId);
- }
+ Integer oldOrgId = oldDevice.getOrganizationId();
+ Integer newOrgId = updateDevice.getOrganizationId();
+ Integer oldVersionId = oldDevice.getDeviceVersionId();
+ Integer newVersionId = updateDevice.getDeviceVersionId();
+ if (!oldOrgId.equals(newOrgId) || !oldVersionId.equals(newVersionId)) {
+ deleteOrganizationUnitAlarm(oldOrgId, oldVersionId);
+ insertOrganizationUnitAlarm(newOrgId, newVersionId);
+ }
//���redis���������������������
delDeviceInfoFromRedis(mac);
Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -222,7 +203,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) {
@@ -438,10 +419,26 @@
@Override
public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData) {
- return adjustDataUtils.adjust(deviceData);
+ String mac = deviceData.get("mac").toString();
+ //���redis������������������
+ 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");
+ Object areaCode = monitorPoint.get("areaCode");
+ Object cityCode = monitorPoint.get("cityCode");
+
+ 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);
+ }
+ return deviceData;
}
@Override
+ @Transactional
public void judgeDeviceState(Map<String, Object> deviceData) {
String mac = deviceData.remove("mac").toString();
Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
@@ -455,19 +452,19 @@
if (StringUtils.isEmpty(alarmLevel)) {
continue;
}
- List<Double> list = JSONObject.parseObject(alarmLevel, List.class);
+ List<Object> list = JSONObject.parseObject(alarmLevel, List.class);
String sensorCode = sensor.getCode();
//������������
String formula = sensor.getFormula();
//������������������������
String sensorValue = (String) deviceData.get(sensorCode);
- double value = Double.parseDouble(String.format("%.3f", sensorValue));
+ double value = Double.parseDouble(sensorValue);
//������������
if (formula != null) {
//������������������
sensorValue = formula.replace("{0}", sensorValue);
expression = AviatorEvaluator.compile(sensorValue);
- value = Double.parseDouble(String.format("%.3f", expression.execute()));
+ value = Double.parseDouble(expression.execute().toString());
}
int sensorState = judgeState(list, value);
if (sensorState > state) {
@@ -476,35 +473,35 @@
}
//������������������
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id", device.getId()).set("state", state);
+ updateWrapper.eq("id", device.getId()).set("state", String.valueOf(state));
deviceMapper.update(null, updateWrapper);
}
//���������������������������
- private int judgeState(List<Double> levels, Double data) {
+ private int judgeState(List<Object> levels, Double data) {
int state = 1;
for (int i = levels.size() - 1; i >= 0; i--) {
- Double level = levels.get(i);
+ Double level = Double.parseDouble(levels.get(i).toString());
if (data >= level) {
- state = i + 2;
+ state = i + 1;
break;
}
}
return state;
}
- private void insertOrganizationUnitAlarm(Integer orgId,Integer versionId){
+ private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) {
QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
- queryOrganizationVersionWrapper.eq("organization_id",orgId);
- queryOrganizationVersionWrapper.eq("version_id",versionId);
- queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryOrganizationVersionWrapper.eq("organization_id", orgId);
+ queryOrganizationVersionWrapper.eq("version_id", versionId);
+ queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper);
- if(ObjectUtils.isEmpty(organizationUnitAlarms)){
- QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper =new QueryWrapper<>();
- queryVersionSensorUnitWrapper.eq("version_id",versionId);
- queryVersionSensorUnitWrapper.eq("is_delete",Constants.NOT_DELETE);
+ if (ObjectUtils.isEmpty(organizationUnitAlarms)) {
+ QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper = new QueryWrapper<>();
+ queryVersionSensorUnitWrapper.eq("version_id", versionId);
+ queryVersionSensorUnitWrapper.eq("is_delete", Constants.NOT_DELETE);
List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
- if(!ObjectUtils.isEmpty(versionSensorUnits)){
+ if (!ObjectUtils.isEmpty(versionSensorUnits)) {
for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setOrganizationId(orgId);
@@ -518,19 +515,19 @@
}
}
- private void deleteOrganizationUnitAlarm(Integer orgId,Integer versionId){
+ private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
- queryOrganizationVersionWrapper.eq("organization_id",orgId);
- queryOrganizationVersionWrapper.eq("device_version_id",versionId);
- queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryOrganizationVersionWrapper.eq("organization_id", orgId);
+ queryOrganizationVersionWrapper.eq("device_version_id", versionId);
+ queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
List<Device> devices = deviceMapper.selectList(queryOrganizationVersionWrapper);
- if(ObjectUtils.isEmpty(devices)){//������������������������������������������������������
+ if (ObjectUtils.isEmpty(devices)) {//������������������������������������������������������
UpdateWrapper deleteWrapper = new UpdateWrapper();
- deleteWrapper.eq("organization_id",orgId);
- deleteWrapper.eq("version_id",versionId);
- deleteWrapper.eq("is_delete",Constants.NOT_DELETE);
- deleteWrapper.set("is_delete",Constants.DELETE);
- organizationUnitAlarmMapper.update(null,deleteWrapper);
+ deleteWrapper.eq("organization_id", orgId);
+ deleteWrapper.eq("version_id", versionId);
+ deleteWrapper.eq("is_delete", Constants.NOT_DELETE);
+ deleteWrapper.set("is_delete", Constants.DELETE);
+ organizationUnitAlarmMapper.update(null, deleteWrapper);
}
}
}
--
Gitblit v1.8.0