Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -237,7 +237,12 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				.filter(k -> StringUtils.isNotBlank(k.getBizOrgCode()) && k.getBizOrgCode().contains(c.getBizOrgCode()))
 				.count())).collect(Collectors.toList());
 		List<OrgMenuDto> menuList = comDeptList.stream().map(o -> {
-			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName() + " (" + o.getTotal() + ")",
+			/*
+			 * OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName() + " ("
+			 * + o.getTotal() + ")", ObjectUtils.isEmpty(o.getParentId()) ? 0L :
+			 * Long.valueOf(o.getParentId()), o.getBizOrgType(), false, o.getBizOrgCode());
+			 */
+			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
 					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
 					o.getBizOrgCode());
 			return menu;
@@ -404,37 +409,46 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Map<String, Object>> keySiteCountAndBuildingTree(String bizOrgCode) {
-		
+		int allCount=0;
 		Map<String, Integer> keySiteCountMap = parseKeySiteCount(bizOrgCode);
 		ResponseModel<Object> response = equipFeignClient.getBuildingTree();
 		List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
 		if(buildingMapList==null || buildingMapList.size()<1) {
 			return null;
 		}
-		return parseTree((List<Map<String, Object>>)buildingMapList.get(0).get("children"),keySiteCountMap);
+		Map<String, Object> reMap =	parseTree((List<Map<String, Object>>)buildingMapList.get(0).get("children"),keySiteCountMap,allCount);
+		Map<String, Object> fristMap=	buildingMapList.get(0);
+		fristMap.put("name", fristMap.get("instanceName")+" ("+reMap.get("allCount")+")");
+		fristMap.put("children", fristMap.get("children"));
+		buildingMapList.clear();
+		buildingMapList.add(fristMap);
+		return buildingMapList;
 	}
 
 	@SuppressWarnings("unchecked")
-	private List<Map<String, Object>> parseTree(List<Map<String, Object>> children,
-			Map<String, Integer> keySiteCountMap) {
-		
+	private Map<String, Object> parseTree(List<Map<String, Object>> children,
+			Map<String, Integer> keySiteCountMap,int allCount) {
+		Map<String, Object> resultMap= new HashMap<String, Object>();
 		if (!ValidationUtil.isEmpty(children)) {
 			for (Map<String, Object> child : children) {
 				if (child.get("id") != null) {
 					if (keySiteCountMap.containsKey(child.get("id").toString())) {
-						child.put("count",keySiteCountMap.get(child.get("id").toString()));
+						allCount = allCount + keySiteCountMap.get(child.get("id").toString()).intValue();
+						child.put("name",child.get("name") +" ("+keySiteCountMap.get(child.get("id").toString())+")");
 					}else {
-						child.put("count",0);
+						child.put("name",child.get("name") +" ("+0+")");
 					}
 				}else {
-					child.put("count",0);
+					child.put("name",child.get("name") +" ("+0+")");
 				}
 				if (!ValidationUtil.isEmpty(child.get("children"))) {
-				   parseTree((List<Map<String, Object>>) child.get("children"), keySiteCountMap);
+				   parseTree((List<Map<String, Object>>) child.get("children"), keySiteCountMap,allCount);
 				} 
 			}
 		}
-		return children;
+		resultMap.put("children", children);
+		resultMap.put("allCount", allCount);
+		return resultMap;
 	}
 
 	private Map<String, Integer> parseKeySiteCount(String bizOrgCode) {