queryObjectListSuperiorId接口新增返回竖井信息

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/DigitalRelCode.java

@@ -22,7 +22,7 @@ public enum DigitalRelCode {
     EQ_2_BD("Eq2Bd", "设备所在建筑"),
     EQ_2_FL("Eq2Fl", "设备所在楼层"),
     EQ_2_SH("Eq2Sh", "设备所在竖井"),
-    EQ_2_SP("Eq2Sp", "设备所在竖井"),
+    EQ_2_SP("Eq2Sp", "设备所在空间"),
     SY_2_EQ("Sy2Eq", "系统下的设备"),
     EQ_2_EC("Eq2Ec", "设备下的部件");
 

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -395,7 +395,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
             // 建筑下的楼层,空间,设备,系统
             requestData.setRelCodes(CollUtil.newHashSet(DigitalRelCode.BD_2_FL.getIndex(),
                     DigitalRelCode.BD_2_SP.getIndex(),DigitalRelCode.SY_2_BD.getIndex(),
-                    DigitalRelCode.EQ_2_BD.getIndex()));
+                    DigitalRelCode.EQ_2_BD.getIndex(),DigitalRelCode.BD_2_SH.getIndex()));
             // 设置设备查询部件
             requestData.setQueryEcFlag(true);
             requestData.setEcRelCodes(CollUtil.newHashSet(DigitalRelCode.EQ_2_EC.getIndex()));
@@ -459,6 +459,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         // 2.2 根据空间id查询建筑id
         // 2.3 根据设备id查询建筑id
         // 2.4 根据系统id查询建筑id
+        // 2.5 根据竖井id查询建筑id
         Set<String> objIds = pageResult.stream()
                 .filter(object->!DigitalObjectType.BUILDING.getIndex().equals(object.getObjType()))
                 .map(ObjectDigital::getId)
@@ -469,7 +470,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         List<ObjectDigital> objectDigitals = objectRelationMapper.selectRelCodesByObjIdsAndRelCodes(objIds, CollUtil
                 .newHashSet(DigitalRelCode.EQ_2_EC.getIndex(), DigitalRelCode.BD_2_FL.getIndex(),
                         DigitalRelCode.BD_2_SP.getIndex(), DigitalRelCode.SY_2_BD.getIndex(),
-                        DigitalRelCode.EQ_2_BD.getIndex()));
+                        DigitalRelCode.EQ_2_BD.getIndex(),DigitalRelCode.BD_2_SH.getIndex()));
         if (CollUtil.isEmpty(objectDigitals)){
             return;
         }