fix:升级语句优化

cjl

2023-09-12 ea1373d4e1511b620bb87872e692643e2edb81f8

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

@@ -78,18 +78,19 @@
//            region = RegionCodeUtils.regionCodeConvertToName(regionCode);
//        }

        //查询子组织
       /* //查询子组织
        List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
        List<Integer> organizationIds = new ArrayList<>();

        for (Organization organization : childrenOrganization) {
            organizationIds.add(organization.getId());
        }
        organizationIds.add(organizationId);
        organizationIds.add(organizationId);*/
        //查询站点
        QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();

        //如果region不为空，就查询当前组织，所选城市下所有站点及设备信息
        //如果region为空，则查询当前组织下所有的站点和设备
        List<Integer> organizationIds = deviceMapper.deviceOrgIdList(organizationId);
        if (region != null){
            queryMonitorPointsWrapper.eq(region, regionCode);
        }
@@ -481,166 +482,6 @@
        }
        return resultList;
    }


    @Override
    public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
       // List<String> macs = Arrays.asList(mac.split(","));
        List<String> macs = (List<String>) params.remove("mac");
        Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_EN);
        Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_EN);
        List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);

        return resultList(historyDailyByMacAndTimeSlot);
    }


    private List<MonitoringStationDTO> resultList(List<HistoryDaily> historyDailyByMacAndTimeSlot){
        List<MonitoringStationDTO> list = new ArrayList<>();
        if(CollectionUtils.isEmpty(historyDailyByMacAndTimeSlot)){
            return list;
        }
        Map<String,Map<String,ArrayList<Double>>> resultMap = new HashMap<>();
        int zz = 0;
        for(HistoryDaily h : historyDailyByMacAndTimeSlot) {
            JSONObject jsonObject = JSONObject.parseObject(h.getValue());
            Map<String, Object> map = jsonObject.getInnerMap();
            Map<String,ArrayList<Double>> maps = Objects.nonNull(resultMap.get(h.getMac()))?resultMap.get(h.getMac()):new HashMap<>();
            if(Objects.nonNull(map.get("a34004"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("PM2_5"))?maps.get("PM2_5"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a34004").toString()));
                maps.put("PM2_5",numResult);
            }
            if(Objects.nonNull(map.get("a05024"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("O3"))?maps.get("O3"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a05024").toString()));
                maps.put("O3",numResult);
            }
            if(Objects.nonNull(map.get("a34002"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("PM10"))?maps.get("PM10"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a34002").toString()));
                maps.put("PM10",numResult);
            }
            if(Objects.nonNull(map.get("a21026"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("SO2"))?maps.get("SO2"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a21026").toString()));
                maps.put("SO2",numResult);
            }
            if(Objects.nonNull(map.get("a21004"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("NO2"))?maps.get("NO2"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a21004").toString()));
                maps.put("NO2",numResult);
            }
            if(Objects.nonNull(map.get("a21005"))){
                System.out.println(">>>"+map.toString());
                System.out.println(">>>"+map.get("a21005").toString());
                ArrayList<Double> numResult = Objects.nonNull(maps.get("CO"))?maps.get("CO"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a21005").toString()));
                maps.put("CO",numResult);
            }
            if(Objects.nonNull(map.get("a99054"))){
                ArrayList<Double> numResult = Objects.nonNull(maps.get("TVOC"))?maps.get("TVOC"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a99054").toString()));
                maps.put("TVOC",numResult);
            }
            resultMap.put(h.getMac(),maps);
            zz++;
        }
        for(Map.Entry entry : resultMap.entrySet()){
            String mapKey = (String) entry.getKey();
            Map<String,ArrayList<Double>> mapValue = (Map<String,ArrayList<Double>>)entry.getValue();
            Map<String, Object> data = new HashMap<>();
            if(mapValue.containsKey("PM2_5")){
                Double ListAvg = mapValue.get("PM2_5").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("PM2_5",rsAvg);
            }else {
                data.put("PM2_5",0);
            }
            if(mapValue.containsKey("PM10")){
                Double ListAvg = mapValue.get("PM10").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("PM10",rsAvg);
            }else {
                data.put("PM10",0);
            }
            if(mapValue.containsKey("SO2")){
                Double ListAvg = mapValue.get("SO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("SO2",rsAvg);
            }else {
                data.put("SO2",0);
            }
            if(mapValue.containsKey("NO2")){
                Double ListAvg = mapValue.get("NO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("NO2",rsAvg);
            }else {
                data.put("NO2",0);
            }
            if(mapValue.containsKey("CO")){
                Double ListAvg = percentile(mapValue.get("CO"),95d);
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("CO",rsAvg);
            }else {
                data.put("CO",0);
            }
            if(mapValue.containsKey("O3")){
                Double ListAvg = percentile(mapValue.get("O3"),90d);
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("O3",rsAvg);
            }else {
                data.put("O3",0);
            }
            if(mapValue.containsKey("TVOC")){
                Double ListAvg = mapValue.get("TVOC").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("TVOC",rsAvg);
            }else {
                data.put("TVOC",0);
            }
            Double resultNum = ComprehensiveIndexUtils.dailyData(data);
            MonitoringStationDTO monitoringStationDTO = new MonitoringStationDTO();
            monitoringStationDTO.setPM25(BigDecimal.valueOf(Double.parseDouble(data.get("PM2_5").toString())));
            monitoringStationDTO.setO3(BigDecimal.valueOf(Double.parseDouble(data.get("O3").toString())));
            monitoringStationDTO.setTovc(BigDecimal.valueOf(Double.parseDouble(data.get("TVOC").toString())));
            monitoringStationDTO.setComposite(BigDecimal.valueOf(resultNum));
            monitoringStationDTO.setMac(mapKey);
            list.add(monitoringStationDTO);
        }
        List<MonitoringStationDTO> compositeList = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getComposite).reversed()).collect(Collectors.toList());
        List<MonitoringStationDTO> pM25List = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getPM25).reversed()).collect(Collectors.toList());
        List<MonitoringStationDTO> o3List = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getO3).reversed()).collect(Collectors.toList());
        List<MonitoringStationDTO> tovcList = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getTovc).reversed()).collect(Collectors.toList());
        List<MonitoringStationDTO> resultList = new ArrayList<>();
        LambdaQueryChainWrapper<Device> wrapper = deviceService.lambdaQuery();
        wrapper.eq(Device::getIsDelete,0);
        Map<String,String> deviceMap =  new HashMap<>();
        wrapper.list().forEach(it->deviceMap.put(it.getMac(),it.getName()));
        int num = 1;
        for (MonitoringStationDTO m :compositeList ){
            MonitoringStationDTO monit = new MonitoringStationDTO();
            String mac = m.getMac();
            monit.setMac(mac);
            monit.setName(deviceMap.get(mac));
            monit.setComposite(m.getComposite());
            monit.setCompositeNum(num);
            List<String> listPM25 = pM25List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            List<String> listO3 = o3List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            List<String> listTovc = tovcList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setO3(o3List.get(listO3.indexOf(mac)).getO3());
            monit.setO3Num(listO3.indexOf(mac)+1);
            monit.setPM25(pM25List.get(listPM25.indexOf(mac)).getPM25());
            monit.setPM25Num(listPM25.indexOf(mac)+1);
            monit.setTovc(tovcList.get(listTovc.indexOf(mac)).getTovc());
            monit.setTOVCNum(listTovc.indexOf(mac)+1);
            num++;
            resultList.add(monit);
        }
        return resultList;
    }


    @Override
    public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
       // List<String> macs = Arrays.asList(mac.split(","));
@@ -684,7 +525,6 @@
            return list;
        }
        Map<String,Map<String,ArrayList<Double>>> resultMap = new HashMap<>();
        int zz = 0;
        for(HistoryDaily h : historyDailyByMacAndTimeSlot) {
            JSONObject jsonObject = JSONObject.parseObject(h.getValue());
            Map<String, Object> map = jsonObject.getInnerMap();
@@ -715,8 +555,6 @@
                maps.put("NO2",numResult);
            }
            if(Objects.nonNull(map.get("a21005"))){
                System.out.println(">>>"+map.toString());
                System.out.println(">>>"+map.get("a21005").toString());
                ArrayList<Double> numResult = Objects.nonNull(maps.get("CO"))?maps.get("CO"):new ArrayList<>();
                numResult.add(Double.parseDouble(map.get("a21005").toString()));
                maps.put("CO",numResult);
@@ -727,9 +565,9 @@
                maps.put("TVOC",numResult);
            }
            resultMap.put(h.getMac(),maps);
            zz++;
        }
        for(Map.Entry entry : resultMap.entrySet()){
            boolean dimension = false;
            String mapKey = (String) entry.getKey();
            Map<String,ArrayList<Double>> mapValue = (Map<String,ArrayList<Double>>)entry.getValue();
            Map<String, Object> data = new HashMap<>();
@@ -739,27 +577,31 @@
                data.put("PM2_5",rsAvg);
            }else {
                data.put("PM2_5",0);
                dimension = true;
            }
            if(mapValue.containsKey("PM10")){
                Double ListAvg = mapValue.get("PM10").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("PM10",rsAvg);
            }else {
                data.put("PM10",0);
                dimension = true;
            }
            if(mapValue.containsKey("SO2")){
                Double ListAvg = mapValue.get("SO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("SO2",rsAvg);
            }else {
                data.put("SO2",0);
                dimension = true;
            }
            if(mapValue.containsKey("NO2")){
                Double ListAvg = mapValue.get("NO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
                double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
                data.put("NO2",rsAvg);
            }else {
                data.put("NO2",0);
                dimension = true;
            }
            if(mapValue.containsKey("CO")){
                Double ListAvg = percentile(mapValue.get("CO"),95d);
@@ -767,6 +609,7 @@
                data.put("CO",rsAvg);
            }else {
                data.put("CO",0);
                dimension = true;
            }
            if(mapValue.containsKey("O3")){
                Double ListAvg = percentile(mapValue.get("O3"),90d);
@@ -774,6 +617,7 @@
                data.put("O3",rsAvg);
            }else {
                data.put("O3",0);
                dimension = true;
            }
            if(mapValue.containsKey("TVOC")){
                Double ListAvg = mapValue.get("TVOC").stream().collect(Collectors.averagingDouble(Double::doubleValue));
@@ -781,43 +625,69 @@
                data.put("TVOC",rsAvg);
            }else {
                data.put("TVOC",0);
                dimension = true;
            }
            Double resultNum = ComprehensiveIndexUtils.dailyData(data);
            if(dimension){
                resultNum = 0d;
            }
            MonitoringStationDTO monitoringStationDTO = new MonitoringStationDTO();
            monitoringStationDTO.setPM25(BigDecimal.valueOf(Double.parseDouble(data.get("PM2_5").toString())));
            monitoringStationDTO.setO3(BigDecimal.valueOf(Double.parseDouble(data.get("O3").toString())));
            monitoringStationDTO.setTovc(BigDecimal.valueOf(Double.parseDouble(data.get("TVOC").toString())));
            monitoringStationDTO.setComposite(BigDecimal.valueOf(resultNum));
            monitoringStationDTO.setSO2(BigDecimal.valueOf(Double.parseDouble(data.get("SO2").toString())));
            monitoringStationDTO.setNO2(BigDecimal.valueOf(Double.parseDouble(data.get("NO2").toString())));
            monitoringStationDTO.setPM10(BigDecimal.valueOf(Double.parseDouble(data.get("PM10").toString())));
            monitoringStationDTO.setCO(BigDecimal.valueOf(Double.parseDouble(data.get("CO").toString())));
            monitoringStationDTO.setMac(mapKey);
            list.add(monitoringStationDTO);
        }
        List<MonitoringStationDTO> compositeListResult = fun3(list,0);
        List<MonitoringStationDTO> compositeList = fun3(list,1);
        List<MonitoringStationDTO> pM25List = fun3(list,2);
        List<MonitoringStationDTO> o3List = fun3(list,3);
        List<MonitoringStationDTO> tovcList = fun3(list,4);
        List<MonitoringStationDTO> SO2List = fun3(list,5);
        List<MonitoringStationDTO> NO2cList = fun3(list,6);
        List<MonitoringStationDTO> PM10List = fun3(list,7);
        List<MonitoringStationDTO> COList = fun3(list,8);
        List<MonitoringStationDTO> resultList = new ArrayList<>();
        LambdaQueryChainWrapper<Device> wrapper = deviceService.lambdaQuery();
        wrapper.eq(Device::getIsDelete,0);
        Map<String,String> deviceMap =  new HashMap<>();
        wrapper.list().forEach(it->deviceMap.put(it.getMac(),it.getName()));
        int num = 1;
        for (MonitoringStationDTO m :compositeList ){

        for (MonitoringStationDTO m :compositeListResult ){
            MonitoringStationDTO monit = new MonitoringStationDTO();
            String mac = m.getMac();
            monit.setMac(mac);
            monit.setName(deviceMap.get(mac));
            monit.setComposite(m.getComposite());
            monit.setCompositeNum(m.getCompositeNum());
            List<String> listComposite = compositeList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setComposite(listComposite.indexOf(mac) == -1?BigDecimal.ZERO:compositeList.get(listComposite.indexOf(mac)).getComposite());
            monit.setCompositeNum(listComposite.indexOf(mac) == -1?0:compositeList.get(listComposite.indexOf(mac)).getCompositeNum());
            List<String> listPM25 = pM25List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            List<String> listO3 = o3List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            List<String> listTovc = tovcList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setO3(o3List.get(listO3.indexOf(mac)).getO3());
            monit.setO3Num(o3List.get(listO3.indexOf(mac)).getO3Num());
            monit.setPM25(pM25List.get(listPM25.indexOf(mac)).getPM25());
            monit.setPM25Num(pM25List.get(listPM25.indexOf(mac)).getPM25Num());
            monit.setTovc(tovcList.get(listTovc.indexOf(mac)).getTovc());
            monit.setTOVCNum(tovcList.get(listTovc.indexOf(mac)).getTOVCNum());
            //num++;
            monit.setO3(listO3.indexOf(mac) == -1?BigDecimal.ZERO:o3List.get(listO3.indexOf(mac)).getO3());
            monit.setO3Num(listO3.indexOf(mac) == -1?0:o3List.get(listO3.indexOf(mac)).getO3Num());
            monit.setPM25(listPM25.indexOf(mac) == -1?BigDecimal.ZERO:pM25List.get(listPM25.indexOf(mac)).getPM25());
            monit.setPM25Num(listPM25.indexOf(mac) == -1?0:pM25List.get(listPM25.indexOf(mac)).getPM25Num());
            monit.setTovc(listTovc.indexOf(mac) == -1?BigDecimal.ZERO:tovcList.get(listTovc.indexOf(mac)).getTovc());
            monit.setTOVCNum(listTovc.indexOf(mac) == -1?0:tovcList.get(listTovc.indexOf(mac)).getTOVCNum());
            List<String> listSO2 = SO2List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setSO2(listSO2.indexOf(mac) == -1?BigDecimal.ZERO:SO2List.get(listSO2.indexOf(mac)).getSO2());
            monit.setSO2Num(listSO2.indexOf(mac) == -1?0:SO2List.get(listSO2.indexOf(mac)).getSO2Num());
            List<String> listNO2 = NO2cList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setNO2(listNO2.indexOf(mac) == -1?BigDecimal.ZERO:NO2cList.get(listNO2.indexOf(mac)).getNO2());
            monit.setNO2Num(listNO2.indexOf(mac) == -1?0:NO2cList.get(listNO2.indexOf(mac)).getNO2Num());
            List<String> listPM10 = PM10List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setPM10(listPM10.indexOf(mac) == -1?BigDecimal.ZERO:PM10List.get(listPM10.indexOf(mac)).getPM10());
            monit.setPM10Num(listPM10.indexOf(mac) == -1?0:PM10List.get(listPM10.indexOf(mac)).getPM10Num());
            List<String> listCO = COList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
            monit.setCO(listCO.indexOf(mac) == -1?BigDecimal.ZERO:COList.get(listCO.indexOf(mac)).getCO());
            monit.setCONum(listCO.indexOf(mac) == -1?0:COList.get(listCO.indexOf(mac)).getCONum());

            resultList.add(monit);
        }
        return resultList;
@@ -828,17 +698,32 @@
        List<MonitoringStationDTO> compositeList = new ArrayList<>();
        Map<BigDecimal,List<MonitoringStationDTO>> map1 = new HashMap<>();
        if(type == 1){
            compositeList = monList.stream().filter(it->it.getComposite().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getComposite)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getComposite,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 0){
            compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getComposite)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getComposite,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 2){
            compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getPM25)).collect(Collectors.toList());
            compositeList = monList.stream().filter(it->it.getPM25().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getPM25)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getPM25,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 3){
            compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getO3)).collect(Collectors.toList());
            compositeList = monList.stream().filter(it->it.getO3().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getO3)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getO3,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 4){
            compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getTovc)).collect(Collectors.toList());
            compositeList = monList.stream().filter(it->it.getTovc().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getTovc)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getTovc,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 5){
            compositeList = monList.stream().filter(it->it.getSO2().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getSO2)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getSO2,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 6){
            compositeList = monList.stream().filter(it->it.getNO2().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getNO2)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getNO2,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 7){
            compositeList = monList.stream().filter(it->it.getPM10().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getPM10)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getPM10,LinkedHashMap::new,Collectors.toList()));
        }else if(type == 8){
            compositeList = monList.stream().filter(it->it.getCO().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getCO)).collect(Collectors.toList());
            map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getCO,LinkedHashMap::new,Collectors.toList()));
        }
        int index = 1;
        for (Map.Entry entry : map1.entrySet()) {
@@ -847,6 +732,9 @@
                MonitoringStationDTO stationDTO = new MonitoringStationDTO();
                stationDTO.setMac(m.getMac());
                if(type == 1){
                    stationDTO.setComposite(m.getComposite());
                    stationDTO.setCompositeNum(index);
                }else if(type == 0){
                    stationDTO.setComposite(m.getComposite());
                    stationDTO.setCompositeNum(index);
                }else if(type == 2){
@@ -858,6 +746,18 @@
                }else if(type == 4){
                    stationDTO.setTovc(m.getTovc());
                    stationDTO.setTOVCNum(index);
                }else if(type == 5){
                    stationDTO.setSO2(m.getSO2());
                    stationDTO.setSO2Num(index);
                }else if(type == 6){
                    stationDTO.setNO2(m.getNO2());
                    stationDTO.setNO2Num(index);
                }else if(type == 7){
                    stationDTO.setPM10(m.getPM10());
                    stationDTO.setPM10Num(index);
                }else if(type == 8){
                    stationDTO.setCO(m.getCO());
                    stationDTO.setCONum(index);
                }
                resultList.add(stationDTO);
            }