diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 1fff2406..839acb7f 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1209,17 +1209,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 记录搜索记录到数据库中 if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ - boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "title" - ).minimumShouldMatch("100%").field("title",10f)); - boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "textContent" - ).minimumShouldMatch("100%").field("title",10f)); - boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "textItems" - ).minimumShouldMatch("100%").field("title",10f)); - boolSelectValue.should(QueryBuilders.wildcardQuery("title.keyword","*"+searchInfoEO.getSelectValue()+"*")); - boolQueryBuilder.must(boolSelectValue); + QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); + multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + boolQueryBuilder.must(multiQueryBuilder); } //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword())) { @@ -1481,29 +1475,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(null != value || null != select){ if (null != value && select == null) { - boolSelectValue - .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + value.toUpperCase() + "*").boost(1005f)) - .should(QueryBuilders.wildcardQuery("numberTitle.keyword", "*" + value.toUpperCase() + "*").boost(1003f)) - .should(QueryBuilders.wildcardQuery("yearOrder.keyword", "*" + value.toUpperCase() + "*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("nameTitle.keyword", "*" + value.toUpperCase() + "*").boost(1001f)) - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + value.toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + value.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) - .should(QueryBuilders.wildcardQuery("issue_time", "*" + value.toUpperCase() + "*")); -// multiQueryBuilder = QueryBuilders.multiMatchQuery("*"+value+"*", -// "title.keyword", "textContent", "issue_time").minimumShouldMatch("100%").field("title.keyword", 1000f).field("textContent.keyword", 0.0000000000000000000000000000000001f); -//// boolQueryMust.must(multiQueryBuilder); -// boolQueryShould.should(multiQueryBuilder); + QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); + queryBuilder1 = QueryBuilders.multiMatchQuery(value, + "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + boolQueryShould.must(queryBuilder1); } // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); if (null != select) { - boolSelectValue - .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + real.toUpperCase() + "*").boost(1005f)) - .should(QueryBuilders.wildcardQuery("numberTitle.keyword", "*" + real.toUpperCase() + "*").boost(1003f)) - .should(QueryBuilders.wildcardQuery("yearOrder.keyword", "*" + real.toUpperCase() + "*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("nameTitle.keyword", "*" + real.toUpperCase() + "*").boost(1001f)) - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + real.toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + real.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) - .should(QueryBuilders.wildcardQuery("issue_time", "*" + real.toUpperCase() + "*")); + QueryBuilder queryBuilder2 = QueryBuilders.multiMatchQuery(""); + queryBuilder2 = QueryBuilders.multiMatchQuery(real, + "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + boolQueryShould.must(queryBuilder2); // for (String se : selects) { // if (StringUtils.isNotBlank(se)) { // boolSelectValue @@ -1519,7 +1503,6 @@ public class SearchCenterServiceImpl implements SearchCenterService { // .should(QueryBuilders.wildcardQuery("issue_time", "*" + real + "*")); // boolQueryShould.must(boolSelectValue); // } - boolQueryShould.must(boolSelectValue); } BoolQueryBuilder queryBuilder = new BoolQueryBuilder(); @@ -1541,7 +1524,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { //在结果中检索 // boolQueryBuilder.must(multiQueryBuilder); HighlightBuilder hiBuilder=new HighlightBuilder(); - HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title.keyword"); + HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title"); hiBuilder.field(highlightTitle); HighlightBuilder.Field highlightUser = new HighlightBuilder.Field("textContent"); hiBuilder.field(highlightUser); @@ -1567,7 +1550,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { Map sourceAsMap = searchHit.getSourceAsMap(); //解析高亮字段 Map highlightFields = searchHit.getHighlightFields(); - HighlightField field= highlightFields.get("title.keyword"); + HighlightField field= highlightFields.get("title"); if(field!= null){ Text[] fragments = field.fragments(); String n_field = ""; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 5b6ecc54..0bfc5a1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -66,6 +66,12 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划-企标技术更新计划状态") + @PostMapping("modPlanByState") + public ResponseMessage modPlanByState(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlanByState(esRevisePlan)); + } + @ApiOperation(value = "编辑企标计划") @PostMapping("/modPlanByWk") public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 62c17fcf..18c37c40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -19,6 +19,7 @@ public interface IEsRevisePlanService extends IService { EsRevisePlan getOnePlan(String id);//查询详情 String modPlan(EsRevisePlan esRevisePlan);//编辑 + String modPlanByState(EsRevisePlan esRevisePlan);//编辑 String addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 1b6e05c4..de098d04 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -75,6 +75,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl