********************WX***********************

添加调度器

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/GeneralSystemCategory.kt

@@ -38,18 +38,22 @@ import javax.persistence.Table
  * @author 张维新
  */
 @Schema(description = "系统分类")
-@Table(name = "dict.class_def")
+@Table(name = "dict.def_class")
 class GeneralSystemCategory : Serializable {
 
     /** 设备分类编码 */
     @Schema(description = "设备分类编码")
     @Id
-    @Column(name = "id")
-    var category: String? = null
+    @Column(name = "code")
+    var code: String? = null
 
     /** 设备分类名字*/
     @Schema(description = "设备分类名字")
     @Column(name = "name")
     var categoryName: String? = null
 
+    /** 项目 id */
+    @Schema(description = "项目 id")
+    @Column(name = "project_id")
+    var projectId: String? = null
 }

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

@@ -26,11 +26,9 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
-import kotlin.collections.ArrayList
 
 /**
  * 源末端
@@ -43,18 +41,15 @@ open class ConnectedBlockItem : RBaseInfo() {
     /** 设备类型名 : 4位编码 */
     @Schema(description = "设备类型名")
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 设备类型名 */
     @Schema(description = "设备类型名称")
-    @JSONField(name = "FamilyName")
     var familyName: String? = null
 
     /** 根据类型分组列表 */
     @Schema(description = "根据类型分组列表")
     @Column(name = "items")
-    @JSONField(name = "Items")
     var items: ArrayList<ConnectedBlockFamilyItem>? = null
 
 } // Class ConnectedBlockItem

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

@@ -26,11 +26,9 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
-import kotlin.collections.ArrayList
 
 /**
  * 源末端
@@ -43,13 +41,11 @@ open class ConnectedBlockResponse : RBaseInfo() {
     /** block_id */
     @Schema(description = "block_id")
     @Column(name = "block_id")
-    @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** 根据块分组列表 */
     @Schema(description = "根据块分组列表")
     @Column(name = "items")
-    @JSONField(name = "Items")
     var items: ArrayList<ConnectedBlockItem>? = null
 
 } // Class ConnectedBlockResponse

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -42,30 +41,25 @@ open class ConnectedBlockSourceRequest : RBaseInfo() {
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 系统类型所属域 */
     @Schema(description = "系统类型所属域")
     @Column(name = "domain")
-    @JSONField(name = "Domain")
     var domain: String? = null
 
     /** 系统类型名称 */
     @Schema(description = "系统类型名称")
     @Column(name = "mep_system_type")
-    @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** 源末端列表 */
     @Schema(description = "源末端列表")
-    @JSONField(name = "SourceList")
     var sourceList: ArrayList<ConnectedBlockSource>? = null
 
 } // Class ConnectedBlockSourceRequest

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ open class EquipIdUUIDMap : RBaseInfo() {
 
     /** 数据中心设备id */
     @Schema(description = "数据中心设备id")
-    @JSONField(name = "equipId")
     var equipId: String? = null
 
     /** 模型中设备uuid */
     @Schema(description = "模型中设备uuid")
-    @JSONField(name = "revitUUID")
     var revitUUID: String? = null
 
 } // Class EquipIdUUIDMap

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

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 import io.swagger.v3.oas.annotations.media.Schema
 import java.util.*
 import javax.persistence.Column
@@ -47,30 +46,25 @@ class MepSourceTypeEntity {
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JsonProperty("ProjectId")
     var projectId: String? = null
 
     /** 计算卡片名称 */
     @Schema(description = "计算卡片名称")
     @Column(name = "calc_name")
-    @JsonProperty("CalcName")
     var calcName: String? = null
 
     /** 源类型 */
     @Schema(description = "源设备类型")
     @Column(name = "source_type")
-    @JsonProperty("SourceType")
     var sourceType: String? = null
 
     /** 前台使用源设备类型 */
     @Schema(description = "前台使用源设备类型")
     @Column(name = "front_type")
-    @JsonProperty("FrontType")
     var frontType: String? = null
 
     /** 创建时间 */
     @Schema(description = "创建时间")
     @Column(name = "create_time")
-    @JsonProperty("CreateTime")
     var createTime: Date? = null
-} // Class MepSourceTypeEntity
+}

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

@@ -26,11 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -40,47 +36,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpace: Serializable, BaseInfo() {
+open class RelZoneSpace: SpaceBaseZone() {
 
-    /** 空间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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
 
 }

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,53 +37,11 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceAirConvection: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceAirConvection: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-
 }

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceAirMixing: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceAirMixing: SpaceBaseZone() {
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,50 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceAirUnidirectional: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-
+open class RelZoneSpaceAirUnidirectional: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -27,12 +27,8 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,48 +38,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceConnectedSp: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceConnectedSp: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
@@ -91,4 +46,4 @@ open class RelZoneSpaceConnectedSp: Serializable, BaseInfo() {
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceConnectedSp
+}

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,49 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceDoors: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
+open class RelZoneSpaceDoors: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceDoorsWind: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceLightConnection: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceLightConnection: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceLightTrans: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceLightTrans: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceNotDoorsWind: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceNotDoorsWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceOrdinary: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceOrdinary: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpaceWind: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpaceWind: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,48 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpacefireClose: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
+open class RelZoneSpacefireClose: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

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

@@ -26,12 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-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 java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,49 +37,7 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpacefireOpen: Serializable, 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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
+open class RelZoneSpacefireOpen: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")

scheduler/src/main/kotlin/com/persagy/server/scheduler/models/TaskResultEntity.kt

@@ -24,32 +24,59 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.scheduler.models
+package com.persagy.server.datacenter.models.entities.graphtype.rel
 
-import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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 jxing
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/11 12:03
  */
-@ApiModel(description = "任务结果详细信息实体类")
-@Table(name = "scheduler_str.task_result")
-class TaskResultEntity : SBaseEntity() {
+open class SpaceBaseZone : Serializable, BaseInfo() {
 
-    /** 所属任务id*/
-    @ApiModelProperty(value = "所属任务id")
-    @Column(name = "task_id", insertable = true, updatable = false)
+    /** 空间ID */
+    @Schema(description = "空间ID")
     @Id
-    var taskId: String? = null
+    @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
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 建筑id */
+    @Schema(description = "建筑id")
+    @Column(name = "building_id")
+    var buildingId: String? = null
+
+    /** 楼层id */
+    @Schema(description = "楼层id")
+    @Column(name = "floor_id")
+    var floorId: String? = null
 
-    /** task 执行结果 */
-    @ApiModelProperty(value = "任务执行结果")
-    @Column(name = "content")
-    var content: String? =null
+    /** BIM模型中编码 */
+    @Schema(description = "BIM模型中编码")
+    @Column(name = "bim_id")
+    var bimId: String? = null
 }

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentControlRelationOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentControlRelationOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 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
 
 /**
@@ -41,76 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentControlRelationTwoSy : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentControlRelationTwoSy : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,11 +26,9 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 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
 
 /**
@@ -40,74 +38,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentEq2SpControlEquipNetwork : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentEq2SpControlEquipNetwork : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 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.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentEq2SpOther : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentEq2SpOther : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSensorNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSensorNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSs2Eq : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSs2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 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
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSs2Sy : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSs2Sy : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVv2Eq : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentVv2Eq : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 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.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVv2Sp : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentVv2Sp : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 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
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVv2Sy : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentVv2Sy : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDHWNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDHWNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDHWNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDHWNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDrainingWaterNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDrainingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
@@ -41,74 +42,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDrainingWaterNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDrainingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
@@ -41,68 +42,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDrinkingWaterNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDrinkingWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentDrinkingWaterNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentDrinkingWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentFireVentNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentFireVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentFireWaterNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentFireWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentFireWaterNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentFireWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentGasNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentGasNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentGasNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentGasNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentRecycleWaterNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentRecycleWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentRecycleWaterNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentRecycleWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSupplyWaterNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSupplyWaterNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSupplyWaterNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSupplyWaterNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,77 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHubOrdinary : BaseInfo() {
-
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentHubOrdinary : EquipmentBase(){
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,71 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHubPrepare : BaseInfo() {
-
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentHubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,75 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentLubOrdinary : BaseInfo() {
-
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentLubOrdinary : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentLubPrepare : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentLubPrepare : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentRoutinePower : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSparePower : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSyRoutinePower : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSyRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentSySparePower : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentSySparePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentAcAirNetworkThree : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentAcAirNetworkThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentAcAirNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentAcAirNetworkTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentChillWaterLoopFour : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentChillWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentChillWaterLoopOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "classCode")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentChillWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentChillWaterLoopThree : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentChillWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,68 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentChillWaterLoopTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "classCode")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentChillWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,58 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentCondWaterNetwork : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "classCode")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
+open class RelEquipmentCondWaterNetwork  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentCoolingWaterLoopFour : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentCoolingWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentCoolingWaterLoopOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentCoolingWaterLoopOne  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentCoolingWaterLoopThree : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentCoolingWaterLoopThree  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,13 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentCoolingWaterLoopTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentCoolingWaterLoopTwo  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,74 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentFreshAirNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
+open class RelEquipmentFreshAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -28,6 +28,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
@@ -42,86 +43,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHeatWaterLoopFour : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentHeatWaterLoopFour  : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHeatWaterLoopOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentHeatWaterLoopOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHeatWaterLoopThree : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentHeatWaterLoopThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -26,12 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -41,69 +39,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentHeatWaterLoopTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @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
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    var floorId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    var familySymbol: String? = null
-
+open class RelEquipmentHeatWaterLoopTwo : EquipmentBase() {
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HeatWaterLoop_2'")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVentNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentVentNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
@@ -129,7 +48,7 @@ open class RelEquipmentVentNetworkOne : BaseInfo() {
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentVentNetworkOne
+}
 
 
 

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVentNetworkThree : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentVentNetworkThree : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVentNetworkTwo : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentVentNetworkTwo : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")

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

@@ -27,12 +27,10 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,86 +40,7 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentVrfNetworkOne : BaseInfo() {
-
-    /** 设备id */
-    @Schema(description = "设备id",required = true)
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 设备名称 */
-    @Schema(description = "设备名称",required = true)
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 设备本地编码 */
-    @Schema(description = "设备本地编码")
-    @Column(name = "local_id")
-    @JSONField(name = "LocalID")
-    var localId: String? = null
-
-    /** 设备本地名称 */
-    @Schema(description = "设备本地名称")
-    @Column(name = "local_name")
-    @JSONField(name = "LocalName")
-    var localName: String? = null
-
-    /** 设计图纸中编码 */
-    @Schema(description = "设计图纸中编码")
-    @Column(name = "cad_id")
-    @JSONField(name = "CADID")
-    var cadId: String? = null
-
-    /** BIM模型中编码 */
-    @Schema(description = "BIM模型中编码")
-    @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
-    var bimId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id",required = true)
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 设备类型code */
-    @Schema(description = "设备类型code")
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 设备所在建筑id */
-    @Schema(description = "设备所在建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 设备所在楼层id */
-    @Schema(description = "设备所在楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: String? = null
-
-//    //    /** 设备关联的资产id */
-//    @Schema(description = "设备关联的资产id")
-//    @Column(name = "property_id",insertable = false,updatable = false )
-//    @JSONField(name = "PropertyId")
-//    var propertyId: String? = null
-
-    /** Revit族 */
-    @Schema(description = "Revit族 ")
-    @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
-    var familyName: String? = null
-
-    /** Revit族类型 */
-    @Schema(description = "Revit族类型 ")
-    @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
-    var familySymbol: String? = null
+open class RelEquipmentVrfNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
@@ -129,8 +48,7 @@ open class RelEquipmentVrfNetworkOne : BaseInfo() {
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentVrfNetworkOne
-
+}
 
 
 

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

@@ -132,7 +132,7 @@ open class GeneralSystem : BaseInfo() {
 
     /** 级联-系统分类名 */
     @Schema(description = "级联-系统分类名")
-    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
+    @SCascade(table="general_system", idColumn="id", childIdColumn="class_code")
     var categoryNames: GeneralSystemCategory? = null
 
     /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */

datacenter/src/main/kotlin/com/persagy/server/controllers/graphtype/GraphicTypeController.kt

@@ -0,0 +1,154 @@
+/*
+ * ********************************************************************************************************************
+ *
+ *                     :*$@@%$*:                         ;:                ;;    ;;
+ *                   :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
+ *                  :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
+ *                  =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
+ *                  =@*                                  %!              @ $= % %@=   =%@!      %=
+ *             *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
+ *           %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
+ *         ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
+ *         $@*   ;@@@%=!:                *@*
+ *         =@$    ;;;!=%@@@@=!           =@!
+ *          %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
+ *           ;%@@$=$@@%*       *@@@$=%@@%;
+ *              ::;::             ::;::                                              All rights reserved.
+ *
+ * ********************************************************************************************************************
+ */
+
+package com.persagy.server.controllers.graphtype
+
+import com.persagy.database.SFilter
+import com.persagy.server.datacenter.models.entities.graphtype.GraphicType
+import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
+import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockResponse
+import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSource
+import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSourceRequest
+import com.persagy.server.services.graphtype.*
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
+import javax.servlet.http.HttpServletResponse
+
+
+/**
+ * 关系总览
+ *
+ * @author  邓婷婷
+ */
+@Tag(name = "关系总览")
+@RestController
+@RequestMapping("/graphic")
+open class GraphicTypeController {
+    companion object {
+        // 日志
+        private val logger = LoggerFactory.getLogger(GraphicTypeController::class.java)
+    } // Companion object
+
+    /** 实例化 mapper 对象 */
+    @Autowired
+    lateinit var graphicTypeMapperService: GraphicTypeMapperService
+
+    /**
+     * 查询关系总览
+     */
+    @Operation(summary = "查询关系总览")
+    @PostMapping(value = ["/overview"])
+    fun overview(): SQueryResponse<GraphicType> {
+        return GraphicTypeService.overview()
+    } // Function tree()
+
+    /**
+     * 查询数量
+     */
+    @Operation(summary = "查询总览数量", description = "")
+    @PostMapping(value = ["/query-count"])
+    fun queryCount(): SQueryResponse<GraphicType> {
+        return graphicTypeMapperService.queryCounts()
+    } /* Fun pageQuery() */
+
+    /**
+     * 下载模板
+     */
+    @Operation(summary="下载模板", description= "")
+    @GetMapping(value = ["/template-downloads"])
+    fun templateDownloads(response: HttpServletResponse) {
+        RelationTypeProjectService.templateDownloads(response)
+    } // Fun templateDownloads
+
+    /**
+     * 导出关系
+     */
+    @Operation(summary="导出关系*", description="")
+    @GetMapping(value = ["/export"])
+    fun exportExcel(response: HttpServletResponse, @RequestParam projectId: String,relType: String, code: String = "对象ID", zoneType: String? = null) {
+        RelationTypeProjectService.exportExcel(response, projectId,relType, code, zoneType)
+    } // Fun exportExcel
+
+    /**
+     * 导入excel
+     *
+     * @param   file            导入的excel文件
+     * @return  导入状态
+     */
+    @Operation(summary = "导入excel", description = "")
+    @PostMapping("/import")
+    fun importExcel(@RequestParam("file") file: MultipartFile, @RequestParam relType: String, zoneType: String? = null) : SBaseResponse {
+        try {
+            RelationTypeProjectService.importExcel(file, relType, zoneType)
+        }catch (e : Exception){
+            return SBaseResponse(SResponseType.failure,"error:" + e.message)
+        }
+        return SBaseResponse(SResponseType.success, "")
+    } // Fun importExcel()
+
+    /**
+     * 下载报告
+     */
+    @Operation(summary="下载报告", description ="")
+    @GetMapping(value = ["/report-downloads"])
+    fun reportDownloads(response: HttpServletResponse, @RequestParam relType: String, zoneType: String? = null) {
+        RelationTypeProjectService.reportDownloads(response, relType, zoneType)
+    } // Fun reportDownloads()
+
+    /**
+     * 获取源末端
+     */
+    @Operation(summary="获取源末端", description ="plx")
+    @PostMapping(value = ["/connected-block-query"])
+    fun connectedBlockQuery(@RequestBody request: SQueryRequest): SQueryResponse<ConnectedBlockResponse> {
+        return ConnectedBlockService.getConnectedBlock(request);
+    } // Fun connectedBlockQuery()
+
+    /**
+     * 覆盖源末端
+     */
+    @Operation(summary="覆盖源末端", description ="plx")
+    @PostMapping(value = ["/replace-connected-block-source"])
+    fun replaceConnectedBlockSource(@RequestBody request: ConnectedBlockSourceRequest): SCreateResponse<ConnectedBlockSource> {
+        return ConnectedBlockSourceService.replaceConnectedBlockSource(request)
+    } // Fun replaceConnectedBlockSource()
+
+
+    /**
+     * 项目关系类型查询
+     */
+    @Operation(summary="项目关系类型查询", description ="")
+    @PostMapping(value = ["/relation_type_project"])
+    fun relationTypeProject(@RequestBody request: SQueryRequest): SQueryResponse<RelationTypeProject> {
+        val service = SObjectService(RelationTypeProject::class.java)
+        return service.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+    } // Fun replaceConnectedBlockSource()
+} // Class EquipScanTaskController

revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/DoorController.kt

@@ -1,27 +1,8 @@
-/*
- * ********************************************************************************************************************
- *
- *                      :*$@@%$*:                         ;:                ;;    ;;
- *                    :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
- *                   :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
- *                   =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
- *                   =@*                                  %!              @ $= % %@=   =%@!      %=
- *              *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
- *            %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
- *          ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
- *          $@*   ;@@@%=!:                *@*
- *          =@$    ;;;!=%@@@@=!           =@!
- *           %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
- *            ;%@@$=$@@%*       *@@@$=%@@%;
- *               ::;::             ::;::                                              All rights reserved.
- *
- * ********************************************************************************************************************
- */
+package com.persagy.server.controllers.graphtype
 
-package com.persagy.revit.controllers.modelEntity
-
-import com.persagy.revit.models.entities.Door
-import com.persagy.revit.services.BaseDataService
+import com.persagy.server.datacenter.models.entities.graphtype.MDoor
+import com.persagy.server.services.graphtype.BaseDataService
+import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
@@ -30,26 +11,23 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.v3.oas.annotations.tags.Tag
 import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
-/**
- * 门接口
- *
- * @author jxing
- */
+
 @Tag(name = "构件-门接口")
 @RestController
 @RequestMapping("/door")
-class DoorController {
+class MDoorController {
+
     companion object {
         // 日志
-        private val logger = LoggerFactory.getLogger(DoorController::class.java)
+        private val logger = LoggerFactory.getLogger(MDoorController::class.java)
     } // Companion object
 
     val dataService = BaseDataService
@@ -60,21 +38,40 @@ class DoorController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @Operation(summary = "创建门", description =  "")
+    @Operation(summary = "创建门", description = "")
     @PostMapping(value = ["/create"])
-    fun create(@RequestBody entity: SCreateRequest<Door>): SCreateResponse<Door> {
+    fun create(@RequestBody entity: SCreateRequest<MDoor>): SCreateResponse<MDoor> {
         return dataService.doorService.createList(entity)
     } // Function create()
 
     /**
+     * 创建门(主键重复则忽略)
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建门(主键重复则忽略)", description = "")
+    @PostMapping(value = ["/create_ignore"])
+    fun createIgnore(@RequestBody entity: SCreateRequest<MDoor>): SCreateResponse<MDoor> {
+        entity.content.forEach {
+            try {
+                dataService.doorService.insert(it)
+            }catch (ignore : Exception){
+
+            }
+        }
+        return SCreateResponse(SResponseType.success)
+    } // Function create()
+
+    /**
      * 删除门
      *
      * @param   idList      门ID列表
      * @return  删除结果应答信息
      */
-    @Operation(summary = "删除门", description =  "")
+    @Operation(summary = "删除门", description = "")
     @PostMapping(value = ["/delete"])
-    fun delete(@RequestBody idList: ArrayList<Door>): SBaseResponse {
+    fun delete(@RequestBody idList: ArrayList<MDoor>): SBaseResponse {
         return dataService.doorService.deleteByKeysList(idList)
     } // Function delete()
 
@@ -84,9 +81,9 @@ class DoorController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @Operation(summary = "更新门", description =  "")
+    @Operation(summary = "更新门", description = "")
     @PostMapping(value = ["/update"])
-    fun update(@RequestBody request: SUpdateRequest<Door>): SBaseResponse {
+    fun update(@RequestBody request: SUpdateRequest<MDoor>): SBaseResponse {
         return dataService.doorService.updateList(request)
     } // Function update()
 
@@ -96,16 +93,16 @@ class DoorController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @Operation(summary = "查询门", description =  "")
+    @Operation(summary = "查询门", description = "")
     @PostMapping(value = ["/query"])
-    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Door> {
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<MDoor> {
         return dataService.doorService.pageQuery(request)
     } // Function query()
 
     /**
      * 根据条件查询统计数量
      */
-    @Operation(summary = "根据条件查询统计数量", description =  "")
+    @Operation(summary = "根据条件查询统计数量", description = "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.doorService.count(request)

datacenter/src/main/kotlin/com/persagy/server/controllers/graphtype/MVirtualWallController.kt

@@ -0,0 +1,109 @@
+package com.persagy.server.controllers.graphtype
+
+import com.persagy.server.datacenter.models.entities.graphtype.MVirtualWall
+import com.persagy.server.services.graphtype.BaseDataService
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+
+@Tag(name = "构件-虚拟墙接口")
+@RestController
+@RequestMapping("/vwall")
+class MVirtualWallController {
+    companion object {
+        // 日志
+        private val logger = LoggerFactory.getLogger(MVirtualWallController::class.java)
+    } // Companion object
+
+    val dataService = BaseDataService
+
+    /**
+     * 创建虚拟墙
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建虚拟墙", description = "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody entity: SCreateRequest<MVirtualWall>): SCreateResponse<MVirtualWall> {
+        return dataService.virtualWallService .createList(entity)
+    } // Function create()
+
+    /**
+     * 创建(主键重复则忽略)
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建(主键重复则忽略)", description = "")
+    @PostMapping(value = ["/create_ignore"])
+    fun createIgnore(@RequestBody entity: SCreateRequest<MVirtualWall>): SCreateResponse<MVirtualWall> {
+        entity.content.forEach {
+            try {
+                dataService.virtualWallService.insert(it)
+            }catch (ignore : Exception){
+
+            }
+        }
+        return SCreateResponse(SResponseType.success)
+    } // Function create()
+
+    /**
+     * 删除虚拟墙
+     *
+     * @param   idList      虚拟墙ID列表
+     * @return  删除结果应答信息
+     */
+    @Operation(summary = "删除虚拟墙", description = "")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<MVirtualWall>): SBaseResponse {
+        return dataService.virtualWallService.deleteByKeysList(idList)
+    } // Function delete()
+
+    /**
+     * 更新虚拟墙
+     *
+     * @param   request     更新请求
+     * @return  更新结果应答信息
+     */
+    @Operation(summary = "更新虚拟墙", description = "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<MVirtualWall>): SBaseResponse {
+        return dataService.virtualWallService.updateList(request)
+    } // Function update()
+
+    /**
+     * 查询虚拟墙
+     *
+     * @param   request     查询请求
+     * @return  查询结果应答信息
+     */
+    @Operation(summary = "查询虚拟墙", description = "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<MVirtualWall> {
+        return dataService.virtualWallService.pageQuery(request)
+    } // Function query()
+
+    /**
+     * 根据条件查询统计数量
+     */
+    @Operation(summary = "根据条件查询统计数量", description = "")
+    @PostMapping(value = ["/count"])
+    fun count(@RequestBody request: SCountRequest): SCountResponse {
+        return dataService.virtualWallService.count(request)
+    } // Function count()
+}

datacenter/src/main/kotlin/com/persagy/server/controllers/graphtype/MWindowController.kt

@@ -0,0 +1,109 @@
+package com.persagy.server.controllers.graphtype
+
+import com.persagy.server.datacenter.models.entities.graphtype.MWindow
+import com.persagy.server.services.graphtype.BaseDataService
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@Tag(name = "构件-窗户接口")
+@RestController
+@RequestMapping("/window")
+class MWindowController {
+
+    companion object {
+        // 日志
+        private val logger = LoggerFactory.getLogger(MWindowController::class.java)
+    } // Companion object
+
+    val dataService = BaseDataService
+
+    /**
+     * 创建窗户
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建窗户", description = "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody entity: SCreateRequest<MWindow>): SCreateResponse<MWindow> {
+        return dataService.windowService.createList(entity)
+    } // Function create()
+
+    /**
+     * 创建(主键重复则忽略)
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建(主键重复则忽略)", description = "")
+    @PostMapping(value = ["/create_ignore"])
+    fun createIgnore(@RequestBody entity: SCreateRequest<MWindow>): SCreateResponse<MWindow> {
+        entity.content.forEach {
+            try {
+                dataService.windowService.insert(it)
+            }catch (ignore : Exception){
+
+            }
+        }
+        return SCreateResponse(SResponseType.success)
+    } // Function create()
+
+    /**
+     * 删除窗户
+     *
+     * @param   idList      窗户ID列表
+     * @return  删除结果应答信息
+     */
+    @Operation(summary = "删除窗户", description = "")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<MWindow>): SBaseResponse {
+        return dataService.windowService.deleteByKeysList(idList)
+    } // Function delete()
+
+    /**
+     * 更新窗户
+     *
+     * @param   request     更新请求
+     * @return  更新结果应答信息
+     */
+    @Operation(summary = "更新窗户", description = "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<MWindow>): SBaseResponse {
+        return dataService.windowService.updateList(request)
+    } // Function update()
+
+    /**
+     * 查询窗户
+     *
+     * @param   request     查询请求
+     * @return  查询结果应答信息
+     */
+    @Operation(summary = "查询窗户", description = "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<MWindow> {
+        return dataService.windowService.pageQuery(request)
+    } // Function query()
+
+    /**
+     * 根据条件查询统计数量
+     */
+    @Operation(summary = "根据条件查询统计数量", description = "")
+    @PostMapping(value = ["/count"])
+    fun count(@RequestBody request: SCountRequest): SCountResponse {
+        return dataService.windowService.count(request)
+    } // Function count()
+}

datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt

@@ -36,10 +36,7 @@ import com.persagy.service.models.responses.SCreateResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 /**
  * 设备所在业务空间
@@ -64,7 +61,7 @@ class REqInSpController {
      */
     @Operation(summary = "创建设备所在业务空间关系,累计添加不会覆盖以前记录", description = "必填项：EquipId（设备id）、SpaceId（业务空间id）")
     @PostMapping(value = ["/link-list"])
-    fun create(type: String, @RequestBody rEqInSpBase: SCreateRequest<REqInSpBase>): SCreateResponse<REqInSpBase> {
+    fun create(@RequestParam type: String, @RequestBody rEqInSpBase: SCreateRequest<REqInSpBase>): SCreateResponse<REqInSpBase> {
         logger.debug("space = ${rEqInSpBase.toJson()}")
         return REqInSpBaseService.create(type,rEqInSpBase)
     } // Function create()
@@ -77,7 +74,7 @@ class REqInSpController {
      */
     @Operation(summary = "根据对象删除设备所在业务空间关系", description = "必填项：EquipId（设备id）、SpaceId（业务空间id）,type为空间类型")
     @PostMapping(value = ["/unlink-list"])
-    fun delete(type: String, @RequestBody rEqInSpBaseList: ArrayList<REqInSpBase>): SBaseResponse {
+    fun delete(@RequestParam type: String, @RequestBody rEqInSpBaseList: ArrayList<REqInSpBase>): SBaseResponse {
         return REqInSpBaseService.deletes(type,rEqInSpBaseList)
     } // Function delete()
 
@@ -89,7 +86,7 @@ class REqInSpController {
      */
     @Operation(summary = "所在业务空间的设备，业务空间一对多,累计添加不会覆盖以前记录", description = "必填项：EquipIdList（设备id列表）、SpaceId（业务空间id）")
     @PostMapping(value = ["/link-eq-sp"])
-    fun createEq(type:String, @RequestBody rEqInSpBase: RSpInEqBaseList): SCreateResponse<RSpInEqBaseList>{
+    fun createEq(@RequestParam type:String, @RequestBody rEqInSpBase: RSpInEqBaseList): SCreateResponse<RSpInEqBaseList>{
         logger.debug("space = ${rEqInSpBase.toJson()}")
         return REqInSpBaseService.createsSpEq(type,rEqInSpBase)
     } // Function createEq()

datacenter/src/main/kotlin/com/persagy/server/services/base/RService.kt

@@ -28,9 +28,7 @@ package com.persagy.server.services.base
 
 import com.persagy.database.SAbstractDao
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import com.persagy.server.synchronize.MessageHandler
 import com.persagy.service.SObjectService
-import com.persagy.service.utils.SSpringContextUtil
 
 /**
  * 关系处理服务基类
@@ -43,9 +41,9 @@ open class RService<ENTITY : RBaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjec
 //        private val logger = LoggerFactory.getLogger(ProjectController::class.java)
 
         /** MQ消息对象 */
-        val messageHandler by lazy {
-            SSpringContextUtil.getBean(MessageHandler::class.java) as MessageHandler
-        }
+//        val messageHandler by lazy {
+//            SSpringContextUtil.getBean(MessageHandler::class.java) as MessageHandler
+//        }
         /** kafka消息对象 */
 //        val kafkaService by lazy {
 //            SSpringContextUtil.getBean(KafkaService::class.java) as KafkaService

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt

@@ -65,7 +65,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 jsonObject.put("linkId",rEqForBd.buildingId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 SCreateResponse(SResponseType.success)
             }else{
@@ -97,7 +97,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 jsonObject.put("linkId",rEqForBd.buildingId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rEqForBd.toJson()
@@ -144,7 +144,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 jsonObject.put("obj_type", "Eq2Bd")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
                 if (failureList.size>0){
@@ -193,7 +193,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 jsonObject.put("obj_type", "Eq2Bd")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForFlService.kt

@@ -26,12 +26,12 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REqForFl
 import com.persagy.server.datacenter.models.entities.rel.REqForFlList
 import com.persagy.server.datacenter.models.entities.rel.RFlForEqList
 import com.persagy.server.services.base.RService
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -64,7 +64,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
                 jsonObject.put("linkId",rEqForFl.floorId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 SCreateResponse(SResponseType.success)
             }else{
@@ -95,7 +95,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
                 jsonObject.put("linkId",rEqForFl.floorId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rEqForFl.toJson()
@@ -142,7 +142,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
                 jsonObject.put("obj_type", "Eq2Fl")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
                 
                 val sCreateResponse = SCreateResponse<REqForFl>(SResponseType.success)
                 if (failureList.size>0){
@@ -191,7 +191,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
                 jsonObject.put("obj_type", "Eq2Fl")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqForFl>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForShService.kt

@@ -26,12 +26,12 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REqForSh
 import com.persagy.server.datacenter.models.entities.rel.REqForShList
 import com.persagy.server.datacenter.models.entities.rel.RShForEqList
 import com.persagy.server.services.base.RService
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -64,7 +64,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
                 jsonObject.put("linkId",rEqForSh.shaftId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Eq2Sh", "11", IdUtils.uuidCreate(), rEqForSh.equipId!!,rEqForSh.shaftId!!),false)
                 SCreateResponse(SResponseType.success)
             }else{
@@ -95,7 +95,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
                 jsonObject.put("linkId",rEqForSh.shaftId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Eq2Sh", "12", IdUtils.uuidCreate(), rEqForSh.equipId!!,rEqForSh.shaftId!!),false)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rEqForSh.toJson()
@@ -142,7 +142,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
                 jsonObject.put("obj_type", "Eq2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Eq2Sh", "13", IdUtils.uuidCreate(), rEqForShList.equipId!!,null),false)
                 val sCreateResponse = SCreateResponse<REqForSh>(SResponseType.success)
                 if (failureList.size>0){
@@ -191,7 +191,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
                 jsonObject.put("obj_type", "Eq2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Eq2Sh", "13", IdUtils.uuidCreate(), rEqForShList.shaftId!!,null),false)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqForSh>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt

@@ -31,7 +31,6 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REq2Sp
 import com.persagy.server.datacenter.models.entities.rel.REqForSpBase
 import com.persagy.server.datacenter.models.entities.rel.RSpForEqBaseList
-import com.persagy.server.services.base.RService
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
@@ -80,7 +79,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
                         jsonObject.put("linkId",rEqForSp.equipId)
 
                         /** 发送消息 */
-                        RService.messageHandler.sendMessage(jsonObject.toString())
+//                        RService.messageHandler.sendMessage(jsonObject.toString())
                     }else{
 
                     }
@@ -262,7 +261,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
                         jsonObject.put("linkId",rEqForSpBase.equipId)
 
                         /** 发送消息 */
-                        RService.messageHandler.sendMessage(jsonObject.toString())
+//                        RService.messageHandler.sendMessage(jsonObject.toString())
     //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipforSpace", "12", IdUtils.uuidCreate(), rEqForSpZoneHeating.spaceId!!,rEqForSpZoneHeating.equipId),false)
                     }
                 } catch (e: Exception) {
@@ -535,7 +534,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
                 jsonObject.put("linkId",successList.toJson())
 
                 /** 发送消息 */
-                RService.messageHandler.sendMessage(jsonObject.toString())
+//                RService.messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipforSpace", "14", IdUtils.uuidCreate(), rSpForEqZoneHeatingList.spaceId!!,null),false)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSpForEqBaseList>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqInShService.kt

@@ -26,12 +26,12 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REqInSh
 import com.persagy.server.datacenter.models.entities.rel.REqInShList
 import com.persagy.server.datacenter.models.entities.rel.RShInEqList
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.services.base.RService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -64,7 +64,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
                 jsonObject.put("linkId",rEqInSh.shaftId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipinShaft", "11", IdUtils.uuidCreate(),  rEqInSh.equipId!!,
 //                        rEqInSh.shaftId!!),false)
 
@@ -99,7 +99,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
                 jsonObject.put("linkId",rEqInSh.shaftId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipinShaft", "12", IdUtils.uuidCreate(),  rEqInSh.equipId!!,
 //                        rEqInSh.shaftId!!),false)
 
@@ -148,7 +148,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
                 jsonObject.put("obj_type", "EquipinShaft")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipinShaft", "13", IdUtils.uuidCreate(),  rEqInShList.equipId!!,null),false)
                 val sCreateResponse = SCreateResponse<REqInSh>(SResponseType.success)
                 if (failureList.size>0){
@@ -197,7 +197,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
                 jsonObject.put("obj_type", "EquipinShaft")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipinShaft", "13", IdUtils.uuidCreate(),  rShInEqList.shaftId!!,null),false)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqInSh>(SResponseType.success)
@@ -250,7 +250,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
                 jsonObject.put("linkId",successList.toJson())
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipinShaft", "14", IdUtils.uuidCreate(),  rShInEqList.shaftId!!,null),false)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqInSh>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/REqInSpBaseService.kt

@@ -26,13 +26,13 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REq2Sp
 import com.persagy.server.datacenter.models.entities.rel.REqInSpBase
 import com.persagy.server.datacenter.models.entities.rel.REqInSpBaseList
 import com.persagy.server.datacenter.models.entities.rel.RSpInEqBaseList
-import com.persagy.base.extensions.toJson
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.services.base.RService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -80,7 +80,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                         jsonObject.put("linkId",rEqInSpBase.equipId)
 
                         /** 发送消息 */
-                        messageHandler.sendMessage(jsonObject.toString())
+//                        messageHandler.sendMessage(jsonObject.toString())
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -375,7 +375,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                 jsonObject.put("linkId",successList.toJson())
 
                 /** 发送消息 */
-                RService.messageHandler.sendMessage(jsonObject.toString())
+//                RService.messageHandler.sendMessage(jsonObject.toString())
 
                 val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
                 if (failureList.size>0){
@@ -425,7 +425,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                 jsonObject.put("linkId",successList.toJson())
 
                 /** 发送消息 */
-                RService.messageHandler.sendMessage(jsonObject.toString())
+//                RService.messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
@@ -484,7 +484,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                         jsonObject.put("obj_type", "EquipinSpace")
                         jsonObject.put("linkId",successList.toJson())
                         /** 发送消息 */
-                        messageHandler.sendMessage(jsonObject.toString())
+//                        messageHandler.sendMessage(jsonObject.toString())
                         if (failureList.size>0){
                             val sCreateResponse = SCreateResponse<RSpInEqBaseList>(SResponseType.success)
                             sCreateResponse.message ="失败对象："+failureList.toJson()

datacenter/src/main/kotlin/com/persagy/server/services/rel/RFlThroughFlService.kt

@@ -64,7 +64,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
                 jsonObject.put("linkId",rFlThroughFl.floorOtherId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Fl2Fl", "11", IdUtils.uuidCreate(),  rFlThroughFl.floorId!!, rFlThroughFl.floorOtherId!!),false)
                 SCreateResponse(SResponseType.success)
             }else{
@@ -95,7 +95,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
                 jsonObject.put("linkId",rFlThroughFl.floorOtherId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Fl2Fl", "12", IdUtils.uuidCreate(),  rFlThroughFl.floorId!!, rFlThroughFl.floorOtherId!!),false)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rFlThroughFl.toJson()
@@ -209,7 +209,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
                     jsonObject.put("obj_type", "Fl2Fl")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Fl2Fl", "13", IdUtils.uuidCreate(),  rFollrOtherThroughFloorList.floorOtherId!!, null),false)
                     if (failureList.size>0){
                         val sCreateResponse = SCreateResponse<RFlThroughFl>(SResponseType.success)

datacenter/src/main/kotlin/com/persagy/server/services/rel/RShaftThroughShaftService.kt

@@ -26,18 +26,19 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
-import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaft
-import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaftOtherList
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaft
+import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaftOtherList
+import com.persagy.server.services.base.RService
+import com.persagy.server.services.objects.EquipmentService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
 import org.json.JSONObject
+import org.slf4j.LoggerFactory
 
 /**
  * 竖井的贯通关系服务
@@ -46,6 +47,9 @@ import org.json.JSONObject
  */
 object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RShaftThroughShaft::class.java)) {
 
+    /** 日志 */
+    private val logger = LoggerFactory.getLogger(RShaftThroughShaftService::class.java)
+
     /**
      * 创建竖井的贯通关系
      *
@@ -65,7 +69,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
                 jsonObject.put("linkId",rFlThroughFl.shaftOtherId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sh2Sh", "11", IdUtils.uuidCreate(),  rFlThroughFl.shaftId!!,
 //                        rFlThroughFl.shaftOtherId!!),false)
                 SCreateResponse(SResponseType.success)
@@ -117,7 +121,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
                 jsonObject.put("linkId",rFlThroughFl.shaftOtherId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sh2Sh", "12", IdUtils.uuidCreate(),  rFlThroughFl.shaftId!!,
 //                        rFlThroughFl.shaftOtherId!!),false)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
@@ -172,7 +176,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
                     jsonObject.put("obj_type", "Sh2Sh")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sh2Sh", "13", IdUtils.uuidCreate(),  rFloorThroughFloorOtherList.shaftId!!, null),false)
                     val sCreateResponse = SCreateResponse<RShaftThroughShaft>(SResponseType.success)
                     if (failureList.size>0){
@@ -218,6 +222,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
                     rFlThroughFl.shaftId = rFloorThroughFloorOtherList.shaftId
                     rFlThroughFl.shaftOtherId = floorOtherId
                     rFlThroughFl.projectId = projectId
+                    logger.debug("关系= ${rFlThroughFl.toJson()}")
                     val replace = replace(rFlThroughFl)
                     if (replace){
                         successList.add(rFlThroughFl)
@@ -249,7 +254,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
                     jsonObject.put("obj_type", "Sh2Sh")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sh2Sh", "14", IdUtils.uuidCreate(),  rFloorThroughFloorOtherList.shaftId!!, null),false)
                     val sCreateResponse = SCreateResponse<RShaftThroughShaft>(SResponseType.success)
                     if (failureList.size>0){

datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyEqService.kt

@@ -69,7 +69,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
                 jsonObject.put("obj_type", "SystemEquip")
                 jsonObject.put("linkId",rSyEq.equipId)
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "11", IdUtils.uuidCreate(),  rSyEq.sysId!!,
 //                        rSyEq.equipId!!),false)
                 SCreateResponse(SResponseType.success)
@@ -173,7 +173,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
                     jsonObject.put("obj_type", "SystemEquip")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "13", IdUtils.uuidCreate(),  rSyEqList.sysId!!, null),false)
 
                     val sCreateResponse = SCreateResponse<RSyEq>(SResponseType.success)
@@ -234,7 +234,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
                     jsonObject.put("obj_type", "SystemEquip")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "13", IdUtils.uuidCreate(),  rSyEqList.equipId!!, null),false)
 
 
@@ -376,7 +376,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
             jsonObject.put("linkId",rSyEq.equipId)
 
             /** 发送消息 */
-            messageHandler.sendMessage(jsonObject.toString())
+//            messageHandler.sendMessage(jsonObject.toString())
 //            kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "11", IdUtils.uuidCreate(),  rSyEq.sysId!!, rSyEq.equipId),false)
         }
 
@@ -396,7 +396,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
             jsonObject.put("obj_type", "SystemEquip")
             jsonObject.put("linkId",rSyEq.equipId)
             /** 发送消息 */
-            messageHandler.sendMessage(jsonObject.toString())
+//            messageHandler.sendMessage(jsonObject.toString())
 //            kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "12", IdUtils.uuidCreate(),  rSyEq.sysId!!, rSyEq.equipId),false)
         }
     } // Function onDeleteSuccess()

datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/CalcSpecialService.kt

@@ -26,15 +26,14 @@
 
 package com.persagy.server.services.relation_calc
 
-import com.persagy.server.services.base.RService
-import com.persagy.server.utils.IdUtils
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlock
 import com.persagy.server.datacenter.models.entities.rel.REq2Eq
 import com.persagy.server.mappers.ICalcSpecialMapper
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
@@ -131,7 +130,7 @@ open class CalcSpecialService {
                             jsonObject.put("obj_type", relationType)
 
                             /** 发送消息 */
-                            RService.messageHandler.sendMessage(jsonObject.toString())
+//                            RService.messageHandler.sendMessage(jsonObject.toString())
 
                             val sCreateRequest = SCreateRequest<REq2Eq>()
                             sCreateRequest.content = generateRelation
@@ -150,7 +149,7 @@ open class CalcSpecialService {
                             createJsonObject.put("obj_type", relationType)
                             createJsonObject.put("relation",createMapList)
                             /** 发送消息 */
-                            RService.messageHandler.sendMessage(createJsonObject.toString())
+//                            RService.messageHandler.sendMessage(createJsonObject.toString())
                         }
                     } catch (e: Exception) {
                         upDateBiaoji(projectId,relationType ,5)

datacenter/src/main/resources/application-prod.yml

@@ -39,7 +39,7 @@ spring:
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
   rabbitmq:
-    host: 172.17.100.14
+    host: 39.102.43.179
     port: 9936
     username: admin
     password: brzj123456

equip-component/src/main/kotlin/com/persagy/server/service/objects/GeneralSystemService.kt

@@ -108,7 +108,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
 
             if (list.size>0){
                 listf.add(SFilter.eq("projectId", projectId!!))
-                listf.add(SFilter.not(SFilter.inList("SysID", list)))
+                listf.add(SFilter.not(SFilter.inList("id", list)))
             }else{
                 listf.add(SFilter.eq("projectId", projectId!!))
             }

equip-component/src/main/resources/application-prod.yml

@@ -19,8 +19,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
-#    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#

revit-algorithm/build.gradle

@@ -1,300 +0,0 @@
-/*
- * ********************************************************************************************************************
- *
- *                     :*$@@%$*:                         ;:                ;;    ;;
- *                   :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
- *                  :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
- *                  =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
- *                  =@*                                  %!              @ $= % %@=   =%@!      %=
- *             *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
- *           %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
- *         ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
- *         $@*   ;@@@%=!:                *@*             
- *         =@$    ;;;!=%@@@@=!           =@!      
- *          %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
- *           ;%@@$=$@@%*       *@@@$=%@@%;                              
- *              ::;::             ::;::                                              All rights reserved.
- *
- * ********************************************************************************************************************
- */
-
-group rootProject.group
-version rootProject.version
-
-apply plugin: "kotlin"
-apply plugin: "org.jetbrains.dokka"
-apply plugin: "war"
-apply plugin: 'maven'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-apply plugin: "java"
-
-apply plugin: 'org.hidetake.ssh'
-
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-compileKotlin {
-    kotlinOptions.jvmTarget = 1.8
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = 1.8
-}
-
-dependencies {
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // kotlin 依赖
-    compile group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: KOTLIN_VERSION
-    compile group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: KOTLIN_VERSION
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // spring boot 依赖
-    compile group: "org.springframework.boot", name: "spring-boot-starter-web", version: SPRING_BOOT_VERSION
-    compile group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: SPRING_BOOT_VERSION
-    compile group: "org.springframework.boot", name: "spring-boot-starter-logging", version: SPRING_BOOT_VERSION
-    // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test
-    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.2.2.RELEASE'
-
-
-
-    //消息
-    compile group: "org.springframework.boot", name: "spring-boot-starter-activemq", version: SPRING_BOOT_VERSION
-    compile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
-//    providedCompile group: "org.springframework.boot", name:"spring-boot-starter-tomcat", version: SPRING_BOOT_VERSION
-    // spring boot 缓存
-    compile group:"org.springframework.boot", name:"spring-boot-starter-cache", version: SPRING_BOOT_VERSION
-
-//    // PostgreSQL
-//    //https://mvnrepository.com/artifact/org.postgresql/postgresql
-//    compile group: 'org.postgresql',    name: 'postgresql',     version: POSTGRESQL_VERSION
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // RESTful API 文档生成工具
-    // https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui
-//    compile group: "io.springfox", name: "springfox-swagger-ui", version: SWAGGER_VERSION
-//    compile group: "io.springfox", name: "springfox-swagger2", version: SWAGGER_VERSION
-
-    // RESTful API 文档生成工具
-    // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui
-    compile group: 'org.springdoc', name: 'springdoc-openapi-ui', version: SPRING_DOC_VERSION
-    // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-common
-    compile group: "org.springdoc", name: "springdoc-openapi-common", version: SPRING_DOC_VERSION
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Sybotan依赖
-//    compile group: "com.sybotan", name: "sybotan-kotlin-base", version: SYBOTAN_KOTLIN_VERSION
-//    compile group: "com.sybotan", name: "sybotan-kotlin-database", version: SYBOTAN_KOTLIN_VERSION
-//    compile group: "com.sybotan", name: "sybotan-kotlin-mybatis", version: SYBOTAN_KOTLIN_VERSION
-//    compile group: "com.sybotan", name: "sybotan-kotlin-postgresql", version: SYBOTAN_KOTLIN_VERSION
-//    compile group: "com.sybotan", name: "sybotan-service-base", version: SYBOTAN_SERVICE_VERSION
-//    compile group: "com.sybotan", name: "sybotan-service-mybatis", version: SYBOTAN_SERVICE_VERSION
-
-    // 带隐性数据库接口
-//    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
-//    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
-//    compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
-//    compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
-//    compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
-//    compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
-    compile group: "com.persagy", name: "persagy-kotlin-base", version: PERSAGY_KOTLIN_VERSION
-    compile group: "com.persagy", name: "persagy-kotlin-database", version: PERSAGY_KOTLIN_VERSION
-    compile group: "com.persagy", name: "persagy-kotlin-mybatis", version: PERSAGY_KOTLIN_VERSION
-    compile group: "com.persagy", name: "persagy-kotlin-postgresql", version: PERSAGY_KOTLIN_VERSION
-    compile group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION
-    compile group: "com.persagy", name: "persagy-service-mybatis", version: PERSAGY_SERVICE_VERSION
-
-    // 生成uuid
-    // https://mvnrepository.com/artifact/com.fasterxml.uuid/java-uuid-generator
-    compile group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.2.0'
-    // https://mvnrepository.com/artifact/com.google.guava/guava
-//    compile group: 'com.google.guava', name: 'guava', version: '28.1-jre'
-
-    // 上传文件
-    // https://mvnrepository.com/artifact/commons-io/commons-io
-    compile 'commons-io:commons-io:1.4'
-    // https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload
-    compile 'commons-fileupload:commons-fileupload:1.3.1'
-    // https://mvnrepository.com/artifact/com.alibaba/fastjson
-    compile group: 'com.alibaba', name: 'fastjson', version: '1.2.56'
-
-
-    // activemq
-//    // https://mvnrepository.com/artifact/org.apache.activemq/activemq-all
-//    compile group: 'org.apache.activemq', name: 'activemq-all', version: '5.15.10'
-//// https://mvnrepository.com/artifact/org.apache.activemq/activemq-core
-    compile group: 'org.apache.activemq', name: 'activemq-core', version: '5.7.0'
-//    // https://mvnrepository.com/artifact/org.apache.activemq/activemq-spring
-    compile group: 'org.apache.activemq', name: 'activemq-spring', version: '5.15.10'
-// https://mvnrepository.com/artifact/org.apache.activemq/activemq-pool
-    compile group: 'org.apache.activemq', name: 'activemq-pool', version: '5.15.10'
-// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-activemq
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-activemq', version: '2.1.8.RELEASE'
-
-//    // anko依赖
-//    // https://mvnrepository.com/artifact/org.jetbrains.anko/anko-commons
-//    implementation group: 'org.jetbrains.anko', name: 'anko-commons', version: '0.10.8'
-
-
-    //poi
-    // https://mvnrepository.com/artifact/org.apache.poi/poi
-    compile group: 'org.apache.poi', name: 'poi', version: '4.1.1'
-    // https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml
-    compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.1.1'
-//    // https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas
-//    compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: '4.1.1'
-// https://mvnrepository.com/artifact/org.apache.poi/ooxml-schemas
-    compile group: 'org.apache.poi', name: 'ooxml-schemas', version: '1.4'
-
-    // https://mvnrepository.com/artifact/com.aliyun.oss/aliyun-sdk-oss
-    compile group: 'com.aliyun.oss', name: 'aliyun-sdk-oss', version: '3.5.0'
-
-    // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
-    compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.2.2'
-
-// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-
-    // 处理拼音
-    // https://mvnrepository.com/artifact/com.belerweb/pinyin4j
-    compile group: 'com.belerweb', name: 'pinyin4j', version: '2.5.1'
-
-    // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-activemq
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-activemq', version: '2.2.2.RELEASE'
-
-
-    // 数据中心依赖
-    compile project(":data-core")
-
-
-}
-
-dependencyManagement {
-    imports {
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${SPRING_CLOUD_DEPENDENCIES}"
-    }
-}
-// 下面是配置文件选择
-/*******************************************************/
-
-sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-dev']
-//ext.needTest = 'true'
-
-task doWar{
-    dependsOn build
-    doLast {
-        file('build\\libs\\revit-algorithm-2.0.0.war').renameTo('build\\libs\\revit-algorithm.war')
-    }
-}
-
-task doJar{
-    dependsOn bootJar
-    doFirst {
-        file('build\\libs\\revit-algorithm-2.0.0.jar').renameTo('d:/000/revit-algorithm.jar')
-    }
-}
-
-// 打产品包
-task buildProdWar {
-    doFirst {
-        sourceSets.main.resources.srcDirs = ["src/main/resources", "src/main/resources-prod"]
-        test.onlyIf {
-            project.hasProperty("needTest")
-        }
-    }
-    finalizedBy(doWar)
-}
-// 打开发环境包
-task buildDevWar {
-    doFirst {
-        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-dev']
-        test.onlyIf {
-            project.hasProperty("needTest")
-        }
-    }
-    finalizedBy(doWar)
-}
-
-
-// 打开发环境包
-task buildDevJar {
-    doFirst {
-        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-dev']
-        test.onlyIf {
-            project.hasProperty("needTest")
-        }
-    }
-    finalizedBy(doJar)
-
-}
-
-
-// 打生产环境包
-task buildProdJar {
-    doFirst {
-        sourceSets.main.resources.srcDirs = ["src/main/resources", "src/main/resources-prod"]
-        test.onlyIf {
-            project.hasProperty("needTest")
-        }
-    }
-    finalizedBy(doJar)
-}
-
-
-
-
-
-remotes {
-    testServer {
-        role 'testNode'
-        host = '192.168.20.234'
-        user = 'saga'
-//        identity = file("C:\\Users\\jxing\\.ssh\\id_rsa")
-        identity = file("${System.properties['user.home']}\\.ssh\\id_rsa")
-    }
-}
-
-task depolyTestServer {
-    doLast {
-        ssh.run {
-            session(remotes.testServer) {
-                // Execute a command
-                def result = execute 'rm /opt/tomcat9/webapps/revit-algorithm.war', ignoreError: true
-                println result
-                while(true) {
-                    result = execute 'ls /opt/tomcat9/webapps'
-                    println result
-                    if(result.indexOf('revit-algorithm') < 0){
-                        break
-                    }
-                    sleep(1000)
-                }
-                put from: 'build\\libs\\revit-algorithm-2.0.0.war', into: '.'
-                result = execute 'mv revit-algorithm-2.0.0.war /opt/tomcat9/webapps/revit-algorithm.war'
-
-                // Also Groovy methods or properties are available in a session closure
-                println result
-            }
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

revit-algorithm/src/main/kotlin/com/persagy/revit/AlgorithmApp.kt

@@ -1,126 +0,0 @@
-/*
- * ********************************************************************************************************************
- *
- *                      :*$@@%$*:                         ;:                ;;    ;;
- *                    :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
- *                   :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
- *                   =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
- *                   =@*                                  %!              @ $= % %@=   =%@!      %=
- *              *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
- *            %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
- *          ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
- *          $@*   ;@@@%=!:                *@*
- *          =@$    ;;;!=%@@@@=!           =@!
- *           %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
- *            ;%@@$=$@@%*       *@@@$=%@@%;
- *               ::;::             ::;::                                              All rights reserved.
- *
- * ********************************************************************************************************************
- */
-
-package com.persagy.revit
-
-import com.alibaba.fastjson.PropertyNamingStrategy
-import com.alibaba.fastjson.serializer.SerializeConfig
-import com.persagy.service.json.SJsonHttpMessageConverter
-import org.mybatis.spring.annotation.MapperScan
-import org.slf4j.LoggerFactory
-import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.ComponentScan
-
-/**
- * 应用配置
- *
- * @author  Andy
- */
-@ComponentScan(basePackages = ["com.persagy.revit", "com.persagy"])           // 配置组件扫描路径
-@MapperScan("com.persagy", "com.persagy.revit")                       // Mapper组件扫描路径
-@SpringBootApplication
-open class AlgorithmApp : SpringBootServletInitializer() {
-    companion object {
-        // 日志
-        private val logger = LoggerFactory.getLogger(AlgorithmApp::class.java)
-    } // Companion object
-
-
-    /**
-     * 配置FastJson
-     *
-     * @return  HttpMessageConverters
-     */
-//    @Bean
-//    @Suppress("MoveLambdaOutsideParentheses")
-//    open fun jsonHttpMessageConverters(): SJsonHttpMessageConverter {
-////        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
-//        val fastConverter = SJsonHttpMessageConverter()
-//        fastConverter.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
-//        return fastConverter
-//    } // Function fastJsonHttpMessageConverters()
-//    /**
-//     * 配置FastJson
-//     *
-//     * @return  HttpMessageConverters
-//     */
-//    @Bean
-//    @Suppress("MoveLambdaOutsideParentheses")
-//    open fun jsonMessageConverterConfig(): SerializeConfig {
-////        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
-//        val config = SerializeConfig()
-//        config.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
-//        return config
-//    } // Function fastJsonHttpMessageConverters()
-
-    /**
-     * 配置应用
-     *
-     * @param   application     应用构建对象
-     */
-    override fun configure(application: SpringApplicationBuilder): SpringApplicationBuilder {
-        return application.sources(AlgorithmApp::class.java)
-    } // Function configure
-} // Class Application
-
-/**
- * Web应用入口
- *
- * @param   args        命令行参数
- */
-fun main(args: Array<String>) {
-    val ctx = SpringApplication.run(AlgorithmApp::class.java, *args)
-//    var it = ctx.beanFactory.beanNamesIterator
-//    while (it.hasNext()){
-//        var str = it.next()
-//        if(str.toLowerCase() == "algorithmApp")
-//            println(str)
-//    }
-    return
-} // Function main()
-
-//网关:
-//新地址: http://api.sagacloud.cn/data-platform-3                        原地址:   http://172.17.11.168:8888/data-platform-3
-//新地址: http://api.sagacloud.cn/ScanBuilding                           原地址:   http://172.17.11.175:8080/ScanBuilding
-//新地址: http://api.sagacloud.cn/fm-service/fm-plugins                  原地址:   http://172.17.11.175:8080/fm-plugins
-//新地址: http://api.sagacloud.cn/fm-service/assign-order                原地址:   http://172.17.11.175:8080/assign-order
-//新地址: http://api.sagacloud.cn/fm-service/qrcode                      原地址:   http://172.17.11.175:8080/qrcode
-//新地址: http://api.sagacloud.cn/fm-service/sms-platform                原地址:   http://172.17.11.175:8080/sms-platform
-//新地址: http://api.sagacloud.cn/fm-service/person-service              原地址:   http://172.17.11.175:8081/person-service
-//新地址: http://api.sagacloud.cn/fm-service/sop                         原地址:   http://172.17.11.175:8081/sop
-//新地址: http://api.sagacloud.cn/fm-service/saas                        原地址:   http://172.17.11.175:8081/saas
-//新地址: http://api.sagacloud.cn/fm-service/workorder                   原地址:   http://172.17.11.175:8081/workorder
-//新地址: http://api.sagacloud.cn/dp-auxiliary/alarm-system              原地址:   http://172.17.11.172:8889/alarm-system
-//新地址: http://api.sagacloud.cn/dp-auxiliary/custom-data               原地址:   http://172.17.11.172:8889/custom-data
-//新地址: http://api.sagacloud.cn/dp-auxiliary/data-front                原地址:   http://172.17.11.172:8889/data-front
-//新地址: http://api.sagacloud.cn/dp-auxiliary/dict                      原地址:   http://172.17.11.172:8889/dict
-//新地址: http://api.sagacloud.cn/dp-auxiliary/image-service             原地址:   http://172.17.11.172:8889/image-service
-//新地址: http://api.sagacloud.cn/dp-auxiliary/metadata-web              原地址:   http://172.17.11.172:8889/metadata-web
-//新地址: http://api.sagacloud.cn/dp-auxiliary/public-service            原地址:   http://172.17.11.172:8889/public-service
-//新地址: http://api.sagacloud.cn/dp-auxiliary/static-content            原地址:   http://172.17.11.172:8889/static-content
-//新地址: http://api.sagacloud.cn/duoduo-service/workorder-service       原地址:   http://172.17.11.170:51003
-//新地址: http://api.sagacloud.cn/duoduo-service/alarm-service           原地址:   http://172.17.11.170:51004
-//新地址: http://api.sagacloud.cn/duoduo-service/businessos-service      原地址:   http://172.17.11.170:51006
-//新地址: http://api.sagacloud.cn/pythonserver                           原地址:   http://172.17.11.173:8001
-

revit-algorithm/src/main/kotlin/com/persagy/revit/Swagger2Config.kt

@@ -1,85 +0,0 @@
-/*
- * ********************************************************************************************************************
- *
- *                      :*$@@%$*:                         ;:                ;;    ;;
- *                    :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
- *                   :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
- *                   =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
- *                   =@*                                  %!              @ $= % %@=   =%@!      %=
- *              *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
- *            %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
- *          ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
- *          $@*   ;@@@%=!:                *@*
- *          =@$    ;;;!=%@@@@=!           =@!
- *           %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
- *            ;%@@$=$@@%*       *@@@$=%@@%;
- *               ::;::             ::;::                                              All rights reserved.
- *
- * ********************************************************************************************************************
- */
-
-package com.persagy.revit
-
-import org.slf4j.LoggerFactory
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import springfox.documentation.builders.ApiInfoBuilder
-import springfox.documentation.builders.ParameterBuilder
-import springfox.documentation.builders.PathSelectors
-import springfox.documentation.builders.RequestHandlerSelectors
-import springfox.documentation.schema.ModelRef
-import springfox.documentation.service.ApiInfo
-import springfox.documentation.service.Contact
-import springfox.documentation.service.Parameter
-import springfox.documentation.spi.DocumentationType
-import springfox.documentation.spring.web.plugins.Docket
-import springfox.documentation.swagger2.annotations.EnableSwagger2
-
-/**
- * RESTful API文档生成器Swagger2配置
- *
- * @author  PLX
- */
-@Configuration
-@EnableSwagger2
-open class Swagger2Config {
-    companion object {
-        // 日志
-        private val logger = LoggerFactory.getLogger(Swagger2Config::class.java)
-    } // Companion object
-
-    /**
-     * 创建RestApi文档生成器
-     *
-     * @return  返回文档生成器对象
-     */
-    @Bean
-    open fun createRestApi(): Docket {
-        val builder = ParameterBuilder()
-        val pars = ArrayList<Parameter>()
-        builder.name("ProjectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        pars.add(builder.build())
-        return Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.persagy.revit"))
-                .paths(PathSelectors.any())
-                .build()
-                .globalOperationParameters(pars)
-    } // Function createRestApi()
-
-    /**
-     * 返回API信息基本
-     *
-     * @return  返回Api基本信息
-     */
-    private fun apiInfo(): ApiInfo {
-        return ApiInfoBuilder()
-                .title("Revit模型算法 API")
-                .description("")
-                .termsOfServiceUrl("http://www.sagacloud.cn/")
-                .contact(Contact("jxing", "", "xingjinghao@sagacloud.cn"))
-                .version("2.0")
-                .build()
-    } // Function apiInfo()
-} // Class Swagger2Config

revit-algorithm/src/main/kotlin/com/persagy/revit/Swagger3Config.kt

@@ -1,155 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .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.revit
-
-import io.swagger.v3.oas.annotations.enums.ParameterIn
-import io.swagger.v3.oas.models.Components
-import io.swagger.v3.oas.models.OpenAPI
-import io.swagger.v3.oas.models.Operation
-import io.swagger.v3.oas.models.info.Contact
-import io.swagger.v3.oas.models.info.Info
-import io.swagger.v3.oas.models.info.License
-import io.swagger.v3.oas.models.media.StringSchema
-import io.swagger.v3.oas.models.parameters.Parameter
-import io.swagger.v3.oas.models.security.SecurityScheme
-import org.springdoc.core.GroupedOpenApi
-import org.springdoc.core.customizers.OperationCustomizer
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.method.HandlerMethod
-
-/**
- * RESTful API文档生成器Swagger2配置
- *
- * @author  PLX
- */
-@Configuration
-open class Swagger3Config {
-
-    /** 标题 */
-    private val title = "模型服务 API"
-    /** API 版本号 */
-    private val version = "1.0"
-
-    val operationCustomizer = GlobalHeaderOperationCustomizer()
-
-    /**
-     * API 信息
-     */
-    @Bean
-    open fun openApi(): OpenAPI {
-        val contact = Contact().name("庞利祥").email("sybotan@126.com")
-        return OpenAPI()
-            .components(
-                Components()
-                .addSecuritySchemes("basicScheme", SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("basic")))
-            .info(
-                Info()
-                .title(title)
-                .version(version)
-                .termsOfService("http://www.sybotan.com")
-                .contact(contact)
-                .license(
-                    License()
-                    .name("Apache 2.0")
-                    .url("http://www.sybotan.com")))
-    }
-
-
-
-    /**
-     * 默认分组
-     */
-    @Bean
-    open fun defaultApiGroup(): GroupedOpenApi {
-        return GroupedOpenApi.builder()
-            .group("默认")
-            .pathsToMatch("/**")
-            .addOperationCustomizer(operationCustomizer)
-            .build()
-    }
-
-//    /**
-//     * 对象 API 组
-//     */
-//    @Bean
-//    open fun objectApiGroup(): GroupedOpenApi {
-//        return GroupedOpenApi.builder()
-//            .group("对象")
-//            .pathsToMatch("/object/**")
-//            .addOperationCustomizer(operationCustomizer)
-//            .build()
-//    }
-//
-//    /**
-//     * 对象 API 组
-//     */
-//    @Bean
-//    open fun relApiGroup(): GroupedOpenApi {
-//        return GroupedOpenApi.builder()
-//            .group("关系")
-//            .pathsToMatch("/rel/**")
-//            .addOperationCustomizer(operationCustomizer)
-//            .build()
-//    }
-//
-//    /**
-//     * 对象 API 组
-//     */
-//    @Bean
-//    open fun dictApiGroup(): GroupedOpenApi {
-//        return GroupedOpenApi.builder()
-//            .group("字典")
-//            .pathsToMatch("/dict/**")
-//            .addOperationCustomizer(operationCustomizer)
-//            .build()
-//    }
-
-    /**
-     * 全局参数
-     *
-     * @author  庞利祥 <sybotan@126.com>
-     */
-    class GlobalHeaderOperationCustomizer : OperationCustomizer {
-        /**
-         * 接口定义器
-         *
-         * @param   operation       接口
-         * @param   handlerMethod   原接口方法
-         * @return  新定义的接口
-         */
-        override fun customize(operation: Operation, handlerMethod: HandlerMethod): Operation {
-            val projectId = Parameter().`in`(ParameterIn.HEADER.toString())
-                .name("projectId").description("项目 id")
-                .schema(StringSchema()).required(false)
-            operation.addParametersItem(projectId)
-
-            return operation
-        }
-    }
-
-} // Class Swagger2Config

revit-algorithm/src/main/kotlin/com/persagy/revit/WebMvcConfg.kt

@@ -1,60 +0,0 @@
-package com.persagy.revit
-
-import com.alibaba.fastjson.PropertyNamingStrategy
-import com.persagy.service.interceptors.SPageInterceptor
-import com.persagy.service.json.SJsonHttpMessageConverter
-import org.springframework.context.annotation.Configuration
-import org.springframework.http.converter.HttpMessageConverter
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
-
-/**
- *
- *
- * @author jxing
- */
-@Configuration
-open class WebMvcConfg: WebMvcConfigurer {
-
-    /**
-     * 设置接口超时时间
-     */
-//    override fun configureAsyncSupport(configurer : AsyncSupportConfigurer) {
-//        configurer.setDefaultTimeout(1000 * 60 * 60)
-//        configurer.registerCallableInterceptors(timeoutInterceptor())
-//    }
-//    @Bean
-//    open fun timeoutInterceptor() : TimeoutCallableProcessingInterceptor {
-//        return TimeoutCallableProcessingInterceptor()
-//    }
-
-    /**
-     * 配置拦截器
-     *
-     * @param   registry        拦截器注册器
-     */
-    override fun addInterceptors(registry : InterceptorRegistry) {
-        //registry.addInterceptor(AccessControlAllowOriginInterceptor()).addPathPatterns("/**")
-//        registry.addInterceptor(SAccessControlAllowOriginInterceptor()).addPathPatterns("/**")
-        registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
-        super.addInterceptors(registry)
-    } // Function addInterceptors()
-
-
-    /**
-     * 配置 json 转换使用 FastJson
-     *
-     * @param   converterList       转换器列表
-     */
-    override fun configureMessageConverters(converterList: MutableList<HttpMessageConverter<*>>) {
-        // 先把JackSon的消息转换器删除.
-        converterList.removeIf { item -> item is MappingJackson2HttpMessageConverter }
-
-        val converter = SJsonHttpMessageConverter()
-        // 设置 Json 序列化，属性首字母小写
-        converter.propertyNamingStrategy = PropertyNamingStrategy.CamelCase
-        converterList.add(converter)
-    }
-} // Class WebMvcConf()