总揽大屏中屏幕统计增加在用条件

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

@@ -309,6 +309,9 @@ public class JGDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
+        // 且在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -336,6 +339,8 @@ public class JGDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 且在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");