screen-aqi 增加周数据实体

kaiyu

2021-09-30 6fa2f3579a751f78d4b8da9f9808d6f86da9cbf8

 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -88,7 +88,7 @@
        data.forEach((key, value) -> {
            Map<String, Object> dataMap = new HashMap<>();
            dataMap.put("mac", key);
            dataMap.put("time", end);
            dataMap.put("time", start);
            Map<String, Object> jsonMap = new HashMap<>();


@@ -150,12 +150,12 @@
                            //剔除数据超过上下限的数据
                            double aDouble = Double.parseDouble(sensorValue.toString());
                            if (!ObjectUtils.isEmpty(upper)) {
                                if (aDouble < upper) {
                                if (aDouble > upper) {
                                    return null;
                                }
                            }
                            if (!ObjectUtils.isEmpty(lower)) {
                                if (aDouble > lower) {
                                if (aDouble < lower) {
                                    return null;
                                }
                            }