update

jinpengyong

2021-07-01 caf3b68eaf742784b4b3ca995a34e542d1f91695

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

@@ -61,6 +61,9 @@
        QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>();
        historyDailyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).lt("time", DateUtils.dateToDateString(now));
        List<Map<String, Object>> weeklyData = historyDailyService.listMaps(historyDailyQueryWrapper);
        if (weeklyData.size() == 0) {
            return;
        }

        //按mac分组
        Map<String, List<Map<String, Object>>> data = weeklyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac")));
@@ -86,7 +89,7 @@
                jsonMap.put(Constants.SENSOR_CODE_CO, coAvg);
            }

            //CO 90百分位计算并修约
            //O3 90百分位计算并修约
            Object o3Avg = AmendUtils.getO3AvgOfWeek(value);
            if (o3Avg != null) {
                jsonMap.put(Constants.SENSOR_CODE_O3, o3Avg);