fix:升级语句优化

cjl

2023-09-12 ea1373d4e1511b620bb87872e692643e2edb81f8

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

@@ -3,8 +3,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -12,13 +16,34 @@
import java.util.Set;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqi;
import com.moral.api.entity.CityAqiDaily;
import com.moral.api.entity.CityAqiMonthly;
import com.moral.api.entity.Device;
import com.moral.api.entity.HistoryDaily;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.HistoryMonthly;
import com.moral.api.entity.Organization;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.SysDictData;
import com.moral.api.service.CityAqiDailyService;
import com.moral.api.service.CityAqiMonthlyService;
import com.moral.api.service.CityAqiService;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.HistoryMonthlyService;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.ProfessionService;

import com.moral.api.service.SensorService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;

import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;

/**
 * <p>
@@ -36,6 +61,41 @@

    @Autowired
    private RedisTemplate redisTemplate;

    @Autowired
    private HistoryMonthlyService historyMonthlyService;

    @Autowired
    private HistoryDailyService historyDailyService;

    @Autowired
    private HistoryHourlyService historyHourlyService;

    @Autowired
    private CityAqiMonthlyService cityAqiMonthlyService;

    @Autowired
    private CityAqiDailyService cityAqiDailyService;

    @Autowired
    private CityAqiService cityAqiService;

    @Autowired
    private OrganizationService organizationService;

    @Autowired
    private SensorService sensorService;

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

    static {
        senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
        senorMap.put(Constants.SENSOR_CODE_PM10, "PM10");
        senorMap.put(Constants.SENSOR_CODE_SO2, "SO2");
        senorMap.put(Constants.SENSOR_CODE_NO2, "NO2");
        senorMap.put(Constants.SENSOR_CODE_CO, "CO");
        senorMap.put(Constants.SENSOR_CODE_O3, "O3");
    }

    @Override
    public Set<Map<String, Object>> getProfessionsByOrganizationId(Integer organizationId) {
@@ -55,6 +115,22 @@
        //获取属于该行业所有设备
        Integer orgId = Integer.parseInt(params.get("organizationId").toString());
        List<String> professions = Arrays.asList(params.get("professions").toString().split(","));
        List<Device> devices = getDevicesOfProfessions(orgId, professions);
        //从redis获取设备详细信息
        for (Device device : devices) {
            device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, device.getMac());
            List<Sensor> sensors = device.getVersion().getSensors();
            for (Sensor sensor : sensors) {
                Map<String, Object> sensorMap = new HashMap<>();
                sensorMap.put("sensorCode", sensor.getCode());
                sensorMap.put("sensorName", sensor.getName());
                result.add(sensorMap);
            }
        }
        return result;
    }

    private List<Device> getDevicesOfProfessions(Integer orgId, List<String> professions) {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("mac", "profession")
                .eq("organization_id", orgId)
@@ -69,18 +145,452 @@
            }
            return false;
        }).collect(Collectors.toList());
        return devices;
    }

        //从redis获取设备详细信息
        for (Device device : devices) {
            device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, device.getMac());
            List<Sensor> sensors = device.getVersion().getSensors();
            for (Sensor sensor : sensors) {
                Map<String, Object> sensorMap = new HashMap<>();
                sensorMap.put("sensorCode", sensor.getCode());
                sensorMap.put("sensorName", sensor.getName());
                result.add(sensorMap);
    @Override
    public Map<String, Object> professionContribution(Map<String, Object> params) {
        int orgId = Integer.parseInt(params.get("organizationId").toString());
        List<String> professions = Arrays.asList(params.get("professions").toString().split(","));
        String type = params.get("type").toString();
        String time = params.get("time").toString();
        String sensorCode = params.get("sensorCode").toString();
        Map<String, Object> result = new HashMap<>();

        switch (type) {
            case "year":
                result = professionContributionOfYear(orgId, professions, time, sensorCode);
                break;
            case "month":
                result = professionContributionOfMonth(orgId, professions, time, sensorCode);
                break;
            case "day":
                result = professionContributionOfDay(orgId, professions, time, sensorCode);
                break;
            default:
                break;
        }
        return result;
    }

    //贡献率，年
    private Map<String, Object> professionContributionOfYear(Integer orgId, List<String> professions, 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();


        //本市本年所有月数据
        QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
        cityAqiMonthlyQueryWrapper.select("time", "value")
                .eq("city_code", locationLevelCode)
                .likeRight("time", time);
        List<Map<String, Object>> cityAqis = cityAqiMonthlyService.listMaps(cityAqiMonthlyQueryWrapper);
        Map<String, Object> cityAqiMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(cityAqis)) {
            for (Map<String, Object> cityAqi : cityAqis) {
                cityAqiMap.put(cityAqi.get("time").toString().substring(0, 7), cityAqi.get("value"));
            }
        }


        //该组织所有设备信息，本年所有月数据
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
        List<HistoryMonthly> allDeviceData = historyMonthlyService.getValueByMacs(allMacs, 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) {
            //所有设备该因子累加值
            Double allDeviceSum = null;
            List<HistoryMonthly> historyMonthlyList = allDeviceDataMap.get(yearMonth);
            if (!ObjectUtils.isEmpty(historyMonthlyList)) {
                allDeviceSum = historyMonthlyService.calculatedValue(historyMonthlyList, sensorCode, "sum");
            }
            allDeviceSumMap.put(yearMonth, allDeviceSum);


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

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


        for (String profession : professions) {
            //每个行业数据结果集
            HashMap<String, Object> professionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //查询行业名称
            String professionName = null;
            Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
            List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
            for (SysDictData sysDictData : professionInfo) {
                if (sysDictData.getDataKey().equals(profession)) {
                    professionName = sysDictData.getDataValue();
                    break;
                }
            }


            //获取该行业所有设备信息，年所有月数据
            List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
            List<HistoryMonthly> professionDeviceData = historyMonthlyService.getValueByMacs(professionMacs, time);
            Map<String, List<HistoryMonthly>> professionDataMap = professionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 7)));


            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> professionDeviceHistoryMonthlyList = professionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double professionAvg = null;
                if (!ObjectUtils.isEmpty(professionDeviceHistoryMonthlyList)) {
                    //该行业均值计算
                    professionAvg = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "avg");
                    //该行业累加值计算
                    Double professionSum = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "sum");
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
                    }
                }

                //行业均值
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);
            result.put(professionName, professionMap);
        }
        return result;
    }

    //贡献率，月
    private Map<String, Object> professionContributionOfMonth(Integer orgId, List<String> professions, 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();


        //本市本月所有日数据
        QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
        cityAqiDailyQueryWrapper.select("time", "value")
                .eq("city_code", locationLevelCode)
                .likeRight("time", time);
        List<Map<String, Object>> cityAqis = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
        Map<String, Object> cityAqiMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(cityAqis)) {
            for (Map<String, Object> cityAqi : cityAqis) {
                cityAqiMap.put(cityAqi.get("time").toString().substring(0, 10), cityAqi.get("value"));
            }
        }


        //该组织所有设备信息，本月所有日数据
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
        List<HistoryDaily> allDeviceData = historyDailyService.getValueByMacs(allMacs, 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) {
            //所有设备该因子累加值
            Double allDeviceSum = null;
            List<HistoryDaily> historyDailyList = allDeviceDataMap.get(yearMonthDay);
            if (!ObjectUtils.isEmpty(historyDailyList)) {
                allDeviceSum = historyDailyService.calculatedValue(historyDailyList, sensorCode, "sum");
            }
            allDeviceSumMap.put(yearMonthDay, allDeviceSum);


            //本市值
            Double cityValue = null;
            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());
                }
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

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


        for (String profession : professions) {
            //每个行业数据结果集
            HashMap<String, Object> professionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //查询行业名称
            String professionName = null;
            Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
            List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
            for (SysDictData sysDictData : professionInfo) {
                if (sysDictData.getDataKey().equals(profession)) {
                    professionName = sysDictData.getDataValue();
                    break;
                }
            }


            //获取该行业所有设备信息，年所有月数据
            List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
            List<HistoryDaily> professionDeviceData = historyDailyService.getValueByMacs(professionMacs, time);
            Map<String, List<HistoryDaily>> professionDataMap = professionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 10)));


            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> preofessionDeviceHistoryDailyList = professionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double professionAvg = null;
                if (!ObjectUtils.isEmpty(preofessionDeviceHistoryDailyList)) {
                    //该行业均值计算
                    professionAvg = historyDailyService.calculatedValue(preofessionDeviceHistoryDailyList, sensorCode, "avg");
                    //该行业累加值计算
                    Double professionSum = historyDailyService.calculatedValue(preofessionDeviceHistoryDailyList, sensorCode, "sum");
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
                    }
                }

                //行业均值
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);
            result.put(professionName, professionMap);
        }
        return result;
    }

    private Map<String, Object> professionContributionOfDay(Integer orgId, List<String> professions, 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();

        //查询因子上下限
        QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
        sensorQueryWrapper.select("lower", "upper").eq("code", sensorCode);
        Sensor sensor = sensorService.getOne(sensorQueryWrapper);
        Double sensorLower = null;
        Double sensorUpper = null;
        if (sensor != null) {
            sensorLower = sensor.getLower();
            sensorUpper = sensor.getUpper();
        }


        //本市本日所有小时数据
        QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
        cityAqiQueryWrapper.select("time", "value")
                .eq("city_code", locationLevelCode)
                .likeRight("time", time);
        List<Map<String, Object>> cityAqis = cityAqiService.listMaps(cityAqiQueryWrapper);
        Map<String, Object> cityAqiMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(cityAqis)) {
            for (Map<String, Object> cityAqi : cityAqis) {
                cityAqiMap.put(cityAqi.get("time").toString().substring(0, 13), cityAqi.get("value"));
            }
        }


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


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


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

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


        for (String profession : professions) {
            //每个行业数据结果集
            HashMap<String, Object> professionMap = new HashMap<>();
            List<Map<String, Object>> dataList = new ArrayList<>();


            //查询行业名称
            String professionName = null;
            Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
            List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
            for (SysDictData sysDictData : professionInfo) {
                if (sysDictData.getDataKey().equals(profession)) {
                    professionName = sysDictData.getDataValue();
                    break;
                }
            }


            //获取该行业所有设备信息，年所有月数据
            List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
            List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
            List<HistoryHourly> professionDeviceData = historyHourlyService.getValueByMacs(professionMacs, time);
            Map<String, List<HistoryHourly>> professionDataMap = professionDeviceData.stream()
                    .collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 13)));


            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> preofessionDeviceHistoryHourlyList = professionDataMap.get(resultTime);
                //贡献率
                String contributionRate = null;
                Double professionAvg = null;
                if (!ObjectUtils.isEmpty(preofessionDeviceHistoryHourlyList)) {
                    //该行业均值计算
                    professionAvg = historyHourlyService.calculatedValue(preofessionDeviceHistoryHourlyList, sensorCode, "avg", sensorLower, sensorUpper);
                    //该行业累加值计算
                    Double professionSum = historyHourlyService.calculatedValue(preofessionDeviceHistoryHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null && allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
                    }
                }

                //行业均值
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);
            result.put(professionName, professionMap);
        }
        return result;
    }
}