forked from moral

parent: 55621908 | patch | commit | show whitespace
jinpengyong
2021-12-28 03791ab057f15d102bc20b83c687f8a8028a4b8f 
行业贡献率update
1 files modified
27 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java 27 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java


@@ -187,7 +187,7 @@




        List<String> timeLag = DateUtils.getTimeLag(time);




        //本市月所有日数据


        //本市本年所有月数据


        QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();


        cityAqiMonthlyQueryWrapper.select("time", "value")


                .eq("city_code", locationLevelCode)


@@ -201,7 +201,7 @@


        }






        //所有设备本月所有日数据


        //所有设备本年所有月数据


        List<HistoryMonthly> allDeviceData = historyMonthlyService.getValueByMacs(allMacs, time);


        //按time分组


        Map<String, List<HistoryMonthly>> allDeviceDataMap = allDeviceData.stream()


@@ -249,7 +249,7 @@


            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());






            //该行业设备当天小时数据


            //该行业设备本年所有月数据


            List<HistoryMonthly> professionDeviceData = historyMonthlyService.getValueByMacs(professionMacs, time);


            //按time分组


            Map<String, List<HistoryMonthly>> professionDataMap = professionDeviceData.stream()


@@ -257,7 +257,7 @@






            for (Map<String, Object> map : result) {


                Object allDeviceSum = map.remove("allDeviceSum");


                Object allDeviceSum = map.get("allDeviceSum");


                String resultTime = map.get("time").toString();


                List<HistoryMonthly> historyMonthlyList = professionDataMap.get(resultTime);


                //贡献率


@@ -280,6 +280,7 @@


                map.put(profession, professionMap);


            }


        }


        result.forEach(map -> map.remove("allDeviceSum"));


        return result;


    }




@@ -300,7 +301,7 @@


        List<String> timeLag = DateUtils.getTimeLag(time);






        //本市月所有日数据


        //本市本月所有日数据


        QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();


        cityAqiDailyQueryWrapper.select("time", "value")


                .eq("city_code", locationLevelCode)


@@ -314,7 +315,7 @@


        }






        //所有设备月日数据


        //所有设备本月所有日数据


        List<HistoryDaily> allDeviceData = historyDailyService.getValueByMacs(allMacs, time);


        //按time分组


        Map<String, List<HistoryDaily>> allDeviceDataMap = allDeviceData.stream()


@@ -361,7 +362,7 @@


            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());






            //该行业设备当天小时数据


            //该行业设备本月所有日数据


            List<HistoryDaily> professionDeviceData = historyDailyService.getValueByMacs(professionMacs, time);


            //按time分组


            Map<String, List<HistoryDaily>> professionDataMap = professionDeviceData.stream()


@@ -369,7 +370,7 @@






            for (Map<String, Object> map : result) {


                Object allDeviceSum = map.remove("allDeviceSum");


                Object allDeviceSum = map.get("allDeviceSum");


                String resultTime = map.get("time").toString();


                List<HistoryDaily> historyDailyList = professionDataMap.get(resultTime);


                //贡献率


@@ -392,6 +393,7 @@


                map.put(profession, professionMap);


            }


        }


        result.forEach(map -> map.remove("allDeviceSum"));


        return result;


    }




@@ -411,7 +413,7 @@


        List<String> timeLag = DateUtils.getTimeLag(time);






        //本市当天所有小时数据


        //本市本日所有小时数据


        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();


        cityAqiQueryWrapper.select("time", "value")


                .eq("city_code", locationLevelCode)


@@ -425,7 +427,7 @@


        }






        //所有设备当天小时数据


        //所有设备本日所有小时数据


        List<HistoryHourly> allDeviceData = historyHourlyService.getValueByMacs(allMacs, time);


        //按time分组


        Map<String, List<HistoryHourly>> allDeviceDataMap = allDeviceData.stream()


@@ -473,7 +475,7 @@


            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());






            //该行业设备当天小时数据


            //该行业设备本日所有小时数据


            List<HistoryHourly> professionDeviceData = historyHourlyService.getValueByMacs(professionMacs, time);


            //按time分组


            Map<String, List<HistoryHourly>> professionDataMap = professionDeviceData.stream()


@@ -481,7 +483,7 @@






            for (Map<String, Object> map : result) {


                Object allDeviceSum = map.remove("allDeviceSum");


                Object allDeviceSum = map.get("allDeviceSum");


                String resultTime = map.get("time").toString();


                List<HistoryHourly> historyHourlyList = professionDataMap.get(resultTime);


                //贡献率


@@ -504,6 +506,7 @@


                map.put(profession, professionMap);


            }


        }


        result.forEach(map -> map.remove("allDeviceSum"));


        return result;


    }