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

@@ -291,7 +291,8 @@ 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 = this.list(wp);
+        List<EquipmentType> allTypes= es.searchAll("type_pinyin",0, 3000,null, EquipmentType.class);
+//        List<EquipmentType> allTypes = this.list(wp);
         List<EquipmentTypeDto> treeResult= buildTypeTree(searchResults,allTypes);
         ESTypeDto resultDto=new ESTypeDto();
         resultDto.setTypeDto(treeResult);

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

@@ -27,6 +27,33 @@ public class ElasticsearchUtil<T> {
         this.client = client;
     }
 
+    public List<T> searchAll(String typeName, Integer pageNum, Integer pageSize,Integer type, Class<T> entityClass) throws IOException {
+        if (pageNum < 0) pageNum = 0;
+
+        SearchRequest request = new SearchRequest(typeName);
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+
+        builder.from(pageNum);
+        builder.size(pageSize);
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        boolQueryBuilder.mustNot(QueryBuilders.matchQuery("name", "超级根"));
+        builder.query(boolQueryBuilder);
+        builder.timeout(new TimeValue(60, TimeUnit.SECONDS));
+
+        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);
+        }
+
+        return entityList;
+    }
+
     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 {
         if (pageNum < 0) pageNum = 0;