|
@@ -147,7 +147,7 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
criteria.setFilters("bimId = '"+modelRel.getBimId()+"'");
|
|
|
criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(context, criteria, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(criteria);
|
|
|
List<AdmEquipment> content = (List<AdmEquipment>) admResponse.getContent();
|
|
|
if(CollUtil.isEmpty(content)){
|
|
|
return;
|
|
@@ -295,7 +295,7 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
criteria.setFilters("bimId = '"+modelRel.getBimId()+"' and floorId = '"+modelRel.getFloorId()+"'");
|
|
|
// criteria.setFilters("floorId = '"+modelRel.getFloorId()+"'");
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(context, criteria, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(criteria);
|
|
|
if(CollUtil.isEmpty(admResponse.getContent())){
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
@@ -308,7 +308,7 @@ public class AdmModelRelServiceImpl extends AbstractAdmBaseServiceImpl<AdmModelR
|
|
|
private List<AdmEquipment> queryEquipmentByBimId(InstanceUrlParam context, AdmModelRel vo){
|
|
|
AdmQueryCriteria criteria = new AdmQueryCriteria();
|
|
|
criteria.setFilters("bimId = '"+vo.getOldBimId()+"'");
|
|
|
- AdmResponse admResponse = equipmentService.doQuery(context, criteria, AdmEquipment.class);
|
|
|
+ AdmResponse admResponse = equipmentService.query(criteria);
|
|
|
return (List<AdmEquipment>)admResponse.getContent();
|
|
|
}
|
|
|
|