瀏覽代碼

fix: adm 业务空间 unspace-ispace 更加floorId信息点查询

lvxianyun 3 年之前
父節點
當前提交
4f8337d168
共有 1 個文件被更改,包括 15 次插入7 次删除
  1. 15 7
      src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

+ 15 - 7
src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

@@ -1,10 +1,7 @@
 package com.persagy.proxy.report.controller;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
@@ -12,7 +9,6 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.object.model.AdmEquipment;
-import com.persagy.proxy.object.model.AdmFloor;
 import com.persagy.proxy.object.model.AdmISpace;
 import com.persagy.proxy.object.model.AdmSystem;
 import com.persagy.proxy.object.service.*;
@@ -24,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.QueryParam;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -131,6 +125,20 @@ public class AdmSpaceInfoController {
 	 */
 	@PostMapping("/unspace-ispace")
 	public AdmResponse unSpaceIspace(@QueryParam("objectType") String objectType, @RequestBody AdmDCSQueryRequest request) {
+		//因现有floor没有轮廓线,先不做元空间和floor的轮廓的判断,使用关系查询
+		request.setName(AdmISpace.OBJ_TYPE);
+		// 设置关系条件
+		AdmRelationTypeEnum typeEnum = AdmRelationTypeEnum.SP2SI;
+		request.resetRelationCond(false, null, typeEnum.getRelCode(), objectType, null, false);
+		request.addFilters("floorId = '"+request.getFloorId()+"'");
+		AdmResponse responseIspace = ispaceService.doQuery(AdmContextUtil.toDmpContext(),request, AdmISpace.class);
+		responseIspace.setFloorId(request.getFloorId());
+		responseIspace.setZoneType(objectType);
+		return responseIspace;
+	}
+	/*
+	@PostMapping("/unspace-ispace")
+	public AdmResponse unSpaceIspace(@QueryParam("objectType") String objectType, @RequestBody AdmDCSQueryRequest request) {
 		// 查询楼层信息 需要楼层信息中的outline modelId
 		AdmQueryCriteria admQueryCriteriaFl = new AdmQueryCriteria();
 		admQueryCriteriaFl.setName(AdmFloor.OBJ_TYPE);
@@ -174,7 +182,7 @@ public class AdmSpaceInfoController {
 			responseIspace.setZoneType(objectType);
 			return responseIspace;
 		}
-	}
+	}*/
 
 	private AdmResponse unSpaceEq(String type, String spaceId, AdmQueryCriteria request, String graphCode) {
 		if (StrUtil.isBlank(spaceId)) {