From 418eb6f5c1ec3daf0da7d3085ced29be53be9c35 Mon Sep 17 00:00:00 2001 From: JiaoLM <dawnjiao@foxmail.com> Date: Fri, 14 Apr 2023 20:46:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlucene=E5=AF=B9?= =?UTF-8?q?=E7=89=B9=E5=AE=9A=E5=AD=97=E6=AE=B5=E7=B4=A2=E5=BC=95=E4=B8=8D?= =?UTF-8?q?=E5=88=86=E8=AF=8D=E6=9F=A5=E8=AF=A2=E8=AF=AD=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/lucence/common/Searcher.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/Searcher.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/Searcher.java index 27d76e3..9e1348b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/Searcher.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/Searcher.java @@ -68,15 +68,21 @@ public class Searcher { } TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true); booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); + if (whereJson.get("device_code") != null){ + Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code"))); + booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + } //日志类型 - if (whereJson.get("blurry") != null) queryString += "+fieldContent:"+(String) whereJson.get("blurry"); - if (whereJson.get("device_code") != null) queryString += " +device_code:"+(String) whereJson.get("device_code"); - if (whereJson.get("device_code") == null && whereJson.get("blurry") == null) { +// if (whereJson.get("blurry") != null) queryString += "fieldContent:"+(String) whereJson.get("blurry"); + if (whereJson.get("blurry") != null) queryString = (String) whereJson.get("blurry"); +// if (whereJson.get("device_code") != null) queryString += " +device_code:"+(String) whereJson.get("device_code"); + + if (whereJson.get("blurry") == null) { WildcardQuery query=new WildcardQuery(new Term("fieldContent","*")); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); docs = searcher.search(booleanQueryBuilder.build(), end,sort); }else { - Query query = queryParser.parse(queryString); + Query query = queryParser.parse((String) whereJson.get("blurry")); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); docs = searcher.search(booleanQueryBuilder.build(), end,sort); }