Browse Source

fix bug:业务空间台账,选中右侧列表,建筑楼层选择全部,列表得20秒才加载出来。

lijie 3 years ago
parent
commit
a1395efc8b

+ 3 - 18
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -147,7 +147,6 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         }else{
             request.setFilters(filters+"; "+classCodeFilter);
         }
-        AdmResponse response = null;
         if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && !request.getFloorId().equals("isnull")){
             //明确建筑,明确楼层
             request.setFilters(request.getFilters()+" ; buildingId = '"+request.getBuildingId()+"' ; floorId='"+request.getFloorId()+"' ;");
@@ -160,28 +159,16 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             return response;*/
         }else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && !request.getBuildingId().equals("isnull")){
             //查询建筑下的空间
-            /*ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
-            relationTo.put("relCode", "Bd2Sp");
-            relationTo.put("graphCode", "ArchSubset");
-            relationTo.put("objFrom", request.getBuildingId());
-            request.setRelationTo(relationTo);
-            response = query(request);
-            return response;*/
             request.setFilters(request.getFilters()+" ; buildingId = '"+request.getBuildingId()+"' ; ");
         }else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && request.getBuildingId().equals("isnull")){
             //未明确建筑下的空间
             //查询建筑下的空间
-            /*ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
-            relationTo.put("relCode", "Bd2Sp");
-            relationTo.put("graphCode", "ArchSubset");
-            relationTo.put("$bindFlag", false);
-            request.setRelationTo(relationTo);
-            response = query(request);
-            return response;*/
             request.setFilters(request.getFilters()+" ; buildingId isnull");
         }else if(StrUtil.isEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId())){
         }
-        response = this.query(request);
+        AdmResponse response = this.doQuery(context,request,AdmSpace.class);
+        response.setPageNumber(request.getPageNumber() == null ? 50 : request.getPageNumber());
+        response.setPageSize(request.getPageSize() == null ? 1 : request.getPageSize());
         return response;
     }
 
@@ -468,9 +455,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
      * Description: 根据查询条件查询空间统计数据,定制接口,后续可优化口
      * @param request : 请求参数
      * @return : com.persagy.proxy.adm.request.AdmResponse
-     * @author : lijie
      * @date :2021/10/28 21:07
-     * Update By lijie 2021/10/28 21:07
      */
     private AdmResponse query(AdmDCSQueryRequest request) {
     	String orders = request.getOrders();