|
@@ -276,6 +276,12 @@ public class AdmSystemController {
|
|
|
admQueryCriteriaBd.setName("buildingList");
|
|
|
AdmQueryCriteria admQueryCriteriaFl = new AdmQueryCriteria();
|
|
|
admQueryCriteriaFl.setName("floorList");
|
|
|
+ List<AdmQueryCriteria> cascadeFlBd = new ArrayList<>(1);
|
|
|
+ AdmQueryCriteria admQueryCriteriaBdFl = new AdmQueryCriteria();
|
|
|
+ admQueryCriteriaBdFl.setName("building");
|
|
|
+ cascadeFlBd.add(admQueryCriteriaBdFl);
|
|
|
+ admQueryCriteriaFl.setCascade(cascadeFlBd);
|
|
|
+
|
|
|
List<AdmQueryCriteria> cascade = new ArrayList<>(1);
|
|
|
cascade.add(admQueryCriteriaBd);
|
|
|
cascade.add(admQueryCriteriaFl);
|
|
@@ -285,34 +291,33 @@ public class AdmSystemController {
|
|
|
if(CollUtil.isNotEmpty(syses.getContent())){
|
|
|
admSystemList = (List<AdmSystem>) syses.getContent();
|
|
|
admSystemList.stream().forEach(admSystem -> {
|
|
|
- List<ObjectNode> buildingFloorInfoList = new ArrayList<>();
|
|
|
List<AdmBuilding> buildingList = admSystem.getBuildingList();
|
|
|
+ List<ObjectNode> buildingFloorInfoList = new ArrayList<>();
|
|
|
if(CollUtil.isNotEmpty(buildingList)){
|
|
|
buildingList.stream().forEach(admBuilding -> {
|
|
|
ObjectNode info = JsonNodeFactory.instance.objectNode();
|
|
|
info.put("BuildID",admBuilding.getId());
|
|
|
info.put("BuildName",admBuilding.getLocalName());
|
|
|
buildingFloorInfoList.add(info);
|
|
|
-
|
|
|
- List<AdmFloor> admFloorList = admSystem.getFloorList();
|
|
|
- if(CollUtil.isNotEmpty(admFloorList)){
|
|
|
- Map<String, AdmFloor> admFloorMap = CollUtil.fieldValueMap(admFloorList, "buildingId");
|
|
|
- if(admFloorMap.containsKey(admBuilding.getId())){
|
|
|
- ObjectNode infobd = JsonNodeFactory.instance.objectNode();
|
|
|
- infobd.put("BuildID",admBuilding.getId());
|
|
|
- infobd.put("BuildName",admBuilding.getLocalName());
|
|
|
- infobd.put("FloorID",admFloorMap.get(admBuilding.getId()).getId());
|
|
|
- infobd.put("FloorName",admFloorMap.get(admBuilding.getId()).getLocalName());
|
|
|
- buildingFloorInfoList.add(infobd);
|
|
|
- }
|
|
|
- }
|
|
|
});
|
|
|
- admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
|
|
|
+
|
|
|
admSystem.setBuildingList(null);
|
|
|
+ Map<String, AdmBuilding> admBuildingMap = CollUtil.fieldValueMap(buildingList, BaseEntity.PROP_ID);
|
|
|
+ List<AdmFloor> admFloorList = admSystem.getFloorList();
|
|
|
+ if(CollUtil.isNotEmpty(admFloorList)){
|
|
|
+ //Map<String, AdmFloor> admFloorMap = CollUtil.fieldValueMap(admFloorList, "buildingId");
|
|
|
+ admFloorList.stream().forEach(admFloor -> {
|
|
|
+ ObjectNode infobd = JsonNodeFactory.instance.objectNode();
|
|
|
+ infobd.put("BuildID",admFloor.getBuildingId());
|
|
|
+ infobd.put("BuildName",admFloor.getBuilding() == null ? (admBuildingMap.get(admFloor.getBuildingId()) != null ? admBuildingMap.get(admFloor.getBuildingId()).getLocalName() : "") :admFloor.getBuilding().getLocalName());
|
|
|
+ infobd.put("FloorID",admFloor.getId());
|
|
|
+ infobd.put("FloorName",admFloor.getLocalName());
|
|
|
+ buildingFloorInfoList.add(infobd);
|
|
|
+ });
|
|
|
+ }
|
|
|
admSystem.setFloorList(null);
|
|
|
- } else{
|
|
|
- admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
|
|
|
}
|
|
|
+ admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
|
|
|
});
|
|
|
syses.setContent(CollUtil.isEmpty(admSystemList) ? new ArrayList<>(1) : admSystemList);
|
|
|
}
|