From 411fa85361e5f4d4094f25a2eaeb0f619f475fce Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 23 Sep 2021 11:16:53 +0800
Subject: [PATCH] 日数据定时任务update
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 76 insertions(+), 17 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 5d4d805..8d26374 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,7 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.LogUtils;
@@ -72,6 +73,9 @@
private SysDictDataMapper sysDictDataMapper;
@Autowired
+ private SysDictDataService sysDictDataService;
+
+ @Autowired
private LogUtils logUtils;
@Autowired
@@ -82,6 +86,9 @@
@Autowired
private VersionSensorUnitMapper versionSensorUnitMapper;
+
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
@Autowired
private AdjustDataUtils adjustDataUtils;
@@ -127,7 +134,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 +184,7 @@
insertOrganizationUnitAlarm(newOrgId, newVersionId);
}
//���redis���������������������
- delDeviceInfoFromRedis(mac);
+ delDeviceInfoFromRedis(oldDevice.getMac());
Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
@@ -186,7 +193,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 +210,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) {
@@ -384,6 +391,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 +422,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,21 +436,39 @@
@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> 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;
}
@@ -452,19 +487,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) {
@@ -473,37 +508,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());
@@ -515,6 +567,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