|
@@ -1,17 +1,15 @@
|
|
|
package com.persagy.proxy.adm.controller;
|
|
|
|
|
|
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.model.AdmFloor;
|
|
|
import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.IAdmFloorService;
|
|
|
+import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import javax.ws.rs.QueryParam;
|
|
|
-
|
|
|
/**
|
|
|
* @author zhangwencheng
|
|
|
* 楼层相关接口
|
|
@@ -32,8 +30,8 @@ public class AdmEquipFloorController {
|
|
|
*级联对象:建筑(building)、项目(project)、楼层贯通关系(floorThroughList)
|
|
|
*/
|
|
|
@PostMapping("/query")
|
|
|
- public AdmResponse query(@RequestBody AdmQueryCriteria criteria, @RequestParam("projectId") String projectId) {
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse query(@RequestBody AdmQueryCriteria criteria) {
|
|
|
+ InstanceUrlParam context = AdmContextUtil.toDmpContext();
|
|
|
criteria.setName(AdmFloor.OBJ_TYPE);
|
|
|
return service.doQuery(context, criteria, AdmFloor.class);
|
|
|
}
|