From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 461bfea..6628fe1 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -287,7 +287,7 @@
if (sensorUnits.containsKey(sensorKey)) {
Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
String rules = sensorUnit.get("rules").toString();
- rules = rules.replace("d", "").replace("{0}", "sensorKeyValue");
+ rules = rules.replace("d", "").replace("{0}", "value");
Expression expression = AviatorEvaluator.compile(rules);
Map<String, Object> env = new HashMap<String, Object>();
env.put("value", Double.valueOf(sensorKeyValue.toString()));
--
Gitblit v1.8.0