소스 검색

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/adm-middleware.git into develop

zhangqiankun 3 년 전
부모
커밋
d670b0b4ad
1개의 변경된 파일12개의 추가작업 그리고 6개의 파일을 삭제
  1. 12 6
      src/main/java/com/persagy/proxy/object/controller/AdmISpaceController.java

+ 12 - 6
src/main/java/com/persagy/proxy/object/controller/AdmISpaceController.java

@@ -1,7 +1,9 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.persagy.proxy.object.model.AdmISpace;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
@@ -98,15 +100,19 @@ public class AdmISpaceController {
     }
 
     /**
-     * 查询
-     * 
-     * @param request
-     * @return
-     * @throws Exception
+     * 根据楼层id查询元空间数据
+     * @param param:请求参数
      */
     @PostMapping("/query")
-    public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {
+    public AdmResponse query(@RequestBody JSONObject param) throws Exception {
+        AdmQueryCriteria request = new AdmQueryCriteria();
         request.setName(AdmISpace.OBJ_TYPE);
+        request.setPageNumber(null==param.getInteger("pageNumber")?1:param.getInteger("pageNumber"));
+        request.setPageSize(null==param.getInteger("pageSize")?1:param.getInteger("pageSize"));
+        if (StrUtil.isNotBlank(param.getString("floorId"))){
+            String filters = " floorId = '"+param.getString("floorId")+"' ";
+            request.setFilters(filters);
+        }
         return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmISpace.class);
     }