|
@@ -125,8 +125,8 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
|
|
|
//查询模型下的设备信息
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
- criteria.setFilters("bimId = "+modelRel.getBimId());
|
|
|
- criteria.setFilters("floorId = "+modelRel.getFloorId());
|
|
|
+ criteria.setFilters("bimId = '"+modelRel.getBimId()+"'");
|
|
|
+ criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
AdmResponse admResponse = equipmentService.doQuery(context, criteria, AdmEquipment.class);
|
|
|
List<AdmEquipment> content = (List<AdmEquipment>) admResponse.getContent();
|
|
|
if(CollUtil.isEmpty(content)){
|
|
@@ -149,8 +149,8 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
|
|
|
//查询模型下的元空间信息
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
- criteria.setFilters("bimId = "+modelRel.getBimId());
|
|
|
- criteria.setFilters("floorId = "+modelRel.getFloorId());
|
|
|
+ criteria.setFilters("bimId = '"+modelRel.getBimId()+"'");
|
|
|
+ criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
AdmResponse admResponse = iSpaceService.doQuery(context, criteria, AdmISpace.class);
|
|
|
List<AdmISpace> content = (List<AdmISpace>) admResponse.getContent();
|
|
|
if(CollUtil.isEmpty(content)){
|
|
@@ -186,9 +186,9 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
}
|
|
|
String[] split = bimLocation.split(",");
|
|
|
ObjectNode node = JsonNodeFactory.instance.objectNode();
|
|
|
- node.put("X",split[0]);
|
|
|
- node.put("Y",split[1]);
|
|
|
- node.put("Z",split[2]);
|
|
|
+ node.put("x",Double.valueOf(split[0]));
|
|
|
+ node.put("y",Double.valueOf(split[1]));
|
|
|
+ node.put("z",Double.valueOf(split[2]));
|
|
|
flag = GeoToolsUtil.isPointInPoly(node,outline);
|
|
|
if(!flag){
|
|
|
return flag;
|
|
@@ -230,7 +230,7 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
if(floorMap.containsKey(AdmCommonConstant.FLOOR_ELEVATION)){
|
|
|
Object object = floorMap.get(AdmCommonConstant.FLOOR_ELEVATION);
|
|
|
if(object != null){
|
|
|
- double floorElevation = (Double) object / 1000;
|
|
|
+ double floorElevation = Double.valueOf(object.toString()) / 1000;
|
|
|
infos.put(AdmCommonConstant.FLOOR_ELEVATION,floorElevation);
|
|
|
}
|
|
|
}
|
|
@@ -273,8 +273,8 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
private List<AdmEquipment> queryModelEquip(InstanceUrlParam context, AdmModelRel modelRel){
|
|
|
//查询模型下的设备信息
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
- criteria.setFilters("bimId = '"+modelRel.getBimId()+"'");
|
|
|
- criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
+ criteria.setFilters("bimId = '"+modelRel.getBimId()+"' and floorId = '"+modelRel.getFloorId()+"'");
|
|
|
+ // criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
AdmResponse admResponse = equipmentService.doQuery(context, criteria, AdmEquipment.class);
|
|
|
if(CollUtil.isEmpty(admResponse.getContent())){
|
|
|
return new ArrayList<>();
|