瀏覽代碼

fix bug:关系总览页面不显示建筑下的楼层,资产所属楼层的问题

lijie 3 年之前
父節點
當前提交
0900e0f1a4
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      src/main/java/com/persagy/proxy/adm/constant/AdmRelationTypeEnum.java

+ 6 - 2
src/main/java/com/persagy/proxy/adm/constant/AdmRelationTypeEnum.java

@@ -104,7 +104,7 @@ public enum AdmRelationTypeEnum {
     /**空间隔断有门窗-空间-空间-【全部关系总览】*/
     SP2SP_SPACENEIGHBORHOOD_4("sp2sp_SpaceNeighborhood_4","SpaceNeighborhood","DoorWindow",AdmObjectType.SPACE.getIndex(),AdmObjectType.SPACE.getIndex(),true,true,true,false,true,false),
     /**资产所在楼层-楼层→资产-【资产台账】*/
-    PE2FL("pe2fl","ArchSubset","Pe2Fl",AdmObjectType.PROPERTY.getIndex(),AdmObjectType.FLOOR.getIndex(),false,false,false,false,false,false),
+    PE2FL("pe2fl","PropertyInArch","Pe2Fl",AdmObjectType.PROPERTY.getIndex(),AdmObjectType.FLOOR.getIndex(),false,false,false,false,false,false),
     /**中水供水-中水供水相关设备,沿水流方向-*/
     EQ2EQ_RECYCLEWATERNETWORK_1("eq2eq_RecycleWaterNetwork_1","RecycleWaterNetwork","Supply",AdmObjectType.EQUIPMENT.getIndex(),AdmObjectType.EQUIPMENT.getIndex(),false,true,false,false,false,false),
     /**竖井贯通关系-竖井-竖井-【竖井台账】*/
@@ -152,7 +152,7 @@ public enum AdmRelationTypeEnum {
     /**直饮水供水-直饮水供水相关设备,沿水流方向-*/
     EQ2EQ_DRINKINGWATERNETWORK_1("eq2eq_DrinkingWaterNetwork_1","DrinkingWaterNetwork","Supply",AdmObjectType.EQUIPMENT.getIndex(),AdmObjectType.EQUIPMENT.getIndex(),false,true,false,false,false,false),
     /**资产属于建筑-建筑→资产-【资产台账】*/
-    PE2BD("pe2bd","ArchSubset","Pe2Bd",AdmObjectType.PROPERTY.getIndex(),AdmObjectType.BUILDING.getIndex(),false,false,false,false,false,false),
+    PE2BD("pe2bd","PropertyInArch","Pe2Bd",AdmObjectType.PROPERTY.getIndex(),AdmObjectType.BUILDING.getIndex(),false,false,false,false,false,false),
     /**设备服务于竖井-设备→竖井-【竖井台账】*/
     EQ2SH_FOR("eq2sh_for","MechForArch","Eq2Sh",AdmObjectType.EQUIPMENT.getIndex(),AdmObjectType.SHAFT.getIndex(),false,false,false,false,true,false),
     /**设备备用电源-低/高压开关柜→用电设备-【全部关系总览】*/
@@ -213,6 +213,10 @@ public enum AdmRelationTypeEnum {
     BD2FL_ARCHFORARCH("bd2fl_ArchForArch","ArchForArch","Bd2Fl",AdmObjectType.BUILDING.getIndex(),AdmObjectType.FLOOR.getIndex(),false,false,false,false,true,false),
     /**建筑服务于竖井-建筑→竖井-*/
     BD2SH_ARCHFORARCH("bd2sh_ArchForArch","ArchForArch","Bd2Sh",AdmObjectType.BUILDING.getIndex(),AdmObjectType.SHAFT.getIndex(),false,false,false,false,true,false),
+    /**建筑下的楼层-建筑→楼层-*/
+    BD2FL_ARCHSUBSET("bd2fl_ArchSubset","ArchSubset","Bd2Fl",AdmObjectType.BUILDING.getIndex(),AdmObjectType.FLOOR.getIndex(),false,false,false,false,true,false),
+    /**设备设施下的部件-设备设施→部件-*/
+    EQ2EC_MECHSUBSET("eq2ec_MechSubset","MechSubset","Eq2Ec",AdmObjectType.EQUIPMENT.getIndex(),AdmObjectType.COMPONENT.getIndex(),false,false,false,false,true,false),
     /**建筑下的竖井-建筑→竖井-【系统台账】*/
     BD2SH_ARCHSUBSET("bd2sh_ArchSubset","ArchSubset","Bd2Sh",AdmObjectType.BUILDING.getIndex(),AdmObjectType.SHAFT.getIndex(),false,false,false,false,false,false),
     /**建筑服务于空间-建筑→空间-*/