|
@@ -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);
|
|
|
}
|
|
|
|