Преглед на файлове

Merge remote-tracking branch 'origin/master'

caiaf преди 4 години
родител
ревизия
4541188d18
променени са 100 файла, в които са добавени 1360 реда и са изтрити 169 реда
  1. 19 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/dao/mappers/SchemeMapper.kt
  2. 239 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdGather.kt
  3. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationTypeProject.kt
  4. 5 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/RelationAddRequest.kt
  5. 0 30
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  6. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt
  7. 1 58
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelFloor.kt
  8. 5 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.kt
  9. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt
  10. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt
  11. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.kt
  12. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt
  13. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.kt
  14. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.kt
  15. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.kt
  16. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.kt
  17. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.kt
  18. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.kt
  19. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.kt
  20. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.kt
  21. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.kt
  22. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt
  23. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt
  24. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt
  25. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt
  26. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt
  27. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt
  28. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt
  29. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt
  30. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt
  31. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt
  32. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt
  33. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt
  34. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt
  35. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt
  36. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt
  37. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt
  38. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt
  39. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt
  40. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt
  41. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt
  42. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt
  43. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt
  44. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt
  45. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt
  46. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt
  47. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt
  48. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt
  49. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt
  50. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt
  51. 45 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForBd.kt
  52. 46 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForFl.kt
  53. 47 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForSh.kt
  54. 46 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForSp.kt
  55. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForBd.kt
  56. 50 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForFl.kt
  57. 50 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForSh.kt
  58. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForSp.kt
  59. 75 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftFor.kt
  60. 48 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForBd.kt
  61. 48 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForFl.kt
  62. 48 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSh.kt
  63. 48 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSp.kt
  64. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceFor.kt
  65. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForBd.kt
  66. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForFl.kt
  67. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForSh.kt
  68. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt
  69. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt
  70. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt
  71. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt
  72. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt
  73. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt
  74. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt
  75. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt
  76. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt
  77. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt
  78. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt
  79. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt
  80. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt
  81. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt
  82. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt
  83. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt
  84. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt
  85. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt
  86. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt
  87. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkTwo.kt
  88. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVrfNetworkOne.kt
  89. 11 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  90. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt
  91. 7 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt
  92. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt
  93. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt
  94. 144 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/VShaft.kt
  95. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  96. 3 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForBd.kt
  97. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RPe2Sp.kt
  98. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSh2Sp.kt
  99. 6 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSp2Sp.kt
  100. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2Bd.kt

Файловите разлики са ограничени, защото са твърде много
+ 19 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/dao/mappers/SchemeMapper.kt


+ 239 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdGather.kt

@@ -0,0 +1,239 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.dictnew
+
+
+import io.swagger.v3.oas.annotations.media.Schema
+import java.io.Serializable
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 平台对象信息点
+ *
+ * @author wx <zhangweixin@sagacloud.cn>
+ * @date  2020/9/19 17:41
+ */
+@Schema(description = "平台对象信息点-需采集信息点操作")
+@Table(name = "dict.def_funcid_gather")
+open class DefFuncIdGather: Serializable {
+
+    /** 全局id */
+    @Schema(description = "全局id")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 类型编码 */
+    @Schema(description = "类型编码")
+    @Id
+    @Column(name = "class_code")
+    var classCode: String? = null
+
+    /** 动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL */
+    @Schema(description = "动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL")
+    @Column(name = "category")
+    var category: String? = null
+
+    /** 信息点编码 */
+    @Schema(description = "信息点编码")
+    @Id
+    @Column(name = "code")
+    var code: String? = null
+
+    /** 信息点名称 */
+    @Schema(description = "信息点名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 分类:commo平台级, group集团级, project项目级 */
+    @Schema(description = "分类:commo平台级, group集团级, project项目级")
+    @Id
+    @Column(name = "type")
+    var type: String? = null
+
+    /** 集团id, 默认为"0" */
+    @Schema(description = "集团id, 默认为'0'")
+    @Id
+    @Column(name = "group_code")
+    var groupCode: String? = null
+
+    /** 项目id, 默认为"0" */
+    @Schema(description = "项目id, 默认为'0'")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 数据类型 */
+    @Schema(description = "数据类型")
+    @Column(name = "data_type")
+    var dataType: String? = null
+
+    /** 数据格式 */
+    @Schema(description = "数据格式")
+    @Column(name = "formater")
+    var formater: String? = null
+
+    /** 数据格式 */
+    @Schema(description = "数据格式")
+    @Column(name = "data_source")
+    var dataSource: ArrayList<Any?>? = null
+
+    /** 输入方式 */
+    @Schema(description = "输入方式")
+    @Column(name = "input_mode")
+    var inputMode: String? = null
+
+    /** 一级标签 */
+    @Schema(description = "一级标签")
+    @Column(name = "first_tag")
+    var firstTag: String? = null
+
+    /** 一级名称 */
+    @Schema(description = "一级名称")
+    @Column(name = "first_name")
+    var firstName: String? = null
+
+    /** 二级标签 */
+    @Schema(description = "二级标签")
+    @Column(name = "second_tag")
+    var secondTag: String? = null
+
+    /** 二级名称 */
+    @Schema(description = "二级名称")
+    @Column(name = "second_name")
+    var secondName: String? = null
+
+    /** 序列 */
+    @Schema(description = "序列")
+    @Column(name = "idx")
+    var idx: Int? = null
+
+    /** 优先级,重要程度 */
+    @Schema(description = "优先级,重要程度")
+    @Column(name = "priority")
+    var priority: String? = null
+
+    /** 单位 */
+    @Schema(description = "单位")
+    @Column(name = "unit")
+    var unit: String? = null
+
+    /** 备注 */
+    @Schema(description = "备注")
+    @Column(name = "note")
+    var note: String? = null
+
+    /** 输入类型 */
+    @Schema(description = "输入类型")
+    @Column(name = "orig_data_type")
+    var origDataType: String? = null
+
+    /** 旧信息点编码 */
+    @Schema(description = "旧信息点编码")
+    @Column(name = "orig_code")
+    var origCode: String? = null
+
+    /** 别编码 */
+    @Schema(description = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @Schema(description = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
+
+    /** 是否分类标签 */
+    @Schema(description = "是否分类标签")
+    @Column(name = "can_sub")
+    var canSub: Boolean? = null
+
+    /** 是否复数 */
+    @Schema(description = "是否复数")
+    @Column(name = "is_multiple")
+    var isMultiple: Boolean? = null
+
+    /** 是否区间 */
+    @Schema(description = "是否区间")
+    @Column(name = "is_region")
+    var isRegion: Boolean? = null
+
+    /** 子分类标记 */
+    @Schema(description = "子分类标记")
+    @Column(name = "sub_flag")
+    var subFlag: Boolean? = null
+
+    /** 是否只读, 如果是则不允许对该信息点做变更 */
+    @Schema(description = "是否只读, 如果是则不允许对该信息点做变更")
+    @Column(name = "readonly")
+    var readonly: Boolean? = null
+
+    /** 排序 */
+    @Schema(description = "排序")
+    @Column(name = "sort")
+    var sort: Int? = null
+
+    /** 是否显示 */
+    @Schema(description = "是否显示")
+    @Column(name = "visible")
+    var visible: Boolean? = null
+
+    /** 是否编辑 */
+    @Schema(description = "是否编辑")
+    @Column(name = "editable")
+    var editable: Boolean? = null
+
+    /** 禁止操作 */
+    @Schema(description = "禁止操作")
+    @Column(name = "un_disabled")
+    var unDisabled: Boolean? = null
+
+    /** 关键信息点 */
+    @Schema(description = "关键信息点")
+    @Column(name = "key_word")
+    var keyWord: Boolean? = null
+
+    /** 路径 */
+    @Schema(description = "路径")
+    var path: String? = null
+        get() {
+            return if ( code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"){
+                "infos.$code"
+            } else if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
+                code
+            }  else {
+                "infos.$code"
+            }
+        }
+
+    /** 字典内容 */
+    @Schema(description = "字典内容")
+    var content: ArrayList<DefFuncIdGather>? = null
+
+}

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationTypeProject.kt

@@ -174,6 +174,11 @@ open class RelationTypeProject : RBaseInfo() {
     @Column(name = "from_object")
     var fromObject: String? = null
 
+    /** 文件名 */
+    @Schema(description = "文件名")
+    @Column(name = "file_name")
+    var fileName: String? = null
+
     /** 机电系统类型 */
     @Schema(description = "机电系统类型")
     @Column(name = "mep_system_type")

+ 5 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/RelationAddRequest.kt

@@ -49,10 +49,10 @@ class RelationAddRequest : Serializable {
     @Schema(description = "从对象内容")
     var fromContent: ArrayList<String>? = null
 
-//    /** 图类型编码 */
-//    @Schema(description = "图类型编码")
-//    @Column(name = "graphic_type")
-//    var graphicType: String? = null
+    /** 图类型编码 */
+    @Schema(description = "图类型编码")
+    @Column(name = "graphic_type")
+    var graphicType: String? = null
 
 
-} // Class RelationAddRequest
+}

+ 0 - 30
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelBuilding.kt

@@ -70,36 +70,6 @@ open class RelBuilding : BaseInfo() {
     @Column(name = "bim_id")
     var bimId: String? = null
 
-    /** 建筑信息 */
-    @Schema(description = "建筑信息")
-    @Column(name = "building_info")
-    var buildingInfo: HashMap<String,Any?>? = null
-
-    /** 工作历 */
-    @Schema(description = "工作历")
-    @Column(name = "schedule")
-    var schedule: HashMap<String,Any?>? = null
-
-    /** 人员信息 */
-    @Schema(description = "人员信息")
-    @Column(name = "people_info")
-    var peopleInfo: HashMap<String,Any?>? = null
-
-    /** 能耗信息 */
-    @Schema(description = "能耗信息")
-    @Column(name = "consumption_info")
-    var consumptionInfo: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    var customParam: HashMap<String,Any?>? = null
-
-    /** 建筑文档 */
-    @Schema(description = "建筑文档")
-    @Column(name = "building_doc")
-    var buildingDoc: HashMap<String,Any?>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt

@@ -112,7 +112,7 @@ open class RelEquipmentBuilding : BaseInfo() {
 
     /** 级联-设备服务的建筑 */
     @Schema(description = "级联-设备服务的建筑")
-    @SCascade(table="relationship.r_eq2bd", idColumn="id1", childIdColumn="id2", filter = "type = 'eq2bd_for'")
+    @SCascade(table="relationship.r_eq2bd", idColumn="eq_id", childIdColumn="bd_id", filter = "type = 'eq2bd_for'")
     var objectInfo: ArrayList<RelBuilding>? = null
 
 }

+ 1 - 58
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelFloor.kt

@@ -87,66 +87,9 @@ open class RelFloor : BaseInfo() {
     @Column(name = "sequence_id")
     var sequenceId: Int? = null
 
-    /** 结构信息 */
-    @Schema(description = "结构信息")
-    @Column(name = "structure_info")
-    var structureInfo: HashMap<String,Any?>? = null
-
-    /** 人员信息 */
-    @Schema(description = "结构信息")
-    @Column(name = "people_info")
-    var peopleInfo: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    var customParam: HashMap<String,Any?>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
     override var objectType: String? = "Floor"
 
-    /** 工作历信息 */
-    @Schema(description = "工作历信息")
-    @Column(name = "work_calendar")
-    var workCalendar: HashMap<String,Any?>? = null
-
-//    /** 建筑   table  对应关系表   idColumn 对应 本类的关系id    childIdColumn 级联对象的关系id */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="floor", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//    /** 项目 */
-//    @Schema(description = "级联-项目")
-//    @SCascade(table="floor", idColumn="id", childIdColumn="project_id")
-//    @JSONField(name = "Project")
-//    var project: Project? = null
-//
-//    /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
-//    @Schema(description = "级联-贯通关系")
-//    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = true)
-//    @JSONField(name = "FloorThroughList")
-//    var floorThroughList: ArrayList<RelFloor>? = null
-
-//    /** 项目 */
-//    @Schema(description = "级联-项目")
-//    @SCascade(table="floor", idColumn="id", childIdColumn="project_id")
-//    @JSONField(name = "Equipment")
-//    var Equipment: ArrayList<Equipment>? = null
-
-//    /** 模型文件id */
-//    @Schema(description = "模型文件id")
-//    @Column(name = "model_id")
-//    @JSONField(name = "ModelId")
-//    var modelId: String? = null
-//
-//    /** 轮廓线 */
-//    @Schema(description = "轮廓线")
-//    @Column(name = "outline")
-//    @JSONField(name = "Outline")
-//    var outline: ArrayList<PointPosition>? = null
-
-
-} // Class RelFloor
+}

+ 5 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.kt

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
 import javax.persistence.Table
 
 /**
@@ -38,5 +39,8 @@ import javax.persistence.Table
 @Table(name = "zone_space_base")
 open class RelZoneSpace: SpaceBaseZone() {
 
-
+    /** 对象类型 */
+    @Schema(description = "对象类型")
+    @Column(name = "object_type")
+    var classCode: String? = null
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirConvection: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirMixing: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceAirUnidirectional: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ConvectionNetwork_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt

@@ -42,7 +42,7 @@ open class RelZoneSpaceConnectedSp: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceDoors: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_4'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_4'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceLightConnection: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_RadiationNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceLightTrans: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_RadiationNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceNotDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceOrdinary: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_1'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.kt

@@ -41,7 +41,7 @@ open class RelZoneSpaceWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.kt

@@ -41,7 +41,7 @@ open class RelZoneSpacefireClose: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_3'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_3'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.kt

@@ -41,7 +41,7 @@ open class RelZoneSpacefireOpen: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_2'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_TrafficNetwork_2'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentControlRelationOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ControlRelation_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlRelation_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt

@@ -43,7 +43,7 @@ open class RelEquipmentControlRelationTwoSy : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2sy", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlRelation_2'")
+    @SCascade(table="relationship.r_eq2sy", idColumn="eq_id", childIdColumn="sy_id",self = false,filter = "type = 'eq2sy_ControlRelation_2'")
     var objectInfo: ArrayList<RelGeneralSystem>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt

@@ -42,7 +42,7 @@ open class RelEquipmentEq2SpControlEquipNetwork : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ControlEquipNetwork'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlEquipNetwork'")
     var objectInfo: ArrayList<RelEquipmentEq2SpControlEquipNetwork>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSensorNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SensorNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SensorNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSs2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SensorRelationship_ss2eq'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SensorRelationship_ss2eq'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt

@@ -43,7 +43,7 @@ open class RelEquipmentVv2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ValveRelationship_vv2eq'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ValveRelationship_vv2eq'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentDHWNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DHWNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DHWNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentDHWNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DHWNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DHWNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentDrainingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrainingWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrainingWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt

@@ -46,7 +46,7 @@ open class RelEquipmentDrainingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrainingWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrainingWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt

@@ -46,7 +46,7 @@ open class RelEquipmentDrinkingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrinkingWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrinkingWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentDrinkingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_DrinkingWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_DrinkingWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentFireVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireVentNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireVentNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentFireWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentFireWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_FireWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_FireWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentGasNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_GasNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_GasNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentGasNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_GasNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_GasNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentRecycleWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_RecycleWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_RecycleWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentRecycleWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_RecycleWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_RecycleWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSupplyWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SupplyWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SupplyWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSupplyWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_SupplyWaterNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_SupplyWaterNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt

@@ -43,7 +43,7 @@ open class RelEquipmentHubOrdinary : EquipmentBase(){
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_1'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HUDistribution_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt

@@ -43,7 +43,7 @@ open class RelEquipmentHubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HUDistribution_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt

@@ -43,7 +43,7 @@ open class RelEquipmentLubOrdinary : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_1'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_LUDistribution_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt

@@ -43,7 +43,7 @@ open class RelEquipmentLubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_LUDistribution_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt

@@ -43,7 +43,7 @@ open class RelEquipmentRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_2'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSyRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_3'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt

@@ -43,7 +43,7 @@ open class RelEquipmentSySparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_4'")
+    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 45 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForBd.kt

@@ -0,0 +1,45 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 建筑信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "建筑信息实体类")
+@Table(name = "building")
+open class RelBuildingForBd : RelBuilding() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-建筑")
+    @SCascade(table="relationship.r_bd2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'bd2bd_ArchForArch'" )
+    var objectInfo: ArrayList<RelBuilding>? = null
+
+}

+ 46 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForFl.kt

@@ -0,0 +1,46 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 建筑信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "建筑信息实体类")
+@Table(name = "building")
+open class RelBuildingForFl : RelBuilding() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-建筑")
+    @SCascade(table="relationship.r_bd2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'bd2fl_ArchForArch'" )
+    var objectInfo: ArrayList<RelFloor>? = null
+
+}

+ 47 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForSh.kt

@@ -0,0 +1,47 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 建筑信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "建筑信息实体类")
+@Table(name = "building")
+open class RelBuildingForSh : RelBuilding() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-建筑")
+    @SCascade(table="relationship.r_bd2sh", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'bd2sh_ArchForArch'" )
+    var objectInfo: ArrayList<RelShaft>? = null
+
+}

+ 46 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelBuildingForSp.kt

@@ -0,0 +1,46 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 建筑信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "建筑信息实体类")
+@Table(name = "building")
+open class RelBuildingForSp : RelBuilding() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-建筑")
+    @SCascade(table="relationship.r_bd2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'bd2sp_ArchForArch'" )
+    var objectInfo: ArrayList<RelZoneSpace>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForBd.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import RelBuilding
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "楼层信息实体类")
+@Table(name = "floor")
+open class RelFloorForBd : RelFloor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-建筑")
+    @SCascade(table="relationship.r_fl2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2bd_ArchForArch'" )
+    var objectInfo: ArrayList<RelBuilding>? = null
+
+}

+ 50 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForFl.kt

@@ -0,0 +1,50 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "楼层信息实体类")
+@Table(name = "floor")
+open class RelFloorForFl : RelFloor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_fl2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2fl_ArchForArch'" )
+    var objectInfo: ArrayList<RelFloor>? = null
+
+}

+ 50 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForSh.kt

@@ -0,0 +1,50 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "楼层信息实体类")
+@Table(name = "floor")
+open class RelFloorForSh : RelFloor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_fl2sh", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'fl2sh_ArchForArch'" )
+    var objectInfo: ArrayList<RelShaft>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelFloorForSp.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "楼层信息实体类")
+@Table(name = "floor")
+open class RelFloorForSp : RelFloor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_fl2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'fl2sp_ArchForArch'" )
+    var objectInfo: ArrayList<RelZoneSpace>? = null
+
+}

+ 75 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftFor.kt

@@ -0,0 +1,75 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "shaft")
+open class RelShaftFor : BaseInfo() {
+
+    /** 竖井id */
+    @Schema(description = "竖井id")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 竖井名称 */
+    @Schema(description = "竖井名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 竖井本地编码 */
+    @Schema(description = "竖井本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 竖井本地名称 */
+    @Schema(description = "竖井本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** BIM模型中编码 */
+    @Schema(description = "BIM模型中编码")
+    @Column(name = "bim_id")
+    var bimId: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+}

+ 48 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForBd.kt

@@ -0,0 +1,48 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import RelBuilding
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "shaft")
+class RelShaftForBd : RelShaftFor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sh2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2bd_ArchForArch'" )
+    var objectInfo: ArrayList<RelBuilding>? = null
+
+}

+ 48 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForFl.kt

@@ -0,0 +1,48 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "shaft")
+class RelShaftForFl : RelShaftFor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sh2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2fl_ArchForArch'" )
+    var objectInfo: ArrayList<RelFloor>? = null
+
+}

+ 48 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSh.kt

@@ -0,0 +1,48 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "shaft")
+class RelShaftForSh : RelShaftFor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sh2sh", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2sh_ArchForArch'" )
+    var objectInfo: ArrayList<RelShaft>? = null
+
+}

+ 48 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForSp.kt

@@ -0,0 +1,48 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "shaft")
+class RelShaftForSp : RelShaftFor() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sh2sp_ArchForArch'" )
+    var objectInfo: ArrayList<RelZoneSpace>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceFor.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 业务空间
+ *
+ * @author  张维新
+ */
+@Schema(description = "空间实体类")
+@Table(name = "zone_space_base")
+open class RelZoneSpaceFor: SpaceBaseZone() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_ArchForArch'" )
+    var objectInfo: ArrayList<RelZoneSpace>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForBd.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import RelBuilding
+import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 业务空间
+ *
+ * @author  张维新
+ */
+@Schema(description = "空间实体类")
+@Table(name = "zone_space_base")
+open class RelZoneSpaceForBd: SpaceBaseZone() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sp2bd", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2bd_ArchForArch'" )
+    var objectInfo: ArrayList<RelBuilding>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForFl.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
+import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 业务空间
+ *
+ * @author  张维新
+ */
+@Schema(description = "空间实体类")
+@Table(name = "zone_space_base")
+open class RelZoneSpaceForFl: SpaceBaseZone() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sp2fl", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2fl_ArchForArch'" )
+    var objectInfo: ArrayList<RelFloor>? = null
+
+}

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelZoneSpaceForSh.kt

@@ -0,0 +1,49 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
+
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
+import com.persagy.server.datacenter.models.entities.graphtype.rel.SpaceBaseZone
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 业务空间
+ *
+ * @author  张维新
+ */
+@Schema(description = "空间实体类")
+@Table(name = "zone_space_base")
+open class RelZoneSpaceForSh: SpaceBaseZone() {
+
+    /** 级联-空间 */
+    @Schema(description = "级联-空间")
+    @SCascade(table="relationship.r_sp2sh", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sh_ArchForArch'" )
+    var objectInfo: ArrayList<RelShaft>? = null
+
+}

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentAcAirNetworkTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ACAirNetwork_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentChillWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ChillWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt

@@ -43,7 +43,7 @@ open class RelEquipmentCondWaterNetwork  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CondWaterNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CondWaterNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopFour.kt

@@ -44,7 +44,7 @@ open class RelEquipmentCoolingWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopFour

+ 1 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopOne.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
@@ -44,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_cwl1_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_cwl1_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopOne

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopThree.kt

@@ -43,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentCoolingWaterLoopThree

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt

@@ -43,7 +43,7 @@ open class RelEquipmentCoolingWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CoolingWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_CoolingWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentFreshAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eqFreshAirNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eqFreshAirNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopFour.kt

@@ -47,7 +47,7 @@ open class RelEquipmentHeatWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_4'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_4'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopFour

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopOne.kt

@@ -43,7 +43,7 @@ open class RelEquipmentHeatWaterLoopOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopOne

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopThree.kt

@@ -44,7 +44,7 @@ open class RelEquipmentHeatWaterLoopThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentHeatWaterLoopThree

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt

@@ -42,7 +42,7 @@ import javax.persistence.Table
 open class RelEquipmentHeatWaterLoopTwo : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_HeatWaterLoop_2'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkOne.kt

@@ -44,7 +44,7 @@ open class RelEquipmentVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkThree.kt

@@ -43,7 +43,7 @@ open class RelEquipmentVentNetworkThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_3'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_3'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 } // Class RelEquipmentVentNetworkThree

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVentNetworkTwo.kt

@@ -44,7 +44,7 @@ open class RelEquipmentVentNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VentNetwork_2'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VentNetwork_2'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentVrfNetworkOne.kt

@@ -44,7 +44,7 @@ open class RelEquipmentVrfNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_VRFNetwork_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_VRFNetwork_1'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 

+ 11 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt

@@ -86,6 +86,7 @@ open class Equipment : BaseInfo() {
     /** RFID标识 */
     @Schema(description = "RFID标识")
     @Column(name = "rf_id")
+    @JSONField(name = "rFID")
     var rfId: String? = null
 
     /** BIM模型中编码 */
@@ -103,6 +104,11 @@ open class Equipment : BaseInfo() {
     @Column(name = "bim_location")
     var bimLocation: String? = null
 
+    /** 现场发现人 */
+    @Schema(description = "现场发现人")
+    @Column(name = "find_people")
+    var findPeople: String? = null
+
     /** BIM模型中坐标 */
     @Schema(description = "BIM模型中坐标json")
     var locationJson: BIMLocation? = null
@@ -213,6 +219,11 @@ open class Equipment : BaseInfo() {
     @Column(name = "note")
     var note: Int? = null
 
+    /** 备注 */
+    @Schema(description = "客户端id")
+    @Column(name = "app_id")
+    var appId: String? = null
+
     /** 方案id */
     @Schema(description = "方案id")
 //    @Column(name = "scheme_id")

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt

@@ -136,7 +136,7 @@ open class Floor : BaseInfo() {
 
     /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
     @Schema(description = "级联-贯通关系")
-    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = true)
+    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = false)
     var floorThroughList: ArrayList<Floor>? = null
 
     /** 模型文件id */

+ 7 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt

@@ -66,6 +66,11 @@ open class Project : BaseInfo() {
     @Column(name = "introduction")
     var introduction: String? = null
 
+    /** 集团编码 */
+    @Schema(description = "集团编码")
+    @Column(name = "group_code")
+    var groupCode: String? = null
+
     /** 商业层数 */
     @Schema(description = "商业层数")
     @Column(name = "business_floor_num")
@@ -85,4 +90,6 @@ open class Project : BaseInfo() {
     @Column(name = "infos")
     var infos: HashMap<String,Any?>? = null
 
+
+
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt

@@ -170,7 +170,7 @@ open class Property : BaseInfo(),Comparator<Property> {
     /** 贴码状态 */
     @Schema(description = "贴码状态")
     @Column(name = "code_type")
-    var codeType: Int? = null
+    var codeType: Long? = null
 
     /** 选择状态 */
     @Schema(description = "选择状态")

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt

@@ -131,7 +131,7 @@ class Shaft : BaseInfo() {
 
     /** 竖井内的业务空间  self = true  同样的对象查询时 id可以互相调换查询   */
    @Schema(description = "级联-竖井内的业务空间")
-    @SCascade(table="relationship.r_sh2sp", idColumn="sh_id", childIdColumn="sp_id", self = false,filter = "type = 'sh2sp'")
+    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2", self = false,filter = "type = 'sh2sp'")
     var spaceList: ArrayList<ZoneSpace>? = null
 
 

+ 144 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/VShaft.kt

@@ -0,0 +1,144 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.objects
+
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "v_shaft")
+class VShaft : BaseInfo() {
+
+    /** 竖井id */
+   @Schema(description = "竖井id")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 竖井名称 */
+   @Schema(description = "竖井名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 竖井本地编码 */
+   @Schema(description = "竖井本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 竖井本地名称 */
+   @Schema(description = "竖井本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** BIM模型中编码 */
+   @Schema(description = "BIM模型中编码")
+    @Column(name = "bim_id")
+    var bimId: String? = null
+
+    /** 设计图纸中编码 */
+   @Schema(description = "设计图纸中编码")
+    @Column(name = "cad_id")
+    var cadId: String? = null
+
+    /** 二维码图片 */
+   @Schema(description = "二维码图片")
+    @Column(name = "qr_code_pic")
+    var qRCodePic: String? = null
+
+    /** 二维码内容 */
+   @Schema(description = "二维码内容")
+    @Column(name = "default_qr_code")
+    var defaultQRCode: String? = null
+
+    /** 项目id */
+   @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** BIM模型中坐标 */
+   @Schema(description = "BIM模型中坐标")
+    @Column(name = "bim_location")
+    var bimLocation: String? = null
+
+    /** 竖井顺序码 */
+   @Schema(description = "竖井顺序码")
+    @Column(name = "shaft_sequenceId")
+    var shaftSequenceId: Int? = null
+
+    /** 竖井顺序码 */
+    @Schema(description = "功能类型")
+    @Column(name = "shaftfunctype")
+    var shaftfunctype: String? = null
+
+
+    /** 信息点 */
+   @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String, Any?>? = null
+
+    /** BIM模型中轮廓坐标 */
+   @Schema(description = "BIM模型中轮廓坐标")
+    @Column(name = "outline")
+    var outline: ArrayList<PointPosition>? = null
+
+    /** 对象类型 */
+   @Schema(description = "对象类型")
+    @Column(name = "object_type")
+    override var objectType: String? = "Shaft"
+
+    /** 级联-竖井内的设备 */
+   @Schema(description = "级联-竖井内的设备")
+    @SCascade(table="r_eq_in_sh", idColumn="shaft_id", childIdColumn="equip_id")
+    var equipmentList: ArrayList<Equipment>? = null
+
+    /** 级联-竖井内的系统 */
+   @Schema(description = "级联-竖井内的系统")
+    @SCascade(table="r_sy_in_sh", idColumn="shaft_id", childIdColumn="sys_id")
+    var systemList: ArrayList<GeneralSystem>? = null
+
+    /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
+   @Schema(description = "级联-贯通关系")
+    @SCascade(table="r_sh_through_sh", idColumn="shaft_id", childIdColumn="shaft_other_id", self = true)
+    var shaftThroughList: ArrayList<VShaft>? = null
+
+    /** 竖井内的业务空间  self = true  同样的对象查询时 id可以互相调换查询   */
+   @Schema(description = "级联-竖井内的业务空间")
+    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2", self = false,filter = "type = 'sh2sp'")
+    var spaceList: ArrayList<ZoneSpace>? = null
+
+
+} // Class Shaft

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt

@@ -279,7 +279,7 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     /** 级联-楼层  */
     @Schema(description = "级联-楼层")
     @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-    var floorlList: ArrayList<Floor>? = null
+    var floorList: ArrayList<Floor>? = null
 
     /** 对象类型 */
 //    @Schema(description = "对象类型")

+ 3 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForBd.kt

@@ -38,19 +38,19 @@ import javax.persistence.Table
  * @author 付国宝
  */
 @Schema(description = "设备设施服务于建筑实体类")
-@Table(name = "r_eq_for_bd")
+@Table(name = "relationship.r_eq2bd")
 class REqForBd : RBaseInfo(){
 
     /** 设备Id */
     @Schema(description = "设备Id")
     @Id
-    @Column(name = "equip_id")
+    @Column(name = "eq_id")
     var equipId: String? = null
 
     /** 建筑Id */
     @Schema(description = "建筑Id")
     @Id
-    @Column(name = "building_id")
+    @Column(name = "bd_id")
     var buildingId: String? = null
 
     /** 项目Id */

+ 0 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RPe2Sp.kt

@@ -78,7 +78,6 @@ class RPe2Sp : Serializable {
 
     /** 图类型编码 */
     @Schema(description = "图类型编码")
-    @Id
     @Column(name = "graph_code")
     var graphCode: String? = null
 

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSh2Sp.kt

@@ -44,13 +44,13 @@ class RSh2Sp : RBaseInfo(){
     /** 竖井Id */
     @Schema(description = "竖井Id")
     @Id
-    @Column(name = "sh_id")
+    @Column(name = "id1")
     var id1: String? = null
 
     /** 空间Id */
     @Schema(description = "空间Id")
     @Id
-    @Column(name = "sp_id")
+    @Column(name = "id2")
     var id2: String? = null
 
     /** 项目Id */

+ 6 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSp2Sp.kt

@@ -65,8 +65,14 @@ class RSp2Sp : RBaseInfo(){
     @Column(name = "type")
     var type: String? = null
 
+    /** 图类型 */
+    @Schema(description = "图类型 " )
+    @Column(name = "graph_code")
+    var graphCode: String? = null
+
     /** 空间类型 */
     @Schema(description = "空间类型 " )
+    @Id
     @Column(name = "zone_type")
     var zoneType: String? = null
 

+ 0 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2Bd.kt


Някои файлове не бяха показани, защото твърде много файлове са промени