|
@@ -108,9 +108,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
|
|
|
@Override
|
|
|
public AdmResponse doQuerySpaces(InstanceUrlParam context, AdmDCSQueryRequest request) {
|
|
|
- AdmQueryCriteria admQueryCriteria = new AdmQueryCriteria();
|
|
|
- admQueryCriteria.setCascade(request.getCascade());
|
|
|
- admQueryCriteria.setName(AdmSpace.OBJ_TYPE);
|
|
|
+ request.setName(AdmSpace.OBJ_TYPE);
|
|
|
String classCodeFilter = "";
|
|
|
if(StrUtil.isNotEmpty(request.getZoneType())){
|
|
|
classCodeFilter = "classCode = '"+request.getZoneType()+"'";
|
|
@@ -124,9 +122,9 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
}
|
|
|
String filters = request.getFilters();
|
|
|
if(StrUtil.isBlank(filters)){
|
|
|
- admQueryCriteria.setFilters(classCodeFilter);
|
|
|
+ request.setFilters(classCodeFilter);
|
|
|
}else{
|
|
|
- admQueryCriteria.setFilters(filters+";"+classCodeFilter);
|
|
|
+ request.setFilters(filters+";"+classCodeFilter);
|
|
|
}
|
|
|
if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && !request.getFloorId().equals("isnull")){
|
|
|
//明确建筑,明确楼层
|
|
@@ -134,7 +132,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Fl2Sp");
|
|
|
relationTo.put("graphCode", "MechInArch");
|
|
|
relationTo.put("objFrom", request.getFloorId());
|
|
|
- admQueryCriteria.setRelationFrom(relationTo);
|
|
|
+ request.setRelationFrom(relationTo);
|
|
|
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && request.getFloorId().equals("isnull")){
|
|
|
//明确建筑,不明确楼层
|
|
@@ -155,15 +153,15 @@ 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);
|
|
|
- admQueryCriteria.setRelationFrom(relationTo);
|
|
|
- admQueryCriteria.setFilters(admQueryCriteria.getFilters() + "; buildingId = '"+request.getBuildingId()+"'");
|
|
|
+ request.setRelationFrom(relationTo);
|
|
|
+ request.setFilters(request.getFilters() + "; buildingId = '"+request.getBuildingId()+"'");
|
|
|
}else{
|
|
|
//查询建筑下的空间
|
|
|
ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "MechInArch");
|
|
|
relationTo.put("objFrom", request.getBuildingId());
|
|
|
- admQueryCriteria.setRelationFrom(relationTo);
|
|
|
+ request.setRelationFrom(relationTo);
|
|
|
}
|
|
|
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && !request.getBuildingId().equals("isnull")){
|
|
@@ -172,7 +170,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "MechInArch");
|
|
|
relationTo.put("objFrom", request.getBuildingId());
|
|
|
- admQueryCriteria.setRelationFrom(relationTo);
|
|
|
+ request.setRelationFrom(relationTo);
|
|
|
}else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && request.getBuildingId().equals("isnull")){
|
|
|
//未明确建筑下的空间
|
|
|
//查询建筑下的空间
|
|
@@ -180,11 +178,11 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
|
|
|
relationTo.put("relCode", "Bd2Sp");
|
|
|
relationTo.put("graphCode", "MechInArch");
|
|
|
relationTo.put("$bindFlag", false);
|
|
|
- admQueryCriteria.setRelationFrom(relationTo);
|
|
|
+ request.setRelationFrom(relationTo);
|
|
|
}else if(StrUtil.isEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId())){
|
|
|
}
|
|
|
|
|
|
- AdmResponse response = doQuery(AdmContextUtil.toDmpContext(), admQueryCriteria, AdmSpace.class);
|
|
|
+ AdmResponse response = doQuery(AdmContextUtil.toDmpContext(), request, AdmSpace.class);
|
|
|
//空间需要补充分类名称属性
|
|
|
ensureSpecialValues(context, (List<AdmSpace>) response.getContent());
|
|
|
return response;
|