Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

@@ -1,7 +1,9 @@
package com.moral.api.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.SecondCruiserSort;
import com.moral.api.entity.SysDictData;
import com.moral.api.exception.BusinessException;
import com.moral.api.mapper.*;
@@ -51,6 +53,9 @@

    @Autowired
    private DustldMapper dustldMapper;

    @Autowired
    private SecondCruiserSortMapper secondCruiserSortMapper;

    /**
     * 保存日报信息
@@ -306,7 +311,6 @@
        StringBuilder builder = new StringBuilder();

        int i = 1;
        long timestamp = System.currentTimeMillis();
        for (String string : strings) {
            DustForm dustForm = new DustForm();
            ArrayList<Double> doubleArrayList = new ArrayList<>();
@@ -366,8 +370,6 @@
                }
            }
        }
        long timestamp2 = System.currentTimeMillis();
        log.info(timestamp2-timestamp+"");
        //排序
        list1.sort(Comparator.comparing(DustForm::getValue).reversed());
        rsMap.put("list1",list1);
@@ -462,6 +464,37 @@
        return dustlds;
    }

    /**
     * 路段排序
     * @param mac
     * @param startTime
     * @param endTime
     * @return
     */
    @Override
    public List<SecondCruiserSort> sort(String mac, String startTime, String endTime) {
        SysDictData list = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER.getValue(),"dustld");
        List<SecondCruiserSort> secondCruiserSorts = secondCruiserSortMapper.getSort(mac, startTime, endTime);

        //校准尘负荷
        if (!ObjectUtils.isEmpty(secondCruiserSorts)){
            for (SecondCruiserSort secondCruiserSort : secondCruiserSorts) {
                if(list.getDataValue().contains(",")){
                    List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
                    if(resultStr.size() % 2 ==0){
//                        secondCruiserSort.setAvg(numAvg(resultStr,BigDecimal.valueOf(secondCruiserSort.getAvg())).doubleValue());
                        secondCruiserSort.setAvg((double) Math.round(numAvg(resultStr, BigDecimal.valueOf(secondCruiserSort.getAvg())).doubleValue()));
                    }
                }else {
                    BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO;
//                    secondCruiserSort.setAvg(BigDecimal.valueOf(secondCruiserSort.getAvg()).add(dataValue).doubleValue());
                    secondCruiserSort.setAvg((double) Math.round(BigDecimal.valueOf(secondCruiserSort.getAvg()).add(dataValue).doubleValue()));
                }
            }
        }
        return secondCruiserSorts;
    }


    //获取图片地址
    private String getList(String path, List<MultipartFile> files1) {