From f2f985e7a84c55df87f90cd244fac5ea9dbd0012 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 15:44:53 +0800 Subject: [PATCH 1/6] 58586 --- .../impl/DocumentSearchServiceImpl.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 47125c158..46dfc4de6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1152,10 +1152,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 +1172,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1219,7 +1219,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1402,6 +1402,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", 2000);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + } From bb2e3f8840b1a3799cf2f27a80cf1e0a15fe611d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 16:25:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/problemKnowledgeBase.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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')}} Date: Wed, 24 Aug 2022 16:28:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentTools/searchCenter/components/DocumentLibrary.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } } } From 3342aea1f4fd21cc6354382451a7661749c08ab3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:28:46 +0800 Subject: [PATCH 4/6] update --- .../searchcenter/service/impl/DocumentSearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 46dfc4de6..f0c6c56ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1415,7 +1415,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 2000);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); From 69eb85eccce5817089ff4e96e6371f445cbe77e1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:39:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?58555=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E5=85=A8=E9=83=A8=E7=B4=A2=E5=BC=95=E3=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOServiceImpl.java | 2 +- .../impl/DocumentSearchServiceImpl.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) 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); + 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<>(); @@ -1247,7 +1253,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); - createTime1.put("createTime",createTime); + createTime1.put("create_time",createTime); sort.putAll(createTime1); Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); From ec3f4204e10c77b17852e5cfda2293d1f189691d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:52:05 +0800 Subject: [PATCH 6/6] 58577 --- .../impl/DocumentSearchServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 27e30c886..a86912723 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -554,11 +554,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { // score1.put("_score",score); // sort.putAll(score1); JSONObject sort = new JSONObject(); - Map createTime = new HashMap<>(); - Map createTime1 = new HashMap<>(); - createTime.put("order","desc"); - createTime1.put("create_time",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); + } // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1250,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("create_time",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());