Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-15 cc2e35bac3aca6d98b337a0b306c279f036ce989

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

@@ -282,10 +282,10 @@
        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
        Integer orgId = (Integer) orgInfo.get("id");
        String time1 = params.get("time1").toString();
        String time1 = params.get("startTime").toString();
        String dateString1 = DateUtils.stringToDateString(time1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
        String rsTime1 = dateString1.substring(5, 14);
        String time2 = params.get("time2").toString();
        String time2 = params.get("endTime").toString();
        String dateString2 = DateUtils.stringToDateString(time2, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
        String rsTime2 = dateString2.substring(5, 14);
        HashMap<String, Object> rsMap = new HashMap<>();
@@ -293,7 +293,7 @@
        Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));
        Set<String> strings = collect.keySet();
        ArrayList<DustForm> list1 = new ArrayList<>();
        ArrayList<DustForm> list2 = new ArrayList<>();
        //所有的高值路段
        StringBuilder builder = new StringBuilder();

        int i = 1;
@@ -338,15 +338,14 @@
            if (ObjectUtils.isEmpty(doubleArrayList)){
                continue;
            }

            Double ListAva = doubleArrayList.stream() .collect(Collectors.averagingDouble(Double::doubleValue));
            double rsAvg = new BigDecimal(ListAva/1000).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
            dustForm.setRoad(string);
            dustForm.setValue(rsAvg);
            list1.add(dustForm);
            if (rsAvg>=0.3){
             builder.append("("+i+")"+string);
             i++;
             list1.add(dustForm);
             //添加高值路段
                QueryWrapper<MaxRoad> wrapper = new QueryWrapper<>();
                wrapper.eq("name",string);
@@ -359,18 +358,14 @@
                    maxRoad.setTime(DateUtils.getDate(time1,DateUtils.yyyy_MM_dd_EN));
                    maxRoadMapper.insert(maxRoad);
                }

            }else {
             list2.add(dustForm);
            }
        }
        long timestamp2 = System.currentTimeMillis();
        log.info(timestamp2-timestamp+"");
        //排序
        list1.sort(Comparator.comparing(DustForm::getValue).reversed());
        list2.sort(Comparator.comparing(DustForm::getValue).reversed());
        rsMap.put("list1",list1);
        rsMap.put("list2",list2);


        //获取上一次的高值路段
        ArrayList<Map<String, Object>> list3 = new ArrayList<>();
@@ -384,12 +379,9 @@
        wrapper2.eq("time",maxRoads.get(0).getTime());
        List<MaxRoad> maxRoads1 = maxRoadMapper.selectList(wrapper2);

        //合并数据
        ArrayList<DustForm> dustForms = new ArrayList<>();
        dustForms.addAll(list1);
        dustForms.addAll(list2);
        //获取两次路段相同的值
        for (MaxRoad road : maxRoads1) {
            for (DustForm dustForm : dustForms) {
            for (DustForm dustForm : list1) {
                if (road.getName().equals(dustForm.getRoad())){
                    HashMap<String, Object> map = new HashMap<>();
                    map.put("road",road.getName());