From 16500ff805484fb876ff9736d21021b242f1d7cd Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 09:03:55 +0800
Subject: [PATCH] screen-manage 添加websocket实时界面
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 fcf29d3..6e0e9b3 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
@@ -123,7 +123,7 @@
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -146,7 +146,7 @@
Integer orgId = device.getOrganizationId();
deleteOrganizationUnitAlarm(orgId, versionId);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -182,7 +182,7 @@
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
//������deviceInfo������
- CacheUtils.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -457,13 +457,13 @@
String formula = sensor.getFormula();
//������������������������
String sensorValue = (String) deviceData.get(sensorCode);
- double value = Double.parseDouble(String.format("%.3f", sensorValue));
+ double value = Double.parseDouble(String.format("%.4f", sensorValue));
//������������
if (formula != null) {
//������������������
sensorValue = formula.replace("{0}", sensorValue);
expression = AviatorEvaluator.compile(sensorValue);
- value = Double.parseDouble(String.format("%.3f", expression.execute()));
+ value = Double.parseDouble(String.format("%.4f", expression.execute()));
}
int sensorState = judgeState(list, value);
if (sensorState > state) {
--
Gitblit v1.8.0