From 37c937a9a1f5e4d0c66764ded694ad29a4bc8cd0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 20 Aug 2023 14:17:41 +0800
Subject: [PATCH] fix:部分配置修改
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index 021bf30..eda029a 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -92,10 +92,13 @@
Object vocsValue = ObjectUtils.isEmpty(deviceData.get(Constants.SENSOR_CODE_VOCS)) ? 0F : deviceData.get(Constants.SENSOR_CODE_VOCS);
env.put("vocs", vocsValue);
}
- if (formula.contains("cel")) {
+ if (formula.contains("ce1")) {
//env.put("cel", Float.parseFloat((String) measuredValue));
+ env.put("ce1", new BigDecimal(String.valueOf(measuredValue)).floatValue());
+ }else if(formula.contains("cel")){
env.put("cel", new BigDecimal(String.valueOf(measuredValue)).floatValue());
}
+
//������
measuredValue = expression.execute(env);
//������������
--
Gitblit v1.8.0