From 1e37a909bc84876037f96684882eaa0a59ee6bab Mon Sep 17 00:00:00 2001 From: "583641232@qq.com" <583641232@qq.com> Date: Wed, 31 Jul 2024 10:41:00 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=8A=A5=E5=91=8A=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/service/QueryCenterService.java | 8 ++++++-- .../service/impl/CollectionInformationServiceImpl.java | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java index ef6fed4..f038582 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java @@ -590,8 +590,12 @@ public class QueryCenterService { if(!indexList.contains(indexName)){ throw new RuntimeException("非法操作！"); } - - QueryBuilder queryBuilder = QueryBuilders.termQuery("caseId", query.getCaseId()); + QueryBuilder queryBuilder = null; + if (StrUtil.isNotEmpty(query.getCaseId())) { + queryBuilder = QueryBuilders.termQuery("caseId", query.getCaseId()); + }else if(StrUtil.isNotEmpty(query.getAnalysisResultId())){ + queryBuilder = QueryBuilders.termQuery("analysisResultId", query.getAnalysisResultId()); + } DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(indexName); deleteRequest.setQuery(queryBuilder); // 启用刷新操作 diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java index 5bdccfc..7fcf400 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java @@ -142,7 +142,12 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe lqw.eq(StrUtil.isNotEmpty(bo.getCaseId()), CollectionInformation::getCaseId, bo.getCaseId()); } if(StrUtil.isNotBlank(bo.getSearchValue())){ - lqw.queryStringQuery("*"+bo.getSearchValue().trim().replaceAll("([　]|\\s|\\u00A0)+","")+"*"); + String keyword = bo.getSearchValue().trim(); + String keywordQ = "*" + keyword.replaceAll("([　]|\\s|\\u00A0)+", "") + "*"; + lqw.multiMatchQuery(keyword, CollectionInformation::getInformationSources, CollectionInformation::getName, + CollectionInformation::getBasicInfo,CollectionInformation::getRelationInfo,CollectionInformation::getAssetsInfo, + CollectionInformation::getActionInfo,CollectionInformation::getRemark); + } return lqw; }