Skip to content

A
amos-boot-biz
Commit 99229acb authored by chenhao's avatar chenhao
Browse files
Options

修改获取子节点的方法

parent ddcb43d2
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 39 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java
View file @ 99229acb
...@@ -293,7 +293,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -293,7 +293,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("id").toString().equals(id) && map.get("parentId")!=null ) { if(map.get("id").toString().equals(id) && map.get("parentId")!=null ) {
tegartString=tegartString+","+map.get("parentId").toString(); tegartString=tegartString+","+map.get("parentId").toString();
return getNodeAllParentIds(list,map.get("parentId").toString(),tegartString); getNodeAllParentIds(list,map.get("parentId").toString(),tegartString);
} }
} }
return tegartString; return tegartString;
...@@ -313,7 +313,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -313,7 +313,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) { if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) {
resultList.add(map.get("id").toString()); resultList.add(map.get("id").toString());
return getNodeAllnodeIds(resultList,list,map.get("id").toString()); getNodeAllnodeIds(resultList,list,map.get("id").toString());
} }
} }
return resultList; return resultList;
......
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
View file @ 99229acb
...@@ -87,12 +87,11 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -87,12 +87,11 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
*/ */
public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate, public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
String useNature, String fireFacilitiesInfo, String bizOrgCode) { String useNature, String fireFacilitiesInfo, String bizOrgCode) {
List<Long> ids =null; List<Long> ids = null;
if(buildingId!=null && buildingId.intValue()!= 0) { if (buildingId != null && buildingId.intValue() != 0) {
ids =getNodeAllnodeIds(buildingId); ids = getNodeAllnodeIds(buildingId);
} }
return keySiteMapper.getPageList(page, name, ids, fireEnduranceRate, useNature, fireFacilitiesInfo, return keySiteMapper.getPageList(page, name, ids, fireEnduranceRate, useNature, fireFacilitiesInfo, bizOrgCode);
bizOrgCode);
} }
@Override @Override
...@@ -304,7 +303,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -304,7 +303,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
String[] fireEnduranceRateArray = keySiteExcleDto.getBuildingName().split("@"); String[] fireEnduranceRateArray = keySiteExcleDto.getBuildingName().split("@");
keySiteDto.setBuildingId(Long.parseLong(fireEnduranceRateArray[1])); keySiteDto.setBuildingId(Long.parseLong(fireEnduranceRateArray[1]));
keySiteDto.setBuildingName(fireEnduranceRateArray[0]); keySiteDto.setBuildingName(fireEnduranceRateArray[0]);
if(maps.containsKey(fireEnduranceRateArray[1])) { if (maps.containsKey(fireEnduranceRateArray[1])) {
keySiteDto.setParentBuildingId(maps.get(fireEnduranceRateArray[1])); keySiteDto.setParentBuildingId(maps.get(fireEnduranceRateArray[1]));
} }
...@@ -335,6 +334,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -335,6 +334,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
} }
return this.saveBatch(excelList); return this.saveBatch(excelList);
} }
public Map<String, String> getAllBuildingIdForParentBuilingIds(List<KeySiteExcleDto> excelDtoList) { public Map<String, String> getAllBuildingIdForParentBuilingIds(List<KeySiteExcleDto> excelDtoList) {
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
for (KeySiteExcleDto keySiteExcleDto : excelDtoList) { for (KeySiteExcleDto keySiteExcleDto : excelDtoList) {
...@@ -409,17 +409,18 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -409,17 +409,18 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public List<Map<String, Object>> keySiteCountAndBuildingTree(String bizOrgCode) { public List<Map<String, Object>> keySiteCountAndBuildingTree(String bizOrgCode) {
int allCount=0; int allCount = 0;
Map<String, Integer> keySiteCountMap = parseKeySiteCount(bizOrgCode); Map<String, Integer> keySiteCountMap = parseKeySiteCount(bizOrgCode);
ResponseModel<Object> response = equipFeignClient.getBuildingTree(); ResponseModel<Object> response = equipFeignClient.getBuildingTree();
List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult(); List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
if(buildingMapList==null || buildingMapList.size()<1) { if (buildingMapList == null || buildingMapList.size() < 1) {
return null; return null;
} }
Map<String, Object> reMap = parseTree((List<Map<String, Object>>)buildingMapList.get(0).get("children"),keySiteCountMap,allCount); Map<String, Object> reMap = parseTree((List<Map<String, Object>>) buildingMapList.get(0).get("children"),
Map<String, Object> fristMap= buildingMapList.get(0); keySiteCountMap, allCount);
Map<String, Object> fristMap = buildingMapList.get(0);
fristMap.put("id", 0); fristMap.put("id", 0);
fristMap.put("name", fristMap.get("instanceName")+" ("+reMap.get("allCount")+")"); fristMap.put("name", fristMap.get("instanceName") + " (" + reMap.get("allCount") + ")");
fristMap.put("children", fristMap.get("children")); fristMap.put("children", fristMap.get("children"));
buildingMapList.clear(); buildingMapList.clear();
buildingMapList.add(fristMap); buildingMapList.add(fristMap);
...@@ -427,23 +428,24 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -427,23 +428,24 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Map<String, Object> parseTree(List<Map<String, Object>> children, private Map<String, Object> parseTree(List<Map<String, Object>> children, Map<String, Integer> keySiteCountMap,
Map<String, Integer> keySiteCountMap,int allCount) { int allCount) {
Map<String, Object> resultMap= new HashMap<String, Object>(); Map<String, Object> resultMap = new HashMap<String, Object>();
if (!ValidationUtil.isEmpty(children)) { if (!ValidationUtil.isEmpty(children)) {
for (Map<String, Object> child : children) { for (Map<String, Object> child : children) {
if (child.get("id") != null) { if (child.get("id") != null) {
if (keySiteCountMap.containsKey(child.get("id").toString())) { if (keySiteCountMap.containsKey(child.get("id").toString())) {
allCount = allCount + keySiteCountMap.get(child.get("id").toString()).intValue(); allCount = allCount + keySiteCountMap.get(child.get("id").toString()).intValue();
child.put("name",child.get("name") +" ("+keySiteCountMap.get(child.get("id").toString())+")"); child.put("name",
}else { child.get("name") + " (" + keySiteCountMap.get(child.get("id").toString()) + ")");
child.put("name",child.get("name") +" ("+0+")"); } else {
child.put("name", child.get("name") + " (" + 0 + ")");
} }
}else { } else {
child.put("name",child.get("name") +" ("+0+")"); child.put("name", child.get("name") + " (" + 0 + ")");
} }
if (!ValidationUtil.isEmpty(child.get("children"))) { if (!ValidationUtil.isEmpty(child.get("children"))) {
parseTree((List<Map<String, Object>>) child.get("children"), keySiteCountMap,allCount); parseTree((List<Map<String, Object>>) child.get("children"), keySiteCountMap, allCount);
} }
} }
} }
...@@ -477,25 +479,25 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -477,25 +479,25 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
} }
public Map<String, String> getNodeAllParentIds(List<String> ids) { public Map<String, String> getNodeAllParentIds(List<String> ids) {
Map<String, String> map =new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
ResponseModel<List<Map<String, Object>>> response= equipFeignClient.getBuildingTreeList(); ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getBuildingTreeList();
List<Map<String, Object>> responseList =response.getResult(); List<Map<String, Object>> responseList = response.getResult();
if(response.getResult()==null && response.getResult().size()<1) { if (response.getResult() == null && response.getResult().size() < 1) {
return null; return null;
} }
ids.stream().forEach(i->{ ids.stream().forEach(i -> {
String tegartString = getNodeAllParentIds( responseList,i,i); String tegartString = getNodeAllParentIds(responseList, i, i);
map.put(i, tegartString); map.put(i, tegartString);
}); });
return map; return map;
} }
private String getNodeAllParentIds(List<Map<String, Object>> list , String id,String tegartString){ private String getNodeAllParentIds(List<Map<String, Object>> list, String id, String tegartString) {
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("id").toString().equals(id) && map.get("parentId")!=null ) { if (map.get("id").toString().equals(id) && map.get("parentId") != null) {
tegartString=tegartString+","+map.get("parentId").toString(); tegartString = tegartString + "," + map.get("parentId").toString();
return getNodeAllParentIds(list,map.get("parentId").toString(),tegartString); getNodeAllParentIds(list, map.get("parentId").toString(), tegartString);
} }
} }
return tegartString; return tegartString;
...@@ -504,19 +506,19 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite ...@@ -504,19 +506,19 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
public List<Long> getNodeAllnodeIds(Long id) { public List<Long> getNodeAllnodeIds(Long id) {
List<Long> resultList = new ArrayList<Long>(); List<Long> resultList = new ArrayList<Long>();
resultList.add(id); resultList.add(id);
ResponseModel<List<Map<String, Object>>> response= equipFeignClient.getBuildingTreeList(); ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getBuildingTreeList();
List<Map<String, Object>> responseList =response.getResult(); List<Map<String, Object>> responseList = response.getResult();
if(response.getResult()==null && response.getResult().size()<1) { if (response.getResult() == null && response.getResult().size() < 1) {
return null; return null;
} }
return getNodeAllnodeIds(resultList, responseList,id.toString()); return getNodeAllnodeIds(resultList, responseList, id.toString());
} }
private List<Long> getNodeAllnodeIds(List<Long> resultList,List<Map<String, Object>> list,String id){ private List<Long> getNodeAllnodeIds(List<Long> resultList, List<Map<String, Object>> list, String id) {
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) { if (map.get("parentId").toString().equals(id) && map.get("parentId") != null) {
resultList.add(Long.parseLong(map.get("id").toString())); resultList.add(Long.parseLong(map.get("id").toString()));
return getNodeAllnodeIds(resultList,list,map.get("id").toString()); getNodeAllnodeIds(resultList, list, map.get("id").toString());
} }
} }
return resultList; return resultList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment