Jelajahi Sumber

Merge remote-tracking branch 'origin/develop' into develop

linhuili 3 tahun lalu
induk
melakukan
c3d4e687e1

+ 2 - 0
src/main/java/com/persagy/proxy/object/controller/AdmISpaceController.java

@@ -126,6 +126,8 @@ public class AdmISpaceController {
                 request.setFilters(" bimId startwith '"+admFloor.getBimIdPre()+"';");
                 admResponse = service.doQuery(AdmContextUtil.toDmpContext(), request, AdmISpace.class);
             }
+        }else{
+            admResponse = AdmResponse.success();
         }
         admResponse.setMessage(param.getString("floorId"));
         return admResponse;

+ 18 - 12
src/main/java/com/persagy/proxy/object/service/impl/AdmEquipmentServiceImpl.java

@@ -168,17 +168,19 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
             return;
         }
         if (criteria.has("floorId")){
-            // 有建筑id过滤
-            ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
-            ObjectNode relationFrom = objectMapper.createObjectNode();
-            relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
-            relationFrom.put("relCode", RelCodeEnum.Eq2Fl.name());
-            relationFrom.set("objTo",criteria.get("floorId"));
-            criteria.set("relationFrom",relationFrom);
-            criteria.remove("floorId");
-            if (criteria.has("buildingId"))
-                criteria.remove("buildingId");
-            return;
+            // 有楼层id过滤
+            if(!criteria.get("floorId").toString().contains("$null")){
+                ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
+                ObjectNode relationFrom = objectMapper.createObjectNode();
+                relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
+                relationFrom.put("relCode", RelCodeEnum.Eq2Fl.name());
+                relationFrom.set("objTo",criteria.get("floorId"));
+                criteria.set("relationFrom",relationFrom);
+                criteria.remove("floorId");
+                if (criteria.has("buildingId"))
+                    criteria.remove("buildingId");
+                return;
+            }
         }
         if (criteria.has("buildingId")){
             // 有建筑id过滤
@@ -186,7 +188,11 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
             ObjectNode relationFrom = objectMapper.createObjectNode();
             relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
             relationFrom.put("relCode", RelCodeEnum.Eq2Bd.name());
-            relationFrom.set("objTo",criteria.get("buildingId"));
+            if(!criteria.get("buildingId").toString().contains("$null")) {
+                relationFrom.set("objTo", criteria.get("buildingId"));
+            }else{
+                relationFrom.put("$bindFlag", false);
+            }
             criteria.set("relationFrom",relationFrom);
             criteria.remove("buildingId");
         }

+ 5 - 1
src/main/java/com/persagy/proxy/object/service/impl/AdmShaftServiceImpl.java

@@ -68,7 +68,11 @@ public class AdmShaftServiceImpl extends AbstractAdmBaseServiceImpl<AdmShaft> im
             ObjectNode relationTo = objectMapper.createObjectNode();
             relationTo.put("graphCode", GraphCodeEnum.ArchSubset.name());
             relationTo.put("relCode", RelCodeEnum.Bd2Sh.name());
-            relationTo.set("objFrom",criteria.get("buildingId"));
+            if(!criteria.get("buildingId").toString().contains("$null")) {
+                relationTo.set("objFrom",criteria.get("buildingId"));
+            }else{
+                relationTo.put("$bindFlag", false);
+            }
             criteria.set("relationTo",relationTo);
             criteria.remove("buildingId");
         }

+ 17 - 11
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -382,23 +382,29 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         
         ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
         if (criteria.has("floorId")){
-            // 有建筑id过滤
-            ObjectNode relationTo = objectMapper.createObjectNode();
-            relationTo.put("graphCode", GraphCodeEnum.ArchSubset.name());
-            relationTo.put("relCode", RelCodeEnum.Fl2Sp.name());
-            relationTo.set("objFrom",criteria.get("floorId"));
-            criteria.set("relationTo",relationTo);
-            criteria.remove("floorId");
-            if (criteria.has("buildingId"))
-                criteria.remove("buildingId");
-            return;
+            // 有楼层id过滤
+            if(!criteria.get("floorId").toString().contains("$null")) {
+                ObjectNode relationTo = objectMapper.createObjectNode();
+                relationTo.put("graphCode", GraphCodeEnum.ArchSubset.name());
+                relationTo.put("relCode", RelCodeEnum.Fl2Sp.name());
+                relationTo.set("objFrom", criteria.get("floorId"));
+                criteria.set("relationTo", relationTo);
+                criteria.remove("floorId");
+                if (criteria.has("buildingId"))
+                    criteria.remove("buildingId");
+                return;
+            }
         }
         if (criteria.has("buildingId")){
             // 有建筑id过滤
             ObjectNode relationTo = objectMapper.createObjectNode();
             relationTo.put("graphCode", GraphCodeEnum.ArchSubset.name());
             relationTo.put("relCode", RelCodeEnum.Bd2Sp.name());
-            relationTo.set("objFrom",criteria.get("buildingId"));
+            if(!criteria.get("buildingId").toString().contains("$null")) {
+                relationTo.set("objFrom",criteria.get("buildingId"));
+            }else{
+                relationTo.put("$bindFlag", false);
+            }
             criteria.set("relationTo",relationTo);
             criteria.remove("buildingId");
         }

+ 18 - 14
src/main/java/com/persagy/proxy/object/service/impl/AdmSystemServiceImpl.java

@@ -3,7 +3,6 @@ package com.persagy.proxy.object.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -32,7 +31,6 @@ import com.persagy.proxy.object.service.IAdmFloorService;
 import com.persagy.proxy.object.service.IAdmSystemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -113,17 +111,19 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
             return;
         }
         if (criteria.has("floorId")){
-            // 有建筑id过滤
-            ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
-            ObjectNode relationFrom = objectMapper.createObjectNode();
-            relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
-            relationFrom.put("relCode", RelCodeEnum.Sy2Fl.name());
-            relationFrom.set("objTo",criteria.get("floorId"));
-            criteria.set("relationFrom",relationFrom);
-            criteria.remove("floorId");
-            if (criteria.has("buildingId"))
-                criteria.remove("buildingId");
-            return;
+            // 有楼层id过滤
+            if(!criteria.get("floorId").toString().contains("$null")){
+                ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
+                ObjectNode relationFrom = objectMapper.createObjectNode();
+                relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
+                relationFrom.put("relCode", RelCodeEnum.Sy2Fl.name());
+                relationFrom.set("objTo",criteria.get("floorId"));
+                criteria.set("relationFrom",relationFrom);
+                criteria.remove("floorId");
+                if (criteria.has("buildingId"))
+                    criteria.remove("buildingId");
+                return;
+            }
         }
         if (criteria.has("buildingId")){
             // 有建筑id过滤
@@ -131,7 +131,11 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
             ObjectNode relationFrom = objectMapper.createObjectNode();
             relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
             relationFrom.put("relCode", RelCodeEnum.Sy2Bd.name());
-            relationFrom.set("objTo",criteria.get("buildingId"));
+            if(!criteria.get("buildingId").toString().contains("$null")) {
+                relationFrom.set("objTo", criteria.get("buildingId"));
+            }else{
+                relationFrom.put("$bindFlag", false);
+            }
             criteria.set("relationFrom",relationFrom);
             criteria.remove("buildingId");
         }