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

jinpengyong

2023-09-06 e2411fee13ff406db4aa5d994d7dcffdf4482cab

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

@@ -5,6 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;

@@ -275,6 +276,7 @@
    private MaxRoadMapper maxRoadMapper;

    @Override
    @Transactional
    public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {

        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
@@ -336,12 +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);
            if (rsAvg>=0.3){
             builder.append("("+i+")"+string);
             i++;
             list1.add(dustForm);
             //添加高值路段
                QueryWrapper<MaxRoad> wrapper = new QueryWrapper<>();
@@ -374,17 +378,17 @@
        wrapper.lt("time",DateUtils.getDate(time1,DateUtils.yyyy_MM_dd_EN));
        wrapper.orderByDesc("time");

        MaxRoad maxRoad = maxRoadMapper.selectOne(wrapper);
        String dateString3 = DateUtils.dateToDateString(maxRoad.getTime(), DateUtils.yyyy_MM_dd_CN);
        List<MaxRoad> maxRoads = maxRoadMapper.selectList(wrapper);
        String dateString3 = DateUtils.dateToDateString(maxRoads.get(0).getTime(), DateUtils.yyyy_MM_dd_CN);
        QueryWrapper<MaxRoad> wrapper2 = new QueryWrapper<>();
        wrapper2.eq("time",maxRoad.getTime());
        List<MaxRoad> maxRoads = maxRoadMapper.selectList(wrapper2);
        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 : maxRoads) {
        for (MaxRoad road : maxRoads1) {
            for (DustForm dustForm : dustForms) {
                if (road.getName().equals(dustForm.getRoad())){
                    HashMap<String, Object> map = new HashMap<>();