ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2025-01-06 10:34:53 +08:00
parent 6b6ec07be2
commit 6040dee569
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -786,6 +786,9 @@ public class ResultServiceImpl implements IResultService {
storage.setDevId(param.getDevId()); storage.setDevId(param.getDevId());
storage.setDevNum(param.getDevNum()); storage.setDevNum(param.getDevNum());
storage.setCode(param.getCode()); storage.setCode(param.getCode());
DictTree dictTree = dictTreeService.getById(param.getScriptType());
List<Double> harmNum = new ArrayList<>();
if (HARMONIC_TYPE_CODE.contains(dictTree.getCode())) {
List<PqScriptCheckData> list = pqScriptCheckDataService.list(new MPJLambdaWrapper<PqScriptCheckData>() List<PqScriptCheckData> list = pqScriptCheckDataService.list(new MPJLambdaWrapper<PqScriptCheckData>()
.distinct() .distinct()
.select(PqScriptCheckData::getHarmNum) .select(PqScriptCheckData::getHarmNum)
@@ -793,7 +796,9 @@ public class ResultServiceImpl implements IResultService {
.isNotNull(PqScriptCheckData::getHarmNum) .isNotNull(PqScriptCheckData::getHarmNum)
.eq(PqScriptCheckData::getIndex, param.getIndex()) .eq(PqScriptCheckData::getIndex, param.getIndex())
); );
List<Double> harmNum = list.stream().map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList()); harmNum = list.stream().sorted(Comparator.comparing(PqScriptCheckData::getHarmNum))
.map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList());
}
ResultVO resultVO = new ResultVO(); ResultVO resultVO = new ResultVO();
if (CollUtil.isEmpty(harmNum)) { if (CollUtil.isEmpty(harmNum)) {
resultVO.setRawData(adNonHarmonicService.listNonHarmData(storage)); resultVO.setRawData(adNonHarmonicService.listNonHarmData(storage));