260312_01_ENH: index, banner scalar에 sort 적용
This commit is contained in:
@@ -21,6 +21,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.DoubleSummaryStatistics;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
@@ -200,7 +201,9 @@ public class StatisticsService {
|
||||
String qid = v.getTargetQid();
|
||||
List<BannerSpec> choices = new ArrayList<>();
|
||||
|
||||
for (VariableItemInfoDto scalar : v.getScalarInfo()) {
|
||||
VariableItemInfoDto[] bannerScalarList =filterVariableScalarInfo(v.getScalarInfo(), null);
|
||||
|
||||
for (VariableItemInfoDto scalar : bannerScalarList) {
|
||||
if (scalar == null) continue;
|
||||
List<Integer> vals = scalar.getValue();
|
||||
if (vals == null || vals.isEmpty()) continue;
|
||||
@@ -666,9 +669,18 @@ public class StatisticsService {
|
||||
return new VariableItemInfoDto[0];
|
||||
}
|
||||
|
||||
return filterVariableScalarInfo(scalarInfo, sValueSet);
|
||||
}
|
||||
|
||||
private VariableItemInfoDto[] filterVariableScalarInfo(VariableItemInfoDto[] scalarInfo, Set<Integer> sValueSet) {
|
||||
//sValueSet 이 없을 수도 있음 없으면 filter를 하지 말아야 함
|
||||
return Arrays.stream(scalarInfo)
|
||||
.filter(Objects::nonNull)
|
||||
.filter(info -> containsAny(info.getValue(), sValueSet))
|
||||
.filter(info -> sValueSet == null || sValueSet.isEmpty() || containsAny(info.getValue(), sValueSet))
|
||||
.sorted(Comparator.comparing(
|
||||
VariableItemInfoDto::getOrder,
|
||||
Comparator.nullsLast(Integer::compareTo)
|
||||
))
|
||||
.toArray(VariableItemInfoDto[]::new);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user