lizijie
2019-07-03 9eee07eb60fac7b8d13b4521fc9ef7019d4a60f5
src/main/java/com/moral/controller/ScreenController.java
@@ -1010,11 +1010,9 @@
               if(sensorUnitMap!=null && !sensorUnitMap.isEmpty()) {
                  if(sensorUnitMap.get(string)!=null) {
                     units.add(sensorUnitMap.get(string).get("name").toString());
                     System.out.println("ScreenController-----AIForecast-----map2:"+string+":"+map.get(string));
                     String rules = sensorUnitMap.get(string).get("rules").toString();
                     rules = rules.replace("{0}", "a");
                     rules = rules.replace("d", "");
                     System.out.println(rules);
                     Expression expression = AviatorEvaluator.compile(rules);
                     Double value;
                     Map<String, Object> ev = new HashMap<>();
@@ -1023,8 +1021,6 @@
                     //保留两位小数
                     DecimalFormat df = new DecimalFormat("#.00");
                     value = Double.parseDouble(df.format(value));
                     System.out.println(map.get(string));
                     System.out.println(value);
                     values.add(value);
                  }else {
                     Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);