From 9d91dc402f279630eaa100024fd3b1542fbeb41c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 11:04:41 +0800
Subject: [PATCH] 分钟，5分钟，小时表存入非本月数据bug修复
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 44 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 f3d42c9..03a4812 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
@@ -12,6 +12,8 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.OrganizationService;
+import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.LogUtils;
@@ -38,6 +40,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -72,7 +75,8 @@
private SysDictDataMapper sysDictDataMapper;
@Autowired
- private LogUtils logUtils;
+ private SysDictDataService sysDictDataService;
+
@Autowired
private RedisTemplate redisTemplate;
@@ -84,27 +88,33 @@
private VersionSensorUnitMapper versionSensorUnitMapper;
@Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
private AdjustDataUtils adjustDataUtils;
+
+ @Autowired
+ private OrganizationService organizationService;
/*
* ���redis������������������
* */
private Map<String, Object> getDeviceInfoFromRedis(String mac) {
- return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE + mac);
+ return (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
}
/*
* ������������������redis
*/
private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) {
- redisTemplate.opsForValue().set(RedisConstants.DEVICE + mac, deviceInfo);
+ redisTemplate.opsForHash().put(RedisConstants.DEVICE, mac, deviceInfo);
}
/*
* ���redis������������������
*/
private void delDeviceInfoFromRedis(String mac) {
- redisTemplate.delete(RedisConstants.DEVICE + mac);
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE, mac);
}
@Override
@@ -123,12 +133,12 @@
//������������������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);
- logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@Override
@@ -146,12 +156,12 @@
Integer orgId = device.getOrganizationId();
deleteOrganizationUnitAlarm(orgId, versionId);
//������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);
- logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -177,16 +187,16 @@
insertOrganizationUnitAlarm(newOrgId, newVersionId);
}
//���redis���������������������
- delDeviceInfoFromRedis(mac);
+ delDeviceInfoFromRedis(oldDevice.getMac());
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();
- 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 +213,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) {
@@ -211,7 +221,7 @@
}
}
- logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
@Override
@@ -235,8 +245,14 @@
@Override
public List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId) {
+ //���������������������
+ List<Organization> organizations = organizationService.getAllChildrenOrganization(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("id", "name").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.select("id", "name")
+ .eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", orgIds);
return monitorPointMapper.selectMaps(queryWrapper);
}
@@ -262,9 +278,13 @@
Object orgId = parameters.get("organizationId");
Object mpId = parameters.get("monitorPointId");
- //������������������������������
+ //������������������������������,���������������
if (orgId != null) {
- queryWrapper.eq("organization_id", orgId);
+ //���������������������
+ List<Organization> organizations = organizationService.getAllChildrenOrganization(Integer.parseInt(orgId.toString()));
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(Integer.parseInt(orgId.toString()));
+ queryWrapper.in("organization_id", orgIds);
}
//������������������������������
@@ -272,14 +292,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //���������������������
- if (name != null) {
- queryWrapper.like("name", name);
- }
-
- //mac������������
- if (mac != null) {
- queryWrapper.like("mac", mac);
+ //���������������mac������������
+ if (name != null && mac != null) {
+ queryWrapper.like("name", name).or().like("mac", mac);
}
//������������,������create_time������
@@ -333,9 +348,11 @@
//������������
deviceInfo.put("extend", device.getExtend());
+ //������������������
+ deviceInfo.put("town", device.getTown());
+
//������
- deviceInfo.put("profession", device.getProfession());
- deviceInfo.put("professionName", device.getProfessionName());
+ deviceInfo.put("professions", device.getProfessions());
//������
deviceInfo.put("tech", device.getTech());
@@ -384,6 +401,16 @@
mpInfo.put("provinceCode", monitorPoint.getProvinceCode());
deviceInfo.put("monitorPoint", mpInfo);
+ //������������
+ Map<String, Object> govMpInfo = new LinkedHashMap<>();
+
+ govMpInfo.put("guid", null);
+ govMpInfo.put("name", null);
+ if (device.getGovMonitorPoint() != null) {
+ govMpInfo.put("guid", device.getGovMonitorPoint().getGuid());
+ govMpInfo.put("name", device.getGovMonitorPoint().getName());
+ }
+ deviceInfo.put("govMonitorPoint", govMpInfo);
setDeviceInfoToRedis(mac, deviceInfo);
return deviceInfo;
}
@@ -405,7 +432,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,25 +446,44 @@
@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");
- Object areaCode = monitorPoint.get("areaCode");
- Object cityCode = monitorPoint.get("cityCode");
-
- Map<String, Object> aqiMap = redisTemplate.opsForHash().entries(RedisConstants.AQI_DATA + areaCode);
- if (ObjectUtils.isEmpty(aqiMap)) {
- aqiMap = redisTemplate.opsForHash().entries(RedisConstants.AQI_DATA + cityCode);
+ //������������������������������������
+ Map<String, Object> govMpInfo = (Map<String, Object>) deviceInfo.get("govMonitorPoint");
+ Map<String, Object> aqiMap = null;
+ if (govMpInfo.get("guid") != null) {
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
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);
+ String areaCode = organization.getAreaCode().toString();
+ String cityCode = organization.getCityCode().toString();
+ 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;
+ }
+
+ @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);
@@ -451,19 +497,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("%.4f", sensorValue));
+ double value = Double.parseDouble(sensorValue);
//������������
if (formula != null) {
//������������������
sensorValue = formula.replace("{0}", sensorValue);
expression = AviatorEvaluator.compile(sensorValue);
- value = Double.parseDouble(String.format("%.4f", expression.execute()));
+ value = Double.parseDouble(expression.execute().toString());
}
int sensorState = judgeState(list, value);
if (sensorState > state) {
@@ -472,37 +518,54 @@
}
//������������������
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;
}
+ /**
+ * @Description: ���������������������������������������������������������������������������������������������
+ * @Param: [orgId, versionId]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/9/6
+ */
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);
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);
List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
+ //������������������������������������
+ Map<String, SysDictData> sensorAlarms = sysDictDataService.getDictDatasByType("defaultAlarm");
if (!ObjectUtils.isEmpty(versionSensorUnits)) {
for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ String sensorCode = versionSensorUnit.getSensorCode();
+ //���������������������
+ SysDictData alarm = sensorAlarms.get(sensorCode);
+ if (alarm != null)
+ organizationUnitAlarm.setAlarmLevel(alarm.getDataValue());
organizationUnitAlarm.setOrganizationId(orgId);
organizationUnitAlarm.setVersionId(versionId);
organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
@@ -514,6 +577,13 @@
}
}
+ /**
+ * @Description: ������������������������������������������������������������������������������������������������������������������������������������
+ * @Param: [orgId, versionId]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/9/6
+ */
private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
queryOrganizationVersionWrapper.eq("organization_id", orgId);
--
Gitblit v1.8.0