|
|
|
@ -361,6 +361,10 @@ public class PatrolTaskController extends BaseController { |
|
|
|
keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); |
|
|
|
} |
|
|
|
newList = new ArrayList<>(keyPatrolData.values()); |
|
|
|
if ("1".equals(patrolTaskStatus.getAbnormal())) { |
|
|
|
// 异常置顶 |
|
|
|
newList.sort(Comparator.comparing(PatrolData::getPointStatus)); |
|
|
|
} |
|
|
|
|
|
|
|
PageDomain pageDomain = TableSupport.buildPageRequest(); |
|
|
|
int pageNum = pageDomain.getPageNum(); |
|
|
|
@ -2553,6 +2557,10 @@ public class PatrolTaskController extends BaseController { |
|
|
|
if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { |
|
|
|
newList = newList.stream().filter((element) -> resultAnalysis.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
if ("1".equals(patrolTaskStatus.getAbnormal())) { |
|
|
|
// 异常置顶 |
|
|
|
newList.sort(Comparator.comparing(PatrolData::getPointStatus)); |
|
|
|
} |
|
|
|
|
|
|
|
if (newList.size() > maxNum) { |
|
|
|
return ResponseEntity.ok("超过最大导出数量:" + maxNum + "条,请结合查询条件减少导出的数量!"); |
|
|
|
|