From 1ab0b018c6d0b5a12b5310ae23f37cb9e5a2887b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 10:07:42 +0800
Subject: [PATCH] update
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 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 9339dc2..4dfe2bb 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.GovMonitorPointService;
+import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.LogUtils;
@@ -70,6 +72,9 @@
@Autowired
private SysDictDataMapper sysDictDataMapper;
+
+ @Autowired
+ private SysDictDataService sysDictDataService;
@Autowired
private LogUtils logUtils;
@@ -387,6 +392,15 @@
mpInfo.put("provinceCode", monitorPoint.getProvinceCode());
deviceInfo.put("monitorPoint", mpInfo);
+ //������������
+ Map<String, Object> govMpInfo = new LinkedHashMap<>();
+ GovMonitorPoint govMonitorPoint = device.getGovMonitorPoint();
+ if (govMonitorPoint != null) {
+ govMpInfo.put("guid", device.getGovMonitorPoint().getGuid());
+ govMpInfo.put("name", device.getGovMonitorPoint().getName());
+ }
+ deviceInfo.put("govMonitorPoint", govMpInfo);
+
setDeviceInfoToRedis(mac, deviceInfo);
return deviceInfo;
}
@@ -427,14 +441,14 @@
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);
+ //���������������������������������
+ Map<String, Object> govMpInfo = (Map) deviceInfo.get("govMonitorPoint");
+ if (ObjectUtils.isEmpty(govMpInfo.get("guid"))) {
+ return deviceData;
}
+ String guid = (String) govMpInfo.get("guid");
+ //���������������aqi������
+ Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, guid);
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
deviceData.remove("DataTime");
@@ -448,8 +462,8 @@
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();
+ 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);
@@ -513,20 +527,37 @@
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());
@@ -538,6 +569,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