修改特殊设备更新接口

lizijie

2021-12-28 d620e65b30db7bc43db71d26fbce36548819eebc

 screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java

@@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import com.alibaba.fastjson.JSON;
import com.googlecode.aviator.AviatorEvaluator;
@@ -23,7 +24,7 @@
    /**
     * @param deviceData    设备数据
     * @param adjustFormula 校准公式
     * @param aqiMap        设备所在地区对应的墨迹aqi数据
     * @param aqiMap        与设备绑定的国控站点aqi数据
     * @return Map<String, Object> 校准后数据
     */
    public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap) {
@@ -40,11 +41,14 @@
                        deviceData.put(key, measuredValue);
                        continue;
                    }

                    //根据时间段筛选校准公式
                    DeviceAdjustValue deviceAdjustValue = sensorFormulas.stream()
                    DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
                    Optional<DeviceAdjustValue> optional = sensorFormulas.stream()
                            .filter(o -> o.getStartTime().getTime() <= finalTime && o.getEndTime().getTime() > finalTime)
                            .findFirst().get();
                            .findFirst();
                    if (optional.isPresent()) {
                        deviceAdjustValue = optional.get();
                    }
                    String formula = deviceAdjustValue.getValue();
                    if (StringUtils.isEmpty(formula)) {
                        deviceData.put(key, measuredValue);
@@ -78,7 +82,6 @@
            }
        } catch (Exception e) {
            log.error("param[0] deviceData:" + JSON.toJSONString(deviceData));
            log.error(e.getMessage());
        }
        return deviceData;
    }