Skip to content

A
amos-boot-biz
Commit cecbaebe authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 737fbd0f e01135e6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
View file @ cecbaebe
...@@ -727,7 +727,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -727,7 +727,7 @@ public class JGDPStatisticsServiceImpl {
boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList()))); boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
SearchSourceBuilder builder = new SearchSourceBuilder(); SearchSourceBuilder builder = new SearchSourceBuilder();
builder.query(boolMust); builder.query(boolMust);
TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20); TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20).missing(EquimentEnum.WEIDENGJI.getCode());
builder.aggregation(aggregationBuilder); builder.aggregation(aggregationBuilder);
builder.size(0); builder.size(0);
request.source(builder); request.source(builder);
...@@ -740,7 +740,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -740,7 +740,7 @@ public class JGDPStatisticsServiceImpl {
long docCount = bucket.getDocCount(); long docCount = bucket.getDocCount();
dataMap.put(category, docCount); dataMap.put(category, docCount);
} }
resultList = Arrays.stream(EquimentEnum.values()).filter(e -> e.getCode() > 0).map(e -> { resultList = Arrays.stream(EquimentEnum.values()).map(e -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("name", e.getName()); map.put("name", e.getName());
map.put("value", dataMap.getOrDefault(e.getCode().toString(), 0L)); map.put("value", dataMap.getOrDefault(e.getCode().toString(), 0L));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment