Преглед изворни кода

space/query 明确建筑明确楼层 获取不到空间

lvxianyun пре 3 година
родитељ
комит
f0e13d1e7c

+ 18 - 22
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -1,20 +1,9 @@
 package com.persagy.proxy.object.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -54,12 +43,14 @@ import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.object.service.IAdmSpaceService;
 import com.persagy.proxy.object.service.IAdmSystemService;
 import com.persagy.proxy.report.service.IRelationReportService;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * ADM 空间 实现类
@@ -151,11 +142,16 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         }
         if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && !request.getFloorId().equals("isnull")){
             //明确建筑,明确楼层
-            ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
+            /*ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
             relationTo.put("relCode", "Fl2Sp");
             relationTo.put("graphCode", "ArchSubset");
             relationTo.put("objFrom", request.getFloorId());
-            request.setRelationTo(relationTo);
+            request.setRelationTo(relationTo);*/
+            request.setFilters(request.getFilters()+" ; buildingId = '"+request.getBuildingId()+"' ; floorId='"+request.getFloorId()+"' ;");
+            AdmResponse response = super.doQuery(context,request,AdmSpace.class);
+            //空间需要补充分类名称属性
+            ensureSpecialValues(context, (List<AdmSpace>) response.getContent());
+            return response;
         }else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isNotEmpty(request.getFloorId()) && request.getFloorId().equals("isnull")){
         	//查询此建筑下未关联楼层的空间
         	AdmResponse response = this.query(request);