fix:补充提交

swb

2024-07-05 f577294fad6b5636a22ce872b3b762ae40fd7799

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

@@ -9,7 +9,6 @@

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,13 +20,11 @@
import com.moral.api.entity.DustldDTO;
import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.SecondCruiserSort;
import com.moral.api.entity.SysDictData;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.SecondCruiserSortMapper;
import com.moral.api.service.HistorySecondCruiserService;
import com.moral.api.service.SysDictTypeService;
import com.moral.util.DateUtils;

/**
@@ -40,8 +37,6 @@
@Service
@Slf4j
public class HistorySecondCruiserServiceImpl extends ServiceImpl<HistorySecondCruiserMapper, HistorySecondCruiser> implements HistorySecondCruiserService {
    @Autowired
    private SysDictTypeService sysDictTypeService;

    @Autowired
    private HistorySecondCruiserMapper historySecondCruiserMapper;
@@ -58,12 +53,12 @@
    public void sort(String startTime, String endTime) {

        if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
            //当前时间的前一天
            startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            //当前时间的前一个小时
            startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");

            //获取当前时间
            endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
        }
        SysDictData list = sysDictTypeService.listOne("ZHC", "dustld");
        List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);

        //
@@ -107,15 +102,6 @@
//                    String flyLon1 = dust.get("flyLon").toString();
                            if (latDouble1==latDouble && lonDouble1==lonDouble){
                                Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
                                if(list.getDataValue().contains(",")){
                                    List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
                                    if(resultStr.size() % 2 ==0){
                                        dustld = numAvg(resultStr,BigDecimal.valueOf(dustld)).doubleValue();
                                    }
                                }else {
                                    BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO;
                                    dustld = BigDecimal.valueOf(dustld).add(dataValue).doubleValue();
                                }
                                doubleArrayList.add(dustld);
                                break;
                            }
@@ -125,26 +111,21 @@
                        continue;
                    }
                    Double ListAva = doubleArrayList.stream() .collect(Collectors.averagingDouble(Double::doubleValue));
                    double rsAvg = new BigDecimal(ListAva/1000).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
                    double rsAvg = new BigDecimal(ListAva).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                    secondCruiserSort.setRoad(string);
                    secondCruiserSort.setValue(rsAvg);
                    secondCruiserSort.setMac(mac);
                    secondCruiserSort.setOrganizationId(organizationId);
                    secondCruiserSort.setTime(endTime);
                    list1.add(secondCruiserSort);
                }
            }
        }
        secondCruiserSortMapper.insertAll(list1);
        if (!ObjectUtils.isEmpty(list1)){
//            log.info(list1.size()+"");
            secondCruiserSortMapper.insertAll(list1);
        }

    }

    private BigDecimal numAvg(List<String> list , BigDecimal num){
        int nums = 1;
        for (int i=0;i<list.size();i=i+2){
            if(num.compareTo(BigDecimal.valueOf(Double.parseDouble(list.get(i))))>= 0 ){
                return num.add(BigDecimal.valueOf(Double.parseDouble(list.get(i+1))));
            }
            nums+=2;
        }
        return num;
    }
}