Browse Source

调整设备实现类的问题

lijie 3 years ago
parent
commit
2af53aeeba

+ 3 - 3
src/main/java/com/persagy/proxy/dictionary/service/impl/AdmModelRelServiceImpl.java

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