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

1.代码调整

Browse Source
This commit is contained in:
wr
2024-02-19 15:02:29 +08:00
parent 06c2cf095c
commit 0bee509621
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionVO.java
View File

@@ -3,7 +3,9 @@ package com.njcn.harmonic.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
* 类的介绍：
@@ -32,4 +34,9 @@ public class PollutionVO {
@ApiModelProperty("子级")
private List<PollutionVO> children;
public void setChildren(List<PollutionVO> children) {
List<PollutionVO> listSort = children.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
listSort.addAll(children.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
this.children = listSort;
}
}

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
View File

@@ -254,12 +254,13 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
subPollutionVO.add(pollutionsubVO);
});
pollutionVO.setChildren(subPollutionVO);
list.add(pollutionVO);
}
}
if (!CollectionUtils.isEmpty(list)){
return list.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
List<PollutionVO> listSort = list.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
listSort.addAll(list.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
return listSort;
}
return list;
}