|
@@ -1,41 +1,34 @@
|
|
|
package com.persagy.proxy.object.controller;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.ws.rs.QueryParam;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
|
import com.persagy.proxy.adm.handler.SpaceRelationInfoHandler;
|
|
|
+import com.persagy.proxy.adm.request.*;
|
|
|
+import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
|
+import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
+import com.persagy.proxy.adm.utils.ObjectNameUtil;
|
|
|
+import com.persagy.proxy.common.entity.RelationDTO;
|
|
|
import com.persagy.proxy.object.model.AdmBuilding;
|
|
|
-import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
|
|
|
import com.persagy.proxy.object.model.AdmFloor;
|
|
|
import com.persagy.proxy.object.model.AdmSpace;
|
|
|
-import com.persagy.proxy.adm.request.AdmUpDataFloorAndBuildingRequests;
|
|
|
-import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
|
-import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
-import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.object.service.IAdmBuildingService;
|
|
|
import com.persagy.proxy.object.service.IAdmFloorService;
|
|
|
-import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
|
import com.persagy.proxy.object.service.IAdmSpaceService;
|
|
|
-import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
-import com.persagy.proxy.adm.utils.ObjectNameUtil;
|
|
|
-import com.persagy.proxy.common.entity.RelationDTO;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import cn.hutool.core.collection.CollUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.json.JSONUtil;
|
|
|
+import javax.ws.rs.QueryParam;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* Adm 空间 API
|
|
@@ -312,6 +305,12 @@ public class AdmSpaceController {
|
|
|
if(StrUtil.isNotEmpty(request.getZoneType())){
|
|
|
objectNode.put("zoneType", request.getZoneType());
|
|
|
}
|
|
|
+ if(StrUtil.isNotEmpty(request.getFloorId())){
|
|
|
+ objectNode.put("floorId", request.getFloorId());
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(request.getBuildingId())){
|
|
|
+ objectNode.put("buildingId", request.getBuildingId());
|
|
|
+ }
|
|
|
return objectNode;
|
|
|
}
|
|
|
|