ci:持续修改

cjl

2023-09-27 57b29a43e4d1505d44e1ac82ed61ef640ba49e8c

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

@@ -79,7 +79,7 @@
    @Autowired
    private SensorService sensorService;

    private static Map<String, String> senorMap = new HashMap<>();
    private static final Map<String, String> senorMap = new HashMap<>();

    static {
        senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -139,13 +139,13 @@
    }

    @Override
    public List<Map<String, Object>> regionContribution(Map<String, Object> params) {
    public Map<String, Object> regionContribution(Map<String, Object> params) {
        int orgId = Integer.parseInt(params.get("organizationId").toString());
        List<String> regionCodes = Arrays.asList(params.get("regionCodes").toString().split(","));
        String type = params.get("type").toString();
        String time = params.get("time").toString();
        String sensorCode = params.get("sensorCode").toString();
        List<Map<String, Object>> result = new ArrayList<>();
        Map<String, Object> result = new HashMap<>();
        switch (type) {
            case "year":
                result = regionContributionOfYear(orgId, regionCodes, time, sensorCode);
@@ -163,8 +163,13 @@
    }

    //贡献率，年
    private List<Map<String, Object>> regionContributionOfYear(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        List<Map<String, Object>> result = new ArrayList<>();
    private Map<String, Object> regionContributionOfYear(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        Map<String, Object> result = new HashMap<>();

        //1.时间信息结果
        List<String> timeLag = DateUtils.getTimeLag(time);
        result.put("time", timeLag);


        //根据组织获取区域定位
        QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
@@ -172,10 +177,6 @@
                .eq("id", orgId);
        Integer locationLevelCode = organizationService.getOne(organizationQueryWrapper).getLocationLevelCode();

        //该组织所有设备信息
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);

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

        //本市本年所有月数据
        QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
@@ -191,25 +192,26 @@
        }


        //所有设备本年所有月数据
        //该组织所有设备信息，本年所有月数据
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
        List<HistoryMonthly> allDeviceData = historyMonthlyService.getValueByMacs(allMacs, time);
        //按time分组
        Map<String, List<HistoryMonthly>> allDeviceDataMap = allDeviceData.stream()
                .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 7)));


        //本市数据结果集
        Map<String, Object> resultCityDataMap = new HashMap<>();
        List<Map<String, Object>> cityDataList = new ArrayList<>();
        //所有设备每个时间点，和值
        Map<String, Object> allDeviceSumMap = new HashMap<>();
        for (String yearMonth : timeLag) {
            Map<String, Object> resultMap = new HashMap<>();
            resultMap.put("time", yearMonth);


            //所有设备该因子累加值
            Double allDeviceSum = null;
            List<HistoryMonthly> historyMonthlyList = allDeviceDataMap.get(yearMonth);
            if (!ObjectUtils.isEmpty(historyMonthlyList)) {
                allDeviceSum = historyMonthlyService.calculatedValue(historyMonthlyList, sensorCode, "sum");
            }
            resultMap.put("allDeviceSum", allDeviceSum);
            allDeviceSumMap.put(yearMonth, allDeviceSum);


            //本市值
@@ -219,71 +221,92 @@
                //判断城市aqi是否有该因子数据
                String sensorName = senorMap.get(sensorCode);
                if (sensorName != null) {
                    cityValue = (Double) dataValue.get(sensorName);
                    cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
                }
            }
            resultMap.put("cityValue", cityValue);
            result.add(resultMap);
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

        //2.本市数据结果
        resultCityDataMap.put("data", cityDataList);
        result.put("本市", resultCityDataMap);


        for (String regionCode : regionCodes) {
            //每个乡镇区域数据结果集
            HashMap<String, Object> regionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //乡镇区域名称
            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("area_name").eq("area_code", Integer.parseInt(regionCode));
            String regionName = sysAreaService.getOne(queryWrapper).getAreaName();

            //获取乡镇区域下所有设备
            List<String> regionMacs = deviceService.getMacsByOrgIdAndRegionCode(orgId, Integer.parseInt(regionCode));

            //该乡镇区域设备本年所有月数据
            //获取乡镇区域下所有设备,本年所有月数据
            List<String> regionMacs = deviceService.getMacsByOrgIdAndRegionCode(orgId, Integer.parseInt(regionCode));
            List<HistoryMonthly> regionDeviceData = historyMonthlyService.getValueByMacs(regionMacs, time);
            //按time分组
            Map<String, List<HistoryMonthly>> regionDataMap = regionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 7)));


            for (Map<String, Object> map : result) {
                Object allDeviceSum = map.get("allDeviceSum");
                String resultTime = map.get("time").toString();
                List<HistoryMonthly> historyMonthlyList = regionDataMap.get(resultTime);
            for (String resultTime : timeLag) {
                //每个时间点数据
                Map<String, Object> timeDataMap = new HashMap<>();
                Object o = allDeviceSumMap.get(resultTime);
                Double allDeviceSum = null;
                if (o != null) {
                    allDeviceSum = Double.parseDouble(o.toString());
                }

                List<HistoryMonthly> regionDeviceHistoryMonthlyList = regionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double regionAvg = null;
                if (!ObjectUtils.isEmpty(historyMonthlyList)) {
                    regionAvg = historyMonthlyService.calculatedValue(historyMonthlyList, sensorCode, "avg");
                    Double regionSum = historyMonthlyService.calculatedValue(historyMonthlyList, sensorCode, "sum");
                    //行业贡献率计算
                if (!ObjectUtils.isEmpty(regionDeviceHistoryMonthlyList)) {
                    //该乡镇区域均值计算
                    regionAvg = historyMonthlyService.calculatedValue(regionDeviceHistoryMonthlyList, sensorCode, "avg");
                    //该乡镇区域和值计算
                    Double regionSum = historyMonthlyService.calculatedValue(regionDeviceHistoryMonthlyList, sensorCode, "sum");
                    //乡镇区域贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                        System.out.println(regionSum + "===" + allDeviceSum);
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / (allDeviceSum) * 100) + "%";
                    }
                }
                Map<String, Object> professionMap = new HashMap<>();
                professionMap.put("contributionRate", contributionRate);
                professionMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                map.put(regionName, professionMap);

                //乡镇区域均值
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);
            result.put(regionName, regionMap);
        }
        result.forEach(map -> map.remove("allDeviceSum"));
        return result;
    }

    //贡献率，月
    private List<Map<String, Object>> regionContributionOfMonth(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        List<Map<String, Object>> result = new ArrayList<>();
    private Map<String, Object> regionContributionOfMonth(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        Map<String, Object> result = new HashMap<>();

        //1.时间信息结果
        List<String> timeLag = DateUtils.getTimeLag(time);
        result.put("time", timeLag);


        //根据组织获取区域定位
        QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
        organizationQueryWrapper.select("location_level_code")
                .eq("id", orgId);
        Integer locationLevelCode = organizationService.getOne(organizationQueryWrapper).getLocationLevelCode();

        //该组织所有设备信息
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);

        //日时间点
        List<String> timeLag = DateUtils.getTimeLag(time);


        //本市本月所有日数据
@@ -300,24 +323,26 @@
        }


        //所有设备本月所有日数据
        //该组织所有设备信息，本月所有日数据
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
        List<HistoryDaily> allDeviceData = historyDailyService.getValueByMacs(allMacs, time);
        //按time分组
        Map<String, List<HistoryDaily>> allDeviceDataMap = allDeviceData.stream()
                .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 10)));


        //本市数据结果集
        Map<String, Object> resultCityDataMap = new HashMap<>();
        List<Map<String, Object>> cityDataList = new ArrayList<>();
        //所有设备每个时间点，和值
        Map<String, Object> allDeviceSumMap = new HashMap<>();
        for (String yearMonthDay : timeLag) {
            Map<String, Object> resultMap = new HashMap<>();
            resultMap.put("time", yearMonthDay);

            //所有设备该因子累加值
            Double allDeviceSum = null;
            List<HistoryDaily> historyDailyList = allDeviceDataMap.get(yearMonthDay);
            if (!ObjectUtils.isEmpty(historyDailyList)) {
                allDeviceSum = historyDailyService.calculatedValue(historyDailyList, sensorCode, "sum");
            }
            resultMap.put("allDeviceSum", allDeviceSum);
            allDeviceSumMap.put(yearMonthDay, allDeviceSum);


            //本市值
@@ -327,60 +352,85 @@
                //判断城市aqi是否有该因子数据
                String sensorName = senorMap.get(sensorCode);
                if (sensorName != null) {
                    cityValue = (Double) dataValue.get(sensorName);
                    cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
                }
            }
            resultMap.put("cityValue", cityValue);
            result.add(resultMap);
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

        //2.本市数据结果
        resultCityDataMap.put("data", cityDataList);
        result.put("本市", resultCityDataMap);


        for (String regionCode : regionCodes) {
            //每个乡镇区域数据结果集
            HashMap<String, Object> regionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //乡镇区域名称
            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("area_name").eq("area_code", Integer.parseInt(regionCode));
            String regionName = sysAreaService.getOne(queryWrapper).getAreaName();

            //获取乡镇区域下所有设备

            //获取乡镇区域下所有设备,本月所有日数据
            List<String> regionMacs = deviceService.getMacsByOrgIdAndRegionCode(orgId, Integer.parseInt(regionCode));


            //该行业设备本月所有日数据
            List<HistoryDaily> professionDeviceData = historyDailyService.getValueByMacs(regionMacs, time);
            List<HistoryDaily> regionDeviceData = historyDailyService.getValueByMacs(regionMacs, time);
            //按time分组
            Map<String, List<HistoryDaily>> professionDataMap = professionDeviceData.stream()
            Map<String, List<HistoryDaily>> regionDataMap = regionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 10)));


            for (Map<String, Object> map : result) {
                Object allDeviceSum = map.get("allDeviceSum");
                String resultTime = map.get("time").toString();
                List<HistoryDaily> historyDailyList = professionDataMap.get(resultTime);
            for (String resultTime : timeLag) {
                //每个时间点数据
                Map<String, Object> timeDataMap = new HashMap<>();
                Object o = allDeviceSumMap.get(resultTime);
                Double allDeviceSum = null;
                if (o != null) {
                    allDeviceSum = Double.parseDouble(o.toString());
                }

                List<HistoryDaily> regionDeviceHistoryDailyList = regionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double regionAvg = null;
                if (!ObjectUtils.isEmpty(historyDailyList)) {
                    //该行业均值计算
                    regionAvg = historyDailyService.calculatedValue(historyDailyList, sensorCode, "avg");
                    //该行业累加值计算
                    Double regionSum = historyDailyService.calculatedValue(historyDailyList, sensorCode, "sum");
                    //行业贡献率计算
                if (!ObjectUtils.isEmpty(regionDeviceHistoryDailyList)) {
                    //该乡镇区域均值计算
                    regionAvg = historyDailyService.calculatedValue(regionDeviceHistoryDailyList, sensorCode, "avg");
                    //该乡镇区域和值计算
                    Double regionSum = historyDailyService.calculatedValue(regionDeviceHistoryDailyList, sensorCode, "sum");
                    //乡镇区域贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / (allDeviceSum) * 100) + "%";
                    }
                }
                Map<String, Object> professionMap = new HashMap<>();
                professionMap.put("contributionRate", contributionRate);
                professionMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                map.put(regionName, professionMap);

                //乡镇区域均值
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);
            result.put(regionName, regionMap);
        }
        result.forEach(map -> map.remove("allDeviceSum"));
        return result;
    }

    private List<Map<String, Object>> regionContributionOfDay(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        List<Map<String, Object>> result = new ArrayList<>();
    private Map<String, Object> regionContributionOfDay(Integer orgId, List<String> regionCodes, String time, String sensorCode) {
        Map<String, Object> result = new HashMap<>();

        //1.时间信息结果
        List<String> timeLag = DateUtils.getTimeLag(time);
        result.put("time", timeLag);


        //根据组织获取区域定位
        QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
@@ -392,15 +442,12 @@
        QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
        sensorQueryWrapper.select("lower", "upper").eq("code", sensorCode);
        Sensor sensor = sensorService.getOne(sensorQueryWrapper);
        Double sensorLower = sensor.getLower();
        Double sensorUpper = sensor.getUpper();

        //该组织所有设备信息
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);

        //小时时间点
        List<String> timeLag = DateUtils.getTimeLag(time);

        Double sensorLower = null;
        Double sensorUpper = null;
        if (sensor != null) {
            sensorLower = sensor.getLower();
            sensorUpper = sensor.getUpper();
        }

        //本市本日所有小时数据
        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
@@ -416,83 +463,104 @@
        }


        //所有设备本日所有小时数据
        //该组织所有设备信息，本日所有小时数据
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
        List<HistoryHourly> allDeviceData = historyHourlyService.getValueByMacs(allMacs, time);
        //按time分组
        Map<String, List<HistoryHourly>> allDeviceDataMap = allDeviceData.stream()
                .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 13)));


        for (String yearMonthDayHour : timeLag) {
            Map<String, Object> resultMap = new HashMap<>();
            resultMap.put("time", yearMonthDayHour);


        //本市数据结果集
        Map<String, Object> resultCityDataMap = new HashMap<>();
        List<Map<String, Object>> cityDataList = new ArrayList<>();
        //所有设备每个时间点，和值
        Map<String, Object> allDeviceSumMap = new HashMap<>();
        for (String yearMonthDay : timeLag) {
            //所有设备该因子累加值
            Double allDeviceSum = null;
            List<HistoryHourly> historyHourlyList = allDeviceDataMap.get(yearMonthDayHour);
            List<HistoryHourly> historyHourlyList = allDeviceDataMap.get(yearMonthDay);
            if (!ObjectUtils.isEmpty(historyHourlyList)) {
                allDeviceSum = historyHourlyService.calculatedValue(historyHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
            }
            resultMap.put("allDeviceSum", allDeviceSum);
            allDeviceSumMap.put(yearMonthDay, allDeviceSum);


            //本市值
            Double cityValue = null;
            if (cityAqiMap.get(yearMonthDayHour) != null) {
                Map<String, Object> dataValue = JSONObject.parseObject(cityAqiMap.get(yearMonthDayHour).toString(), Map.class);
            if (cityAqiMap.get(yearMonthDay) != null) {
                Map<String, Object> dataValue = JSONObject.parseObject(cityAqiMap.get(yearMonthDay).toString(), Map.class);
                //判断城市aqi是否有该因子数据
                String sensorName = senorMap.get(sensorCode);
                if (sensorName != null) {
                    cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
                }
            }
            resultMap.put("cityValue", cityValue);
            result.add(resultMap);
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

        //2.本市数据结果
        resultCityDataMap.put("data", cityDataList);
        result.put("本市", resultCityDataMap);


        for (String regionCode : regionCodes) {
            //每个乡镇区域数据结果集
            HashMap<String, Object> regionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //乡镇区域名称
            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("area_name").eq("area_code", Integer.parseInt(regionCode));
            String regionName = sysAreaService.getOne(queryWrapper).getAreaName();

            //获取乡镇区域下所有设备

            //获取乡镇区域下所有设备,本日所有小时数据
            List<String> regionMacs = deviceService.getMacsByOrgIdAndRegionCode(orgId, Integer.parseInt(regionCode));


            //该行业设备本日所有小时数据
            List<HistoryHourly> professionDeviceData = historyHourlyService.getValueByMacs(regionMacs, time);
            List<HistoryHourly> regionDeviceData = historyHourlyService.getValueByMacs(regionMacs, time);
            //按time分组
            Map<String, List<HistoryHourly>> professionDataMap = professionDeviceData.stream()
            Map<String, List<HistoryHourly>> regionDataMap = regionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 13)));


            for (Map<String, Object> map : result) {
                Object allDeviceSum = map.get("allDeviceSum");
                String resultTime = map.get("time").toString();
                List<HistoryHourly> historyHourlyList = professionDataMap.get(resultTime);
            for (String resultTime : timeLag) {
                //每个时间点数据
                Map<String, Object> timeDataMap = new HashMap<>();
                Object o = allDeviceSumMap.get(resultTime);
                Double allDeviceSum = null;
                if (o != null) {
                    allDeviceSum = Double.parseDouble(o.toString());
                }

                List<HistoryHourly> regionDeviceHistoryHourlyList = regionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double regionAvg = null;
                if (!ObjectUtils.isEmpty(historyHourlyList)) {
                    //该行业均值计算
                    regionAvg = historyHourlyService.calculatedValue(historyHourlyList, sensorCode, "avg", sensorLower, sensorUpper);
                    //该行业累加值计算
                    Double regionSum = historyHourlyService.calculatedValue(historyHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
                    //行业贡献率计算
                if (!ObjectUtils.isEmpty(regionDeviceHistoryHourlyList)) {
                    //该乡镇区域均值计算
                    regionAvg = historyHourlyService.calculatedValue(regionDeviceHistoryHourlyList, sensorCode, "avg", sensorLower, sensorUpper);
                    //该乡镇区域和值计算
                    Double regionSum = historyHourlyService.calculatedValue(regionDeviceHistoryHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
                    //乡镇区域贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / (allDeviceSum) * 100) + "%";
                    }
                }
                Map<String, Object> professionMap = new HashMap<>();
                professionMap.put("contributionRate", contributionRate);
                professionMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                map.put(regionName, professionMap);

                //乡镇区域均值
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);
            result.put(regionName, regionMap);
        }
        result.forEach(map -> map.remove("allDeviceSum"));
        return result;
    }
}