From 2c1d6f56c0dd63c2e98a208fdf0bcf59e6c48518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 17 Nov 2023 17:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2=EF=BC=88?=
 =?UTF-8?q?=E5=85=A8=E6=96=87=EF=BC=89=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsHomeSearchServiceImpl.java       | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index c7e9997f..ffb4c52a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.base.CaseFormat;
 import com.jero.common.es.JeroElasticsearchTemplate;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -626,8 +627,23 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
 //        issueTime.put("resource_type",issueTime);
         issueTime.put("create_time",issueTimeDesc);
         sort.putAll(issueTime);
-        return getIPage(selectValue, queryMapJsonAll, mapHighlight1,
+        IPage page = getIPage(selectValue, queryMapJsonAll, mapHighlight1,
                 pageNo, pageSize, sort,queryJsonMustNot);
+        if(!CollectionUtils.isEmpty(page.getRecords())){
+            // 下划线转驼峰
+            List<Map<String, Object>> listNew = new ArrayList<>();
+            List<Map<String, Object>> list = page.getRecords();
+            list.forEach(p->{
+                Map<String,Object> map = new HashMap<>();
+                p.forEach((k,v)->{
+                    String resultStr = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, k);
+                    map.put(resultStr,v);
+                });
+                listNew.add(map);
+            });
+            page.setRecords(listNew);
+        }
+        return page;
     }
 
 
@@ -681,9 +697,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     private void highlight(Map<String, Object> mapHighlight, String key) {
         Map<String, Object> mapTemp = new HashMap<>();
         List<String> list = new ArrayList<>();
-        list.add("<text class='highlight-class'>");
+        list.add("<span class='highlight-Es-class'>");
         List<String> list1 = new ArrayList<>();
-        list1.add("</text>");
+        list1.add("</span>");
         mapTemp.put("pre_tags", list);
         mapTemp.put("post_tags", list1);
         mapTemp.put("fragment_size", 500);//高亮字段内容长度，去除html样式标签，统计字数，设置为200