修改谐波bug

This commit is contained in:
cdf
2023-04-11 16:05:00 +08:00
parent 826778a2b8
commit bedbebabc3
3 changed files with 20 additions and 6 deletions

View File

@@ -135,9 +135,10 @@ public class THDistortionServiceImpl implements THDistortionService {
/*监测点ID扁平化*/
List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( ));
QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
wrapper.in ("measurement_point_id",collect).
between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ()).
orderByDesc ("v_thd");
wrapper.in ("measurement_point_id",collect)
.between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ())
.eq("data_type",1)
.orderByDesc ("v_thd");
List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper);
rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> {
RMpVThdVO rMpVThdVO = new RMpVThdVO ( );