1.树数量统计未包括自身数量

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1322,7 +1322,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return companyList.stream().filter(a -> companyList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId())))
                 .peek(b -> {
                     b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyList));
-                    b.setTotal(b.getChildren().stream().filter(c -> c.getTotal() != null).mapToLong(BuildingTreeVo::getTotal).sum());
+                    b.setTotal(b.getChildren().stream().filter(c -> c.getTotal() != null).mapToLong(BuildingTreeVo::getTotal).sum() + b.getTotal());
                 }).collect(Collectors.toList());
 
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/ElasticSearchClientConfig.java

@@ -41,12 +41,9 @@ public class ElasticSearchClientConfig {
         	final String[] parts = StringUtils.split(url, ":");
         	HttpHost httpHost = new HttpHost(parts[0], Integer.parseInt(parts[1]), "http");
         	RestClientBuilder builder = RestClient.builder(httpHost);
-        	builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
-				@Override
-				public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
-					httpClientBuilder.disableAuthCaching();
-					return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-				}
+        	builder.setHttpClientConfigCallback(httpClientBuilder -> {
+				httpClientBuilder.disableAuthCaching();
+				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
 			});
         	builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
 				// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。