| | |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public List<SecondCruiserSort> sort(String mac, String startTime, String endTime) { |
|---|
| | | String s = DateUtils.stringToDateString(startTime, "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd"); |
|---|
| | | LambdaQueryWrapper<SecondCruiserSort> wrapper = new LambdaQueryWrapper<>(); |
|---|
| | | wrapper.eq(SecondCruiserSort::getMac,mac); |
|---|
| | | wrapper.eq(SecondCruiserSort::getTime,s); |
|---|
| | | wrapper.orderByDesc(SecondCruiserSort::getValue); |
|---|
| | | List<SecondCruiserSort> secondCruiserSorts = secondCruiserSortMapper.selectList(wrapper); |
|---|
| | | 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; |
|---|
| | | } |
|---|
| | | |
|---|
