From 72b88326fa19539da9c0140bb954d18d0c8ecff2 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 25 Apr 2023 12:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=B8=E5=8F=98=E7=8E=87to?= =?UTF-8?q?pnum=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/service/impl/THDistortionServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 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();