From f28149d8183a62f87fa9c8df9ae589070d83f612 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 24 Dec 2020 13:47:50 +0800
Subject: [PATCH] 波动补偿
---
src/main/java/com/moral/webSocketServer/ElectronicSWebSocketServer.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/ElectronicSWebSocketServer.java b/src/main/java/com/moral/webSocketServer/ElectronicSWebSocketServer.java
index 31949a5..cedb59a 100644
--- a/src/main/java/com/moral/webSocketServer/ElectronicSWebSocketServer.java
+++ b/src/main/java/com/moral/webSocketServer/ElectronicSWebSocketServer.java
@@ -138,11 +138,18 @@
JexlExpression jexlExpression = jexlEngine.createExpression(s);
Object evaluate = jexlExpression.evaluate(null);
BigDecimal bg = new BigDecimal(evaluate.toString());
- value = bg.setScale(3, BigDecimal.ROUND_HALF_UP).toString();
+ value = bg.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
reMap.put(sensor.getName(), value+sensorUnits.get(0).getName());
}
}else {
- reMap.put(sensor.getName(), value+sensor.getUnit());
+ if (sensor.getName().equals("���������������������(TVOC)")){
+ BigDecimal bg = new BigDecimal(Double.parseDouble(value)*2.5);
+ value = bg.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
+ reMap.put(sensor.getName(), value+sensor.getUnit());
+ }else {
+ reMap.put(sensor.getName(), value+sensor.getUnit());
+ }
+
}
break;
}else {
--
Gitblit v1.8.0