|
@@ -142,7 +142,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Fl2Sp");
|
|
|
relationTo.put("graphCode", "ArchSubset");
|
|
|
relationTo.put("objFrom", request.getFloorId());
|
|
|
- request.setRelationFrom(relationTo);
|
|
|
+ request.setRelationTo(relationTo);
|
|
|
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && request.getFloorId().equals("isnull")){
|
|
|
//明确建筑,不明确楼层
|
|
@@ -163,7 +163,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
ArrayNode arrayNode = relationTo.putObject("objFrom").putArray("$in");
|
|
|
objectRelationMap.keySet().stream().forEach(floorId -> arrayNode.add(floorId));
|
|
|
relationTo.put("$bindFlag", false);
|
|
|
- request.setRelationFrom(relationTo);
|
|
|
+ request.setRelationTo(relationTo);
|
|
|
request.setFilters(request.getFilters() + "; buildingId = '"+request.getBuildingId()+"'");
|
|
|
}else{
|
|
|
//查询建筑下的空间
|
|
@@ -171,7 +171,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "ArchSubset");
|
|
|
relationTo.put("objFrom", request.getBuildingId());
|
|
|
- request.setRelationFrom(relationTo);
|
|
|
+ request.setRelationTo(relationTo);
|
|
|
}
|
|
|
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && !request.getBuildingId().equals("isnull")){
|
|
@@ -180,7 +180,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "ArchSubset");
|
|
|
relationTo.put("objFrom", request.getBuildingId());
|
|
|
- request.setRelationFrom(relationTo);
|
|
|
+ request.setRelationTo(relationTo);
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && request.getBuildingId().equals("isnull")){
|
|
|
//未明确建筑下的空间
|
|
|
//查询建筑下的空间
|
|
@@ -188,7 +188,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "ArchSubset");
|
|
|
relationTo.put("$bindFlag", false);
|
|
|
- request.setRelationFrom(relationTo);
|
|
|
+ request.setRelationTo(relationTo);
|
|
|
}else if(StrUtil.isEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId())){
|
|
|
}
|
|
|
|