修改大屏设备接口查询增加IS_SUPERVISORY筛选条件0全部1已赋码2未赋码

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

@@ -80,6 +80,8 @@ public class ZLDPStatisticsServiceImpl {
 
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
+    // 是否赋码0全部1已赋码2未赋码
+    public static final String IS_SUPERVISORY = "IS_SUPERVISORY";
     // 信信息化管理情况:1-二维码；2-电子标签；99-无
     public static final String INFORMATION_SITUATION = "INFORMATION_SITUATION";
 
@@ -928,12 +930,25 @@ public class ZLDPStatisticsServiceImpl {
             pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
             boolMust.must(pBuilder);
         }else{
-            //已赋码
-            boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
-            boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
-            //状态为已认领
-            String[] status = {"草稿","已拒领","待认领"};
-            boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
+            if("1".equals(map.getString("IS_SUPERVISORY"))){
+                //已赋码
+                boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+                boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+                //状态为已认领
+                String[] status = {"草稿","已拒领","待认领"};
+                boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
+            }else if("2".equals(map.getString("IS_SUPERVISORY"))){
+                //未赋码
+                boolMust.mustNot(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+                //状态为已认领
+                String[] status = {"草稿","已拒领","待认领"};
+                boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
+            }else{
+                //状态为已认领
+                String[] status = {"草稿","已拒领","待认领"};
+                boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
+            }
+
         }
 
         builder.query(boolMust);