Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

 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()));