diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java index c7470c399..473022c65 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java @@ -2,7 +2,6 @@ package com.njcn.harmonic.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -136,10 +135,11 @@ public class THDistortionServiceImpl implements THDistortionService { /*监测点ID扁平化*/ List collect = deviceList.stream().map(GeneralDeviceDTO::getLineIndexes).flatMap(Collection::stream).distinct().collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in("measurement_point_id", collect) + wrapper.select ("measurement_point_id","max(v_thd)") + .in("measurement_point_id", collect) .between("data_date", statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime()) - .eq("data_type", 0) - .orderByDesc("v_thd"); + .eq("data_type", 0).groupBy ("measurement_point_id") + .orderByDesc("max(v_thd)"); List rMpVThdList = rMpVThdMapper.selectList(wrapper); rMpVThdVOList = rMpVThdList.stream().limit(topNum).map(rMpVThd -> { RMpVThdVO rMpVThdVO = new RMpVThdVO();