update

jinpengyong

2021-07-01 caf3b68eaf742784b4b3ca995a34e542d1f91695

update

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

@@ -64,6 +64,9 @@
        QueryWrapper<HistoryHourly> historyHourlyQueryWrapper = new QueryWrapper<>();
        historyHourlyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).le("time", DateUtils.dateToDateString(end));
        List<Map<String, Object>> dailyData = historyHourlyService.listMaps(historyHourlyQueryWrapper);
        if (dailyData.size() == 0) {
            return;
        }

        //按mac分组
        Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac")));

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

@@ -64,6 +64,10 @@

        //获取所有设备的5分钟数据
        List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params);
        if (fiveMinutelyData.size() == 0) {
            return;
        }

        //按mac分组
        Map<String, List<Map<String, Object>>> data = fiveMinutelyData.parallelStream()
                .collect(Collectors.groupingBy(o -> (String) o.get("mac")));

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

@@ -62,7 +62,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")));


 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")));

 screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml

@@ -10,7 +10,7 @@
    </resultMap>

    <insert id="insertHistoryMonthly">
        INSERT INTO history_weekly
        INSERT INTO history_monthly
        VALUES
        <foreach collection="list" item="item" separator=",">
            (#{item.mac},#{item.time},#{item.value})