Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

问题单修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-23 11:29:04 +08:00
parent 3f4a1254bf
commit 87f08d8558
9 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetMapper.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
public interface RStatLimitTargetMapper extends BaseMapper<RStatLimitTargetDPO> {
Page<MonitorOverLimitVO> getSumLimitTargetPage(Page<RStatLimitRateDPO> p,
Page<MonitorOverLimitVO> getSumLimitTargetPage(Page<MonitorOverLimitVO>p,
@Param("ids") List<String> lineIndexes,
@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
}

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java
View File

@@ -295,13 +295,10 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
lineList.addAll(item.getLineIndexes());
});
}
Page<RStatLimitRateDPO> p = new Page<>();
p.setSize(param.getPageSize());
p.setCurrent(param.getPageNum());
if (CollectionUtil.isNotEmpty(lineList)) {
Page<MonitorOverLimitVO> sumLimitRatePage = targetMapper.getSumLimitTargetPage(p, lineList, DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
page = targetMapper.getSumLimitTargetPage(page, lineList, DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
List<MonitorOverLimitVO> pageRecords = sumLimitRatePage.getRecords();
List<MonitorOverLimitVO> pageRecords = page.getRecords();
if (CollectionUtils.isEmpty(pageRecords)) {
return page;
}
@@ -360,9 +357,8 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
}
if (!CollectionUtils.isEmpty(result)){
List<MonitorOverLimitVO> recordList = new ArrayList<>();
//默认 根据在线监测点个数 倒叙排序
recordList = result.stream().sorted(Comparator.comparing(MonitorOverLimitVO::getOverDay).reversed()).collect(Collectors.toList());
List<MonitorOverLimitVO> recordList = result.stream().sorted(Comparator.comparing(MonitorOverLimitVO::getOverDay).reversed()).collect(Collectors.toList());
page.setRecords(recordList);
return page;
}