jinpengyong
2022-12-14 0c4fa637138a38e1d6fa825122ee369dbc5920e4
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -5,6 +5,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -77,14 +78,15 @@
                        if (aqiMap != null) {
                            aqiValue = aqiMap.get(key);
                        }
                        env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
                        env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : new BigDecimal(String.valueOf(aqiValue)).floatValue());
                    }
                    if (formula.contains("vocs")) {
                        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")) {
                        env.put("cel", Float.parseFloat((String) measuredValue));
                        //env.put("cel", Float.parseFloat((String) measuredValue));
                        env.put("cel", new BigDecimal(String.valueOf(measuredValue)).floatValue());
                    }
                    //校准
                    measuredValue = expression.execute(env);