大屏列表查询添加"无设备类别"条件

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/ZLDPStatisticsServiceImpl.java

@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -913,11 +912,14 @@ public class ZLDPStatisticsServiceImpl {
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("EQU_CATEGORY"));
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY", "*" + test + "*"));
-            boolMust.must(meBuilder);
-
+            if ("无设备类别".equals(map.getString("EQU_CATEGORY"))){
+                boolMust.mustNot(QueryBuilders.existsQuery("EQU_CATEGORY"));
+            }else {
+                BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+                String test = QueryParser.escape(map.getString("EQU_CATEGORY"));
+                meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY", "*" + test + "*"));
+                boolMust.must(meBuilder);
+            }
         }
         if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();