Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -343,7 +343,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         List<EquipmentType> searchResults = es.searchEntities("type_pinyin",req.getNickName(),"name",0, 50,req.getType(), req.getTypeName(), req.getSearchType(), EquipmentType.class);
         LambdaQueryWrapper<EquipmentType> wp = this.createWrapper(req);
         // 获取所有组织机构数据
-        List<EquipmentType> allTypes= es.searchAll("type_pinyin",0, 3000,null, EquipmentType.class);
+        List<EquipmentType> allTypes= es.searchAll("type_pinyin",0, 3000, EquipmentType.class);
 //        List<EquipmentType> allTypes = this.list(wp);
         List<EquipmentTypeDto> treeResult= buildTypeTree(searchResults,allTypes);
         ESTypeDto resultDto=new ESTypeDto();

jyzb-biz/src/main/java/com/junmp/jyzb/utils/ElasticsearchUtil.java

@@ -13,10 +13,9 @@ import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class ElasticsearchUtil<T> {
     private final RestHighLevelClient client;
@@ -27,13 +26,13 @@ public class ElasticsearchUtil<T> {
         this.client = client;
     }
 
-    public List<T> searchAll(String typeName, Integer pageNum, Integer pageSize,Integer type, Class<T> entityClass) throws IOException {
+    public List<T> searchAll(String typeName, int pageNum, int pageSize, Class<T> entityClass) throws IOException {
         if (pageNum < 0) pageNum = 0;
 
         SearchRequest request = new SearchRequest(typeName);
         SearchSourceBuilder builder = new SearchSourceBuilder();
 
-        builder.from(pageNum);
+        builder.from(pageNum * pageSize);
         builder.size(pageSize);
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         boolQueryBuilder.mustNot(QueryBuilders.matchQuery("name", "超级根"));
@@ -44,15 +43,19 @@ public class ElasticsearchUtil<T> {
         request.source(builder);
         SearchResponse searchResponse = client.search(request, RequestOptions.DEFAULT);
 
-        List<T> entityList = new ArrayList<>();
-        for (SearchHit documentFields : searchResponse.getHits().getHits()) {
-            Map<String, Object> sourceAsMap = documentFields.getSourceAsMap();
-            T entity = fromMap(sourceAsMap, entityClass);
-
-            entityList.add(entity);
+        ObjectMapper objectMapper = new ObjectMapper();
+        return Arrays.stream(searchResponse.getHits().getHits())
+                .map(SearchHit::getSourceAsString)
+                .map(sourceAsString -> {
+                    try {
+                        return objectMapper.readValue(sourceAsString, entityClass);
+                    } catch (IOException e) {
+                        // 处理异常
+                        return null;
                     }
-
-        return entityList;
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 
     public List<T> searchEntities(String typeName,String nickName, String index, Integer pageNum, Integer pageSize,Integer type, String keyword,String searchType, Class<T> entityClass) throws IOException {

jyzb-boot/src/main/resources/application.yml

@@ -18,6 +18,7 @@ spring:
   main:
     #bea同名类进行注册时，准许覆盖注册
     allow-bean-definition-overriding: true
+    jvmargs: "-XX:+UseG1GC"
   application:
     name: jyzb-app
   rabbitmq: