diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index aeeb5b137..5820e9634 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -380,7 +380,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl score = new HashMap<>(); +// Map score1 = new HashMap<>(); +// score.put("order","desc"); +// score1.put("_score",score); +// sort.putAll(score1); JSONObject sort = new JSONObject(); - Map score = new HashMap<>(); - Map score1 = new HashMap<>(); - score.put("order","desc"); - score1.put("_score",score); - sort.putAll(score1); + if(StringUtils.isEmpty(selectValue)){ + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("create_time",createTime); + sort.putAll(createTime1); + } // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1152,10 +1160,10 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map map4 = new HashMap<>(); if("title".equals(field)){ map3.put("boost",1); - }else if("file_text".equals(field)){ - map3.put("boost",0.01); }else if("content".equals(field)){ map3.put("boost",0.01); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); } //特殊处理标题字段 if (field.equals("title")){ @@ -1172,7 +1180,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1219,7 +1227,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1244,11 +1252,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonAll.add(jsonObjectThree); } JSONObject sort = new JSONObject(); - Map createTime = new HashMap<>(); - Map createTime1 = new HashMap<>(); - createTime.put("order","desc"); - createTime1.put("createTime",createTime); - sort.putAll(createTime1); + if(StringUtils.isEmpty(selectValue)){ + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("create_time",createTime); + sort.putAll(createTime1); + } Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); Integer pageSize = Integer.parseInt(map.get("pageSize").toString()); @@ -1402,6 +1412,25 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } } + /** + * 问题知识库高亮设置 + * @param mapHighlight + * @param key + */ + private void problemKnowledgeBaseHighlight(Map mapHighlight, String key) { + Map mapTemp = new HashMap<>(); + List list = new ArrayList<>(); + list.add(""); + List list1 = new ArrayList<>(); + list1.add(""); + mapTemp.put("pre_tags", list); + mapTemp.put("post_tags", list1); + mapTemp.put("fragment_size", 550);//高亮字段内容长度,去除html样式标签,统计字数,设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + } diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 362d5d49d..a5ce32332 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -769,7 +769,8 @@ } .text-select { - flex: 1; + width: calc(100% - 126px); + height: 38px; } } } diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 256fb82cb..0df134b63 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -7,6 +7,7 @@ {{$t('problemClassification')}}