From 6dcf70e1e2d01a52ac3f06005f46de62eab09856 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 26 Jul 2021 14:16:12 +0800
Subject: [PATCH] 添加注释
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..ac7001a 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
@@ -452,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("%.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) {
@@ -478,12 +478,12 @@
}
//���������������������������
- 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;
}
}
--
Gitblit v1.8.0