From 5b3c5e6c94743e6f4c846d1ae8537816670bc38b Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 25 Apr 2023 12:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/harmonic/service/impl/THDistortionServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 473022c65..022c34406 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 @@ -135,11 +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.select ("measurement_point_id","max(v_thd)") + wrapper.select ("measurement_point_id","max(v_thd) as v_thd") .in("measurement_point_id", collect) .between("data_date", statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime()) .eq("data_type", 0).groupBy ("measurement_point_id") - .orderByDesc("max(v_thd)"); + .orderByDesc("v_thd"); List rMpVThdList = rMpVThdMapper.selectList(wrapper); rMpVThdVOList = rMpVThdList.stream().limit(topNum).map(rMpVThd -> { RMpVThdVO rMpVThdVO = new RMpVThdVO();