一般检索（全文）添加

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