Jelajahi Sumber

********************WX***********************
添加调度器

zhangweixin 4 tahun lalu
induk
melakukan
b4dfe3ecfc
100 mengubah file dengan 699 tambahan dan 1273 penghapusan
  1. 49 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/DictSpaceProject.kt
  2. 4 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointPosition.kt
  3. 0 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MVirtualWall.kt
  4. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationType.kt
  5. 1 31
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationTypeProject.kt
  6. 94 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/EquipmentBase.kt
  7. 0 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  8. 2 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt
  9. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentFloor.kt
  10. 1 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentShaft.kt
  11. 1 109
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystem.kt
  12. 1 64
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemBuilding.kt
  13. 2 65
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemFloor.kt
  14. 2 95
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemShaft.kt
  15. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelProperty.kt
  16. 1 20
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelPropertyShaft.kt
  17. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sp.kt
  18. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sy.kt
  19. 3 86
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkOne.kt
  20. 1 12
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt
  21. 3 23
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopOne.kt
  22. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopTwo.kt
  23. 2 32
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCondWaterNetwork.kt
  24. 11 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt
  25. 6 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/FloorOutline.kt
  26. 9 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  27. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForBdList.kt
  28. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForShList.kt
  29. 1 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForSpBase.kt
  30. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RFlInSyList.kt
  31. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RFloorThroughFloorOtherList.kt
  32. 10 62
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RPeInSh.kt
  33. 0 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSh2Bd.kt
  34. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RShForEqList.kt
  35. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RShInEqList.kt
  36. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RShaftThroughShaftOtherList.kt
  37. 1 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSiInSpBase.kt
  38. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpForEqBaseList.kt
  39. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpInEqBaseList.kt
  40. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpatialConnection.kt
  41. 1 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSy2Bd.kt
  42. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForFl.kt
  43. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForFlList.kt
  44. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForShList.kt
  45. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyForSpBaseList.kt
  46. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyInBd.kt
  47. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyInFlList.kt
  48. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyInShList.kt
  49. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyInSpBaseList.kt
  50. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RTn2Sp.kt
  51. 1 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RTnInSpBaseList.kt
  52. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RelationSpaceShaft.kt
  53. 0 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/ModelScanTaskQuery.kt
  54. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/UpDataFloorAndBuildingRequests.kt
  55. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  56. 11 11
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt
  57. 5 5
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt
  58. 13 13
      datacenter/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt
  59. 97 102
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt
  60. 29 32
      datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt
  61. 3 3
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSpatialConnectionService.kt
  62. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyEqService.kt
  63. 3 3
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForSpBaseService.kt
  64. 10 10
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.kt
  65. 8 8
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInSpBaseService.kt
  66. 5 4
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  67. 174 181
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/tools/ManualRelationTools.kt
  68. 1 1
      datacenter/src/main/resources/application-prod.yml
  69. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt
  70. 2 2
      datasyn/src/main/resources/application-dev.yml
  71. 18 5
      datasyn/src/main/resources/application-prod.yml
  72. 0 0
      equip-component/build.gradle
  73. 0 0
      equip-component/src/main/kotlin/com/persagy/server/EquipComponentApp.kt
  74. 0 0
      equip-component/src/main/kotlin/com/persagy/server/Opt.kt
  75. 0 0
      equip-component/src/main/kotlin/com/persagy/server/ShiroConfig.kt
  76. 0 0
      equip-component/src/main/kotlin/com/persagy/server/Swagger2Config.kt
  77. 14 0
      equip-componet/src/main/kotlin/com/persagy/server/Swagger3Config.kt
  78. 0 0
      equip-component/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  79. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt
  80. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/EquipController.kt
  81. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/FloorController.kt
  82. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/PointController.kt
  83. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt
  84. 4 7
      equip-componet/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt
  85. 9 8
      equip-componet/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt
  86. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/TenantController.kt
  87. 0 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt
  88. 1 1
      equip-componet/src/main/kotlin/com/persagy/server/controllers/labsl/LabslController.kt
  89. 58 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/planar/PlanarController.kt
  90. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt
  91. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt
  92. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt
  93. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt
  94. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt
  95. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt
  96. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt
  97. 0 0
      equip-component/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt
  98. 0 0
      equip-component/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt
  99. 0 0
      equip-component/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt
  100. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipComDel.kt

+ 49 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/DictSpaceProject.kt

@@ -0,0 +1,49 @@
+package com.persagy.server.datacenter.models.entities.assistant
+
+import com.alibaba.fastjson.annotation.JSONField
+import com.persagy.service.models.SBaseEntity
+import io.swagger.v3.oas.annotations.media.Schema
+import java.io.Serializable
+import javax.persistence.Column
+import javax.persistence.Id
+
+/**
+ * 业务空间类型
+ */
+@Schema(description = "业务空间类型")
+class DictSpaceProject: SBaseEntity(),Serializable {
+
+    /** 编码 */
+    @Schema(description = "编码")
+    @Id
+    @Column(name = "id")
+    @JSONField(name = "code")
+    var id: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 父类指针 */
+    @Schema(description = "父类指针")
+    @Id
+    @Column(name = "parent_id")
+    var parentId: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Id
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 标记 */
+    @Schema(description = "标记")
+    @Column(name = "sign")
+    var sign: Int? = null
+
+    /** 数量 */
+    @Schema(description = "数量")
+    var count: Int? = 0
+
+}

+ 4 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointPosition.kt

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
+import com.google.gson.annotations.SerializedName
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
@@ -40,16 +41,19 @@ class PointPosition : Serializable{
     /** 坐标x */
     @Schema(description = "坐标x",required = true)
     @JSONField(name = "X")
+    @SerializedName("X")
     var x: Double? = null
 
     /** 坐标y */
     @Schema(description = "坐标y",required = true)
     @JSONField(name = "Y")
+    @SerializedName("Y")
     var y: Double? = null
 
     /** 坐标z */
     @Schema(description = "坐标z",required = true)
     @JSONField(name = "Z")
+    @SerializedName("Z")
     var z: Double? = null
 
 } // Class PointPosition

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

@@ -43,60 +43,44 @@ class MVirtualWall : SBaseEntity(){
     /** 名称 */
     @Schema(description = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
-    @JsonProperty("Name")
     var name: String? = null
 
     /** 墙路径 */
     @Schema(description = "墙路径")
     @Column(name = "location")
-    @JSONField(name = "Location")
-    @JsonProperty("Location")
     var location : MLocation? = null
 
     /** 模型所属楼层的id, 是uuid */
     @Schema(description = "模型所属楼层的id, 是uuid")
     @Column(name = "model_floor_id")
-    @JsonProperty("ModelFloorId")
-    @JSONField(name = "ModelFloorId")
     var modelFloorId: String? = null
 
     /** 墙轮廓 */
     @Schema(description = "墙轮廓")
     @Column(name = "outline")
-    @JSONField(name = "OutLine")
-    @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 模型id */
     @Schema(description = "模型id")
     @Column(name = "id", updatable = false)
     @Id
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 模型id(外键) */
     @Schema(description = "模型id(外键)")
     @Column(name = "model_id")
-    @JSONField(name = "ModelId")
     var modelId: String? = null
 
-    @JSONField(name = "ElementType")
     @Schema(description = "类型")
     @Column(name = "type")
-    @JsonProperty("ElementType")
     var elementType : String? = null
 
     @Schema(description = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
     @Column(name = "revit_id")
-    @JSONField(name = "RevitId")
-    @JsonProperty("RevitId")
     var revitId : String? = null
 
     /** 对应Revit模型id */
     @Schema(description = "对应Revit模型id")
     @Column(name = "source_id")
-    @JSONField(name = "SourceId")
-    @JsonProperty("SourceId")
     var sourceId: String? = null
 }

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

@@ -162,4 +162,4 @@ open class RelationType : RBaseInfo() {
     @Column(name = "mep_system_type")
     var mepSystemType: ArrayList<String>? = null
 
-} // Class RelationType
+}

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

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.models.entities.graphtype
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.google.gson.annotations.SerializedName
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -47,167 +46,138 @@ open class RelationTypeProject : RBaseInfo() {
     @Schema(description = "id")
     @Column(name = "id")
     @Id
-    @JSONField(name = "Id")
-    @SerializedName("Id")
     var id: String? = null
 
     /** 关系类型名称 */
     @Schema(description = "关系类型名称")
     @Column(name = "name")
-    @JSONField(name = "RelationTypeName")
-    @SerializedName("RelationTypeName")
     var relationTypeName: String? = null
 
     /** 关系类型编码 */
     @Schema(description = "关系类型编码")
     @Id
     @Column(name = "code")
-    @JSONField(name = "RelationTypeCode")
     var relationTypeCode: String? = null
 
     /** 图类型编码 */
     @Schema(description = "图类型编码")
     @Id
     @Column(name = "graphic_id")
-    @JSONField(name = "GraphicId")
     var graphicId: String? = null
 
     /** 说明 */
     @Schema(description = "说明")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: String? = null
 
     /** 连接对象 */
     @Schema(description = "连接对象")
     @Column(name = "conne_object")
-    @JSONField(name = "ConneObject")
     var conneObject: String? = null
 
     /** 是否需要配置源末端 */
     @Schema(description = "是否需要配置源末端")
     @Column(name = "is_source")
-    @JSONField(name = "IsSource")
     var isSource: Boolean? = null
 
     /** 是否自动计算类型 */
     @Schema(description = "是否自动计算类型")
     @Column(name = "is_automatic")
-    @JSONField(name = "IsAutomatic")
     var isAutomatic: Boolean? = null
 
     /** 手动计算类型 1 禁用  2提示引导 3手动维护 */
     @Schema(description = "手动计算类型 1 禁用  2提示引导 3手动维护")
     @Column(name = "manual")
-    @JSONField(name = "Manual")
     var manual: Int? = null
 
     /** 提示信息 */
     @Schema(description = "提示信息")
     @Column(name = "prompting")
-    @JSONField(name = "Prompting")
     var prompting: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Id
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 最后一次自动计算时间 */
     @Schema(description = "最后一次自动计算时间")
     @Column(name = "computing_time")
-    @JSONField(name = "ComputingTime")
     var computingTime: String? = null
 
     /** 计算状态(如果处于计算中状态,则不再次调用) */
     @Schema(description = "计算状态(如果处于计算中状态,则不再次调用)")
     @Column(name = "computational_state")
-    @JSONField(name = "ComputationalState")
     var computationalState: Int? = null
 
     /** 数量 */
     @Schema(description = "数量")
-    @JSONField(name = "Count")
     var count: Long? = null
 
     /** 关系表名 */
     @Schema(description = "关系表名")
     @Column(name = "table_name")
-    @JSONField(name = "TableName")
     var tableName: String? = null
 
     /** 关系是否双向 */
     @Schema(description = "关系是否双向")
     @Column(name = "is_thorough")
-    @JSONField(name = "IsThorough")
     var isThorough: Boolean? = null
 
     /** 关系类型,数据中心用。 */
     @Schema(description = "关系类型,数据中心用。")
     @Column(name = "relation_type")
-    @JSONField(name = "RelationType")
     var relationType: String? = null
 
     /** 业务空间类型 */
     @Schema(description = "业务空间类型")
     @Column(name = "zone_type")
-    @JSONField(name = "ZoneType")
     var zoneType: String? = null
 
     /** 手动计算查询函数 */
     @Schema(description = "手动计算查询函数")
     @Column(name = "manual_query")
-    @JSONField(name = "ManualQuery")
     var manualQuery: String? = null
 
     /** 手动计算主对象类型 */
     @Schema(description = "手动计算主对象类型")
     @Column(name = "main_type")
-    @JSONField(name = "MainType")
     var mainType: String? = null
 
     /** 手动计算从对象类型 */
     @Schema(description = "手动计算从对象类型")
     @Column(name = "from_type")
-    @JSONField(name = "FromType")
     var fromType: String? = null
 
     /** 手动计算添加关系 */
     @Schema(description = "手动计算添加关系")
     @Column(name = "add_rel")
-    @JSONField(name = "AddRel")
     var addRel: String? = null
 
     /** 手动计算删除关系 */
     @Schema(description = "手动计算删除关系")
     @Column(name = "del_rel")
-    @JSONField(name = "DelRel")
     var delRel: String? = null
 
     /** 手动计算关系类型 */
     @Schema(description = "手动计算关系类型")
     @Column(name = "rel_manual_type")
-    @JSONField(name = "RelManualType")
     var relManualType: String? = null
 
     /** 主对象类型 */
     @Schema(description = "主对象类型")
     @Column(name = "main_object")
-    @JSONField(name = "MainObject")
     var mainObject: String? = null
 
     /** 从对象类型 */
     @Schema(description = "从对象类型")
     @Column(name = "from_object")
-    @JSONField(name = "FromObject")
     var fromObject: String? = null
 
     /** 机电系统类型 */
     @Schema(description = "机电系统类型")
     @Column(name = "mep_system_type")
-    @JSONField(name = "MepSystemType")
     var mepSystemType: ArrayList<String>? = null
 
-} // Class ScanTask
+}

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

@@ -0,0 +1,94 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.graphtype.rel
+
+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
+
+/**
+ * 公共设备类
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/10 19:49
+ */
+open class EquipmentBase : Serializable , 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
+
+}

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

@@ -24,7 +24,6 @@
  * *********************************************************************************************************************
  */
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -59,61 +58,51 @@ open class RelBuilding : BaseInfo() {
     /** 建筑本地名称 */
     @Schema(description = "建筑本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectID")
     var projectId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 建筑信息 */
     @Schema(description = "建筑信息")
     @Column(name = "building_info")
-    @JSONField(name = "BuildingInfo")
     var buildingInfo: HashMap<String,Any?>? = null
 
     /** 工作历 */
     @Schema(description = "工作历")
     @Column(name = "schedule")
-    @JSONField(name = "Schedule")
     var schedule: HashMap<String,Any?>? = null
 
     /** 人员信息 */
     @Schema(description = "人员信息")
     @Column(name = "people_info")
-    @JSONField(name = "PeopleInfo")
     var peopleInfo: HashMap<String,Any?>? = null
 
     /** 能耗信息 */
     @Schema(description = "能耗信息")
     @Column(name = "consumption_info")
-    @JSONField(name = "ConsumptionInfo")
     var consumptionInfo: HashMap<String,Any?>? = null
 
     /** 自定义 */
     @Schema(description = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String,Any?>? = null
 
     /** 建筑文档 */
     @Schema(description = "建筑文档")
     @Column(name = "building_doc")
-    @JSONField(name = "BuildingDoc")
     var buildingDoc: HashMap<String,Any?>? = null
 
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Building"
 
 } // Class RelBuilding

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

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import RelBuilding
-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
@@ -73,31 +72,26 @@ open class RelEquipmentBuilding : BaseInfo() {
     /** 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")
+    @Column(name = "class_code")
     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 */
@@ -109,22 +103,19 @@ open class RelEquipmentBuilding : BaseInfo() {
     /** 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
 
     /** 级联-设备服务的建筑 */
     @Schema(description = "级联-设备服务的建筑")
     @SCascade(table="relationship.r_eq2bd", idColumn="id1", childIdColumn="id2", filter = "type = 'eq2bd_for'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelBuilding>? = null
 
-} // Class RelEquipmentBuilding
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,62 +46,52 @@ open class RelEquipmentFloor : BaseInfo() {
     @Schema(description = "设备id",required = true)
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
 //    @JsonProperty("EquipID")
     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")
+    @Column(name = "classCode")
     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 */
@@ -114,22 +103,19 @@ open class RelEquipmentFloor : BaseInfo() {
     /** 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
 
     /** 级联-设备服务的竖井 */
     @Schema(description = "级联-设备服务的竖井")
     @SCascade(table="r_eq_for_fl", idColumn="equip_id", childIdColumn="floor_id")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelFloor>? = null
 
-} // Class RelEquipmentFloor
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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.server.datacenter.models.entities.objects.Shaft
 import com.persagy.service.models.annotations.SCascade
@@ -44,7 +43,6 @@ import javax.persistence.Table
 @Table(name = "equipment")
 open class RelEquipmentShaft : BaseInfo() {
 
-
     /** 设备id */
     @Schema(description = "设备id",required = true)
     @Id
@@ -89,13 +87,11 @@ open class RelEquipmentShaft : BaseInfo() {
     /** 设备所在建筑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 */
@@ -107,19 +103,16 @@ open class RelEquipmentShaft : BaseInfo() {
     /** 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
 
     /** 级联-设备服务的竖井 */
     @Schema(description = "级联-设备服务的竖井")
     @SCascade(table="r_eq_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<Shaft>? = null
 
-} // Class RelEquipmentShaft
+}

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,168 +46,61 @@ open class RelGeneralSystem : BaseInfo() {
     @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
     @Schema(description = "系统名称")
     @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
 
     /** 系统分类 */
     @Schema(description = "系统分类",required = true)
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
     @Schema(description = "项目id",required = true)
     @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
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
-    /** 设定参数 */
-    @Schema(description = "设定参数")
-    @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
-    var settingParam: HashMap<String,Any?>? = null
-
-    /** 技术参数 */
-    @Schema(description = "技术参数")
-    @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
-    var techParam: HashMap<String,Any?>? = null
-
-    /** 运行参数 */
-    @Schema(description = "运行参数")
-    @Column(name = "run_param")
-    @JSONField(name = "RunParam")
-    var runParam: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
-    var customParam: HashMap<String, Any?>? = null
-
-    /** 运行状态 */
-    @Schema(description = "运行状态")
-    @Column(name = "running_state")
-    @JSONField(name = "RunningState")
-    var runningState: HashMap<String, Any?>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
-    /** 专业名称 */
-    @Schema(description = "专业名称")
-    @Column(name = "major_name",insertable = false,updatable = false)
-    @JSONField(name = "MajorName")
-    var majorName: String? = null
-
-    /** 设备数量 */
-    @Schema(description = "设备数量")
-    @Column(name = "count",insertable = false,updatable = false)
-    @JSONField(name = "Count")
-    var count: Long? = 0
-
-    /** 设备数量 */
-    @Schema(description = "设备数量")
-    @Column(name = "category_name",insertable = false,updatable = false)
-    @JSONField(name = "CategoryName")
-    var categoryName: String? = null
-
-    /** 反馈参数 */
-    @Schema(description = "反馈参数")
-    @Column(name = "feedback_param")
-    @JSONField(name = "FeedbackParam")
-    var feedbackParam: HashMap<String,Any?>? = null
-
-//    /** 级联-系统分类名 */
-//    @Schema(description = "级联-系统分类名")
-//    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
-//    @JSONField(name = "CategoryNames")
-//    var categoryNames: GeneralSystemCategory? = null
-//
-//    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @Schema(description = "级联-设备或部件")
-//    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
-//    @JSONField(name = "Equipment")
-//    var equipmentList: ArrayList<Equipment>? = null
-//
-//    /** 级联-竖井*/
-//    @Schema(description = "级联-竖井")
-//    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
-//    @JSONField(name = "Shaft")
-//    var shaftList: ArrayList<Shaft>? = null
-//
-//    /** 级联-业务空间*/
-//    @Schema(description = "级联-业务空间")
-//    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
-//    @JSONField(name = "ZoneSpaceBaseTable")
-//    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
-//
-//    /** 级联-楼层*/
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorList: ArrayList<Floor>? = null
-//
-//    /** 级联-建筑*/
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 建筑楼层 */
-//    @Schema(description = "建筑楼层")
-//    @JSONField(name = "BuildingFloorInfoList")
-//    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
-
     /** 级联-系统服务的业务空间 */
     @Schema(description = "级联-系统服务的业务空间")
     @SCascade(table="relationship.r_sy2sp", idColumn="sy_id", childIdColumn="sp_id",filter = "type = 'sy2sp_for'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelGeneralSystem
+}

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

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import RelBuilding
-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
@@ -48,171 +47,109 @@ open class RelGeneralSystemBuilding : BaseInfo() {
     @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
     @Schema(description = "系统名称")
     @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
 
     /** 系统分类 */
     @Schema(description = "系统分类",required = true)
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
     @Schema(description = "项目id",required = true)
     @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
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
     @Schema(description = "设定参数")
     @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
     @Schema(description = "技术参数")
     @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
     @Schema(description = "运行参数")
     @Column(name = "run_param")
-    @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
     @Schema(description = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
     @Schema(description = "运行状态")
     @Column(name = "running_state")
-    @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
     @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
-    @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
-    @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
     @Schema(description = "反馈参数")
     @Column(name = "feedback_param")
-    @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
-//    /** 级联-系统分类名 */
-//    @Schema(description = "级联-系统分类名")
-//    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
-//    @JSONField(name = "CategoryNames")
-//    var categoryNames: GeneralSystemCategory? = null
-//
-//    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @Schema(description = "级联-设备或部件")
-//    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
-//    @JSONField(name = "Equipment")
-//    var equipmentList: ArrayList<Equipment>? = null
-//
-//    /** 级联-竖井*/
-//    @Schema(description = "级联-竖井")
-//    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
-//    @JSONField(name = "Shaft")
-//    var shaftList: ArrayList<Shaft>? = null
-//
-//    /** 级联-业务空间*/
-//    @Schema(description = "级联-业务空间")
-//    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
-//    @JSONField(name = "ZoneSpaceBaseTable")
-//    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
-//
-//    /** 级联-楼层*/
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorList: ArrayList<Floor>? = null
-//
-//    /** 级联-建筑*/
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 建筑楼层 */
-//    @Schema(description = "建筑楼层")
-//    @JSONField(name = "BuildingFloorInfoList")
-//    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
-
     /** 级联-系统服务于建筑 */
     @Schema(description = "级联-系统服务于建筑")
     @SCascade(table="r_sy_for_bd", idColumn="sys_id", childIdColumn="buildingId")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelBuilding>? = null
 
-} // Class RelGeneralSystemBuilding
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,171 +46,109 @@ open class RelGeneralSystemFloor : BaseInfo() {
     @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
     @Schema(description = "系统名称")
     @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
 
     /** 系统分类 */
     @Schema(description = "系统分类",required = true)
-    @Column(name = "category")
-    @JSONField(name = "Category")
+    @Column(name = "classCode")
     var category: String? = null
 
     /** 项目id */
     @Schema(description = "项目id",required = true)
     @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
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
     @Schema(description = "设定参数")
     @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
     @Schema(description = "技术参数")
     @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
     @Schema(description = "运行参数")
     @Column(name = "run_param")
-    @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
     @Schema(description = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
     @Schema(description = "运行状态")
     @Column(name = "running_state")
-    @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
     @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
-    @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
-    @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
     @Schema(description = "反馈参数")
     @Column(name = "feedback_param")
-    @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
-//    /** 级联-系统分类名 */
-//    @Schema(description = "级联-系统分类名")
-//    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
-//    @JSONField(name = "CategoryNames")
-//    var categoryNames: GeneralSystemCategory? = null
-//
-//    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @Schema(description = "级联-设备或部件")
-//    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
-//    @JSONField(name = "Equipment")
-//    var equipmentList: ArrayList<Equipment>? = null
-//
-//    /** 级联-竖井*/
-//    @Schema(description = "级联-竖井")
-//    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
-//    @JSONField(name = "Shaft")
-//    var shaftList: ArrayList<Shaft>? = null
-//
-//    /** 级联-业务空间*/
-//    @Schema(description = "级联-业务空间")
-//    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
-//    @JSONField(name = "ZoneSpaceBaseTable")
-//    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
-//
-//    /** 级联-楼层*/
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorList: ArrayList<Floor>? = null
-//
-//    /** 级联-建筑*/
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 建筑楼层 */
-//    @Schema(description = "建筑楼层")
-//    @JSONField(name = "BuildingFloorInfoList")
-//    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
-
     /** 级联-系统服务于竖井 */
     @Schema(description = "级联-系统服务于竖井")
     @SCascade(table="r_sy_for_fl", idColumn="sys_id", childIdColumn="floor_id")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelFloor>? = null
 
-} // Class RelGeneralSystemFloor
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,171 +46,79 @@ open class RelGeneralSystemShaft : BaseInfo() {
     @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
     @Schema(description = "系统名称")
     @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
 
     /** 系统分类 */
     @Schema(description = "系统分类",required = true)
-    @Column(name = "category")
-    @JSONField(name = "Category")
+    @Column(name = "classCode")
     var category: String? = null
 
     /** 项目id */
     @Schema(description = "项目id",required = true)
     @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
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
-    /** 设定参数 */
-    @Schema(description = "设定参数")
-    @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
-    var settingParam: HashMap<String,Any?>? = null
-
-    /** 技术参数 */
-    @Schema(description = "技术参数")
-    @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
-    var techParam: HashMap<String,Any?>? = null
-
-    /** 运行参数 */
-    @Schema(description = "运行参数")
-    @Column(name = "run_param")
-    @JSONField(name = "RunParam")
-    var runParam: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
-    var customParam: HashMap<String, Any?>? = null
-
-    /** 运行状态 */
-    @Schema(description = "运行状态")
-    @Column(name = "running_state")
-    @JSONField(name = "RunningState")
-    var runningState: HashMap<String, Any?>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
     @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
-    @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
-    @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
     @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
-//    /** 反馈参数 */
-//    @Schema(description = "反馈参数")
-//    @Column(name = "feedback_param")
-//    @JSONField(name = "FeedbackParam")
-//    var feedbackParam: HashMap<String,Any?>? = null
-
-//    /** 级联-系统分类名 */
-//    @Schema(description = "级联-系统分类名")
-//    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
-//    @JSONField(name = "CategoryNames")
-//    var categoryNames: GeneralSystemCategory? = null
-//
-//    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @Schema(description = "级联-设备或部件")
-//    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
-//    @JSONField(name = "Equipment")
-//    var equipmentList: ArrayList<Equipment>? = null
-//
-//    /** 级联-竖井*/
-//    @Schema(description = "级联-竖井")
-//    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
-//    @JSONField(name = "Shaft")
-//    var shaftList: ArrayList<Shaft>? = null
-//
-//    /** 级联-业务空间*/
-//    @Schema(description = "级联-业务空间")
-//    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
-//    @JSONField(name = "ZoneSpaceBaseTable")
-//    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
-//
-//    /** 级联-楼层*/
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorList: ArrayList<Floor>? = null
-//
-//    /** 级联-建筑*/
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 建筑楼层 */
-//    @Schema(description = "建筑楼层")
-//    @JSONField(name = "BuildingFloorInfoList")
-//    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
-
     /** 级联-系统服务于竖井 */
     @Schema(description = "级联-系统服务于竖井")
     @SCascade(table="r_sy_for_sh", idColumn="sys_id", childIdColumn="shaft_id")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelShaft>? = null
 
-} // Class RelGeneralSystemShaft
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,83 +46,64 @@ open class RelProperty : BaseInfo() {
     @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 = "family")
-    @JSONField(name = "Family")
     var family: 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 = "关联的设备或部件")
     @Column(name = "equip_id")
-    @JSONField(name = "EquipmentId")
     var equipId: String? = null
 
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_pe2sp", idColumn="eq_id", childIdColumn="sp_id",filter = "type = 'pe2sp'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-//    /** 级联-资产所在的竖井 */
-//    @Schema(description = "级联-资产所在的竖井")
-//    @SCascade(table="r_pe_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
-//    @JSONField(name = "Shaft")
-//    var shaft: ArrayList<Shaft>? = null
-
-
-} // Class RelProperty
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 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
@@ -47,82 +46,64 @@ open class RelPropertyShaft : BaseInfo() {
     @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 = "family")
-    @JSONField(name = "Family")
     var family: 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 = "关联的设备或部件")
     @Column(name = "equip_id")
-    @JSONField(name = "EquipmentId")
     var equipId: String? = null
 
-//    /** 级联-资产所在的空间的 */
-//    @Schema(description = "级联-设备所在的空间的")
-//    @SCascade(table="r_pe_in_sp_base", idColumn="equip_id", childIdColumn="space_id")
-//    @JSONField(name = "ObjectInfo")
-//    var objectInfo: ArrayList<RelZoneSpace>? = null
-
     /** 级联-资产所在的竖井 */
     @Schema(description = "级联-资产所在的竖井")
     @SCascade(table="r_pe_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelShaft>? = null
 
-} // Class RelPropertyShaft
+}
 
 
 

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

@@ -106,7 +106,7 @@ open class RelEquipmentVv2Sp : BaseInfo() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2sp_SensorRelationship_ss2sp'")
+    @SCascade(table="relationship.r_eq2sp", idColumn="eq_id", childIdColumn="sp_id",self = false,filter = "type = 'eq2sp_SensorRelationship_ss2sp'")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 }

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

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

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

@@ -26,13 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
+import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
-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 javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -42,94 +39,14 @@ import javax.persistence.Table
  */
 @Schema(description = "设备信息实体类")
 @Table(name = "equipment")
-open class RelEquipmentAcAirNetworkOne : 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 RelEquipmentAcAirNetworkOne : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentAcAirNetworkOne
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
@@ -93,34 +92,24 @@ open class RelEquipmentAcAirNetworkThree : BaseInfo() {
     /** 设备所在楼层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
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ACAirNetwork_3'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentAcAirNetworkThree
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+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
@@ -48,85 +47,66 @@ open class RelEquipmentChillWaterLoopOne : BaseInfo() {
     @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")
+    @Column(name = "classCode")
     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
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentChillWaterLoopOne
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
@@ -48,88 +47,69 @@ open class RelEquipmentChillWaterLoopTwo : BaseInfo() {
     @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")
+    @Column(name = "classCode")
     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
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_ChillWaterLoop_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class Equipment
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.hvac
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelEquipmentFloor
 import com.persagy.service.models.annotations.SCascade
@@ -48,88 +47,59 @@ open class RelEquipmentCondWaterNetwork : BaseInfo() {
     @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")
+    @Column(name = "classCode")
     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
-
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_CondWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentCondWaterNetwork
+}
 
 
 

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

@@ -146,11 +146,21 @@ open class Floor : BaseInfo() {
 
     /** 轮廓线 */
     @Schema(description = "轮廓线")
-//    @Column(name = "outline")
+////    @Column(name = "outline")
     var outline: ArrayList<PointPosition>? = null
 
+    /** 级联-部件   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id ,注意 idColumn childIdColumn 非数据表中字段名,是实体类属性*/
+    @Schema(description = "级联-轮廓线")
+    @SCascade(table="floor_outline", idColumn="id", childIdColumn="id",self = false)
+    var floorOutline: FloorOutline? = null
+
     /** 数量 */
     @Schema(description = "数量")
     var count: Int = 0
 
+    /** 自定义信息点 */
+    @Schema(description = "自定义信息点")
+    @Column(name = "properties")
+    var properties: HashMap<String,Any?>? = null
+
 }

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

@@ -53,6 +53,11 @@ class FloorOutline : Serializable {
     @Column(name = "outline")
     var outline: ArrayList<PointPosition>? = null
 
+    @Schema(description = "楼层轮廓线 id")
+    @Column(name = "outline_id")
+    var outlineId: String? = null
+
+
     /** 最后更新日期 */
     @Schema(description = "最后更新日期", example = "2009-04-21 13:16:00")
     @Column(name = "last_update", updatable = false, insertable = false)
@@ -63,6 +68,7 @@ class FloorOutline : Serializable {
     @Column(name = "create_time", updatable = false, insertable = false)
     var createTime: Date? = null
 
+
     /**
      * 构造函数
      *

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

@@ -282,8 +282,13 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     var floorlList: ArrayList<Floor>? = null
 
     /** 对象类型 */
-    @Schema(description = "对象类型")
-    @Column(name = "class_code")
-    var objectType: String? = null
+//    @Schema(description = "对象类型")
+//    @Column(name = "class_code")
+//    var objectType: String? = null
+
+    /** 级联-部件   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id ,注意 idColumn childIdColumn 非数据表中字段名,是实体类属性*/
+    @Schema(description = "级联-轮廓线")
+    @SCascade(table="space_outline", idColumn="id", childIdColumn="id",self = false)
+    var spaceOutline: SpaceOutline? = null
 
-} // Class ZoneAirConditioning
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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.Table
@@ -42,12 +41,10 @@ class REqForBdList : RBaseInfo() {
 
     /** 设备id */
     @Schema(description = "设备id")
-    @JSONField(name = "EquipId")
     var equipId: String? = null
 
     /** 建筑id列表 */
     @Schema(description = "建筑id列表")
-    @JSONField(name = "BuildingIdList")
     var buildingIdList: ArrayList<String>? = null
 
 } // Class REqForBdList

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class REqForShList : RBaseInfo() {
 
     /** 设备id */
     @Schema(description = "设备id")
-    @JSONField(name = "EquipId")
     var equipId: String? = null
 
     /** 竖井id列表 */
     @Schema(description = "竖井id列表")
-    @JSONField(name = "ShaftIdList")
     var shaftIdList: ArrayList<String>? = null
 
 } // Class REqForShList

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

@@ -47,37 +47,27 @@ open class REqForSpBase : RBaseInfo() {
     @Schema(description = "设备id")
     @Id
     @Column(name = "equip_id")
-    @JSONField(name = "EquipId")
-    @SerializedName("EquipId")
     var equipId: String? = null
 
     /** 业务空间id */
     @Schema(description = "业务空间id")
     @Id
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
-    @SerializedName("SpaceId")
     var spaceId: String? = null
 
     /** 业务空间类型 */
     @Schema(description = "业务空间类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
-    @SerializedName("ObjectType")
     open var objectType: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} //Class REqForSpBase
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class RFlInSyList : RBaseInfo() {
 
     /** 楼层id */
     @Schema(description = "楼层id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 系统id列表 */
     @Schema(description = "系统id列表")
-    @JSONField(name = "sysIdList")
     var sysIdList: ArrayList<String> ? = null
 
-} // Class RFlInSyList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ class RFloorThroughFloorOtherList : SBaseEntity() {
 
     /** 楼层id */
     @Schema(description = "楼层id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 其他楼层id列表 */
     @Schema(description = "其他楼层id列表")
-    @JSONField(name = "FloorOtherIdList")
     var floorOtherIdList: ArrayList<String>? = null
 
 } // class RFloorThroughFloorOtherList

+ 10 - 62
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RPeInSh.kt

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
+import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import java.util.*
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -39,80 +38,29 @@ import javax.persistence.Table
  * @author 张维新 <zhangweixin@sagacloud.cn>
  */
 @Schema(description = "资产所在竖井")
-@Table(name = "relationship.r_pe_in_sh")
-class RPeInSh : Serializable {
+@Table(name = "r_pe_in_sh")
+class RPeInSh : RBaseInfo(){
 
     /** 资产id */
-    @Schema(description = "资产 id")
+    @Schema(description = "资产id")
     @Id
-    @Column(name = "eq_id")
-    var id1: String? = null
+    @Column(name = "equip_id")
+    var equipId: String? = null
 
-    /** 竖井 id */
-    @Schema(description = "竖井 id")
+    /** 空间id */
+    @Schema(description = "空间id")
     @Id
-    @Column(name = "sh_id")
-    var id2: String? = null
-
-    /** 边类型 */
-    @Schema(description = "边类型")
-    @Id
-    @Column(name = "type")
-    var type: String? = null
+    @Column(name = "shaft_id")
+    var shaftId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
-    @Id
     @Column(name = "project_id")
     var projectId: String? = null
 
-    /** 关系编码 */
-    @Schema(description = "关系编码")
-    @Column(name = "id")
-    var id: String? = null
-
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
     var sign: Int? = null
 
-    /** 图类型编码 */
-    @Schema(description = "图类型编码")
-    @Id
-    @Column(name = "graphic_code")
-    var graphicCode: String? = null
-
-    /** 最后更新日期 */
-    @Schema(description = "最后更新日期", example = "2009-04-21 13:16:00")
-    @Column(name = "last_update", updatable = false, insertable = false)
-    var lastUpdate: Date? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间", example = "2017-10-15 08:30:00")
-    @Column(name = "create_time", updatable = false, insertable = false)
-    var createTime: Date? = null
-
-    /**
-     * 构造函数
-     *
-     * @param id1           资产 id
-     * @param id2           竖井 id
-     * @param type          边类型
-     * @param projectId     项目 id
-     * @param graphicCode   图类型编码
-     */
-    constructor(id1: String?, id2: String?, type: String?, projectId: String?, graphicCode: String?) : super() {
-        this.id1 = id1
-        this.id2 = id2
-        this.type = type
-        this.projectId = projectId
-        this.graphicCode = graphicCode
-    }
-
-    /**
-     * 无参构造
-     */
-    constructor() : super()
-
-
 }

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

@@ -47,39 +47,29 @@ class RSh2Bd : RBaseInfo(){
     @Schema(description = "竖井Id")
     @Id
     @Column(name = "sh_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 建筑Id */
     @Schema(description = "建筑Id")
     @Id
     @Column(name = "bd_id")
-    @JSONField(name = "Id2")
-    @SerializedName("Id2")
     var id2: String? = null
 
     /** 项目Id */
     @Schema(description = "项目Id")
     @Id
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
     /** 类型 */
     @Schema(description = "类型 设备服务于建筑eq2bd_for" )
     @Id
     @Column(name = "type")
-    @JSONField(name = "Type")
-    @SerializedName("Type")
     var type: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
 } // Class REq2Bd

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class RShForEqList : RBaseInfo() {
 
     /** 竖井id */
     @Schema(description = "竖井id")
-    @JSONField(name = "ShaftId")
     var shaftId: String? = null
 
     /** 设备id列表 */
     @Schema(description = "设备id列表")
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
-} // Class RShForEqList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class RShInEqList : RBaseInfo() {
 
     /** 竖井id */
     @Schema(description = "竖井id")
-    @JSONField(name = "ShaftId")
     var shaftId: String? = null
 
     /** 设备id列表 */
     @Schema(description = "设备id列表")
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
-} // Class RShInEqList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ class RShaftThroughShaftOtherList : SBaseEntity() {
 
     /** 竖井id */
     @Schema(description = "竖井id")
-    @JSONField(name = "ShaftId")
     var shaftId: String? = null
 
     /** 其他楼层id列表 */
     @Schema(description = "其他楼层id列表")
-    @JSONField(name = "ShaftOtherIdList")
     var shaftOtherIdList: ArrayList<String>? = null
 
-} // class RFloorThroughFloorOtherList
+}

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

@@ -47,36 +47,27 @@ open class RSiInSpBase : RBaseInfo() {
     @Schema(description = "元空间id")
     @Id
     @Column(name = "ispace_id")
-    @SerializedName("IspaceId")
-    @JSONField(name = "IspaceId")
     var ispaceId: String? = null
 
     /** 业务空间id */
     @Schema(description = "业务空间id")
     @Id
     @Column(name = "space_id")
-    @SerializedName("SpaceId")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 业务空间类型 */
     @Schema(description = "业务空间类型")
     @Column(name = "object_type")
-    @SerializedName("ObjectType")
-    @JSONField(name = "ObjectType")
     open var objectType: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @SerializedName("ProjectId")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = null
 
-} // Class RSiInSpBase
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ open class RSpForEqBaseList : SBaseEntity() {
 
     /** 业务空间id */
     @Schema(description = "业务空间id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 设备id列表 */
     @Schema(description = "设备id列表")
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
-} // Class RSpForEqBaseList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ open class RSpInEqBaseList : SBaseEntity() {
 
     /** 业务空间id */
     @Schema(description = "业务空间id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 设备id列表 */
     @Schema(description = "设备id列表")
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
-} // Class RSpInEqBaseList
+}

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

@@ -47,72 +47,52 @@ class RSpatialConnection : RBaseInfo() {
     @Schema(description = "空间id")
     @Column(name = "space_id_one")
     @Id
-    @JSONField(name = "SpaceIdOne")
-    @SerializedName("SpaceIdOne")
     var spaceIdOne: String? = null
 
     /** 邻接的空间id */
     @Schema(description = "邻接的空间id")
     @Column(name = "space_id_two")
     @Id
-    @JSONField(name = "SpaceIdTwo")
-    @SerializedName("SpaceIdTwo")
     var spaceIdTwo: String? = null
 
     /** 位置坐标 */
     @Schema(description = "位置坐标")
     @Column(name = "location_one")
-    @JSONField(name = "LocationOne")
-    @SerializedName("LocationOne")
     var locationOne: String? = null
 
     /** 邻接的元空间id */
     @Schema(description = "邻接的元空间id")
     @Column(name = "location_two")
-    @JSONField(name = "LocationTwo")
-    @SerializedName("LocationTwo")
     var locationTwo: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
     /** 图类型id */
     @Schema(description = "图类型id")
     @Column(name = "graph_type")
-    @JSONField(name = "GraphType")
-    @SerializedName("GraphType")
     var graphType: String? = null
 
     /** 边类型id */
     @Schema(description = "边类型id")
     @Column(name = "rel_type")
-    @JSONField(name = "RelType")
-    @SerializedName("RelType")
     var relType: String? = null
 
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "zone_type")
-    @JSONField(name = "ZoneType")
-    @SerializedName("ZoneType")
     var zoneType: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    @SerializedName("FloorId")
     var floorId: String? = null
 
-} // Class REqForFl
+}

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

@@ -47,39 +47,29 @@ class RSy2Bd : RBaseInfo(){
     @Schema(description = "系统Id")
     @Id
     @Column(name = "sy_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 建筑Id */
     @Schema(description = "建筑Id")
     @Id
     @Column(name = "bd_id")
-    @JSONField(name = "Id2")
-    @SerializedName("Id2")
     var id2: String? = null
 
     /** 项目Id */
     @Schema(description = "项目Id")
     @Id
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
     /** 类型 */
     @Schema(description = "类型 设备服务于建筑eq2bd_for" )
     @Id
     @Column(name = "type")
-    @JSONField(name = "Type")
-    @SerializedName("Type")
     var type: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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
@@ -46,26 +45,22 @@ class RSyForFl : RBaseInfo() {
     @Schema(description = "系统id")
     @Id
     @Column(name = "sys_id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Id
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = null
 
-} // Class RSyForFl
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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.Table
@@ -42,12 +41,10 @@ class RSyForFlList : RBaseInfo() {
 
     /** 系统id */
     @Schema(description = "系统id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 楼层id列表 */
     @Schema(description = "楼层id列表")
-    @JSONField(name = "FloorIdList")
     var floorIdList: ArrayList<String>? = null
 
-} // Class RSyForFlList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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.Table
@@ -42,12 +41,10 @@ class RSyForShList : RBaseInfo() {
 
     /** 系统id */
     @Schema(description = "系统id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 竖井id列表 */
     @Schema(description = "竖井id列表")
-    @JSONField(name = "ShaftIdList")
     var shaftIdList: ArrayList<String>? = null
 
-} // Class RSyForShList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,12 +39,10 @@ open class RSyForSpBaseList : SBaseEntity() {
 
     /** 系统id */
     @Schema(description = "系统id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 业务空间id列表 */
     @Schema(description = "业务空间id列表")
-    @JSONField(name = "SpaceIdList")
     var spaceIdList: ArrayList<String>? = null
 
-} // Class RSyForSpBaseList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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
@@ -46,26 +45,22 @@ class RSyInBd : RBaseInfo() {
     @Schema(description = "系统id")
     @Id
     @Column(name = "sys_id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Id
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = null
 
-} // Class RSyInBd
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class RSyInFlList : RBaseInfo() {
 
     /** 系统id */
     @Schema(description = "系统id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 楼层id列表 */
     @Schema(description = "楼层id列表")
-    @JSONField(name = "FloorIdList")
     var floorIdList: ArrayList<String>? = null
 
 } // Class RSyInFlList

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-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 @@ class RSyInShList : RBaseInfo() {
 
     /** 系统id */
     @Schema(description = "系统id")
-    @JSONField(name = "SysId")
     var sysId: String? = null
 
     /** 竖井id列表 */
     @Schema(description = "竖井id列表")
-    @JSONField(name = "ShaftIdList")
     var shaftIdList: ArrayList<String>? = null
 
-} // Class RSyInShList
+}

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

@@ -45,5 +45,4 @@ open class RSyInSpBaseList : SBaseEntity() {
     @Schema(description = "业务空间id列表")
     var spaceIdList: ArrayList<String>? = null
 
-
 }

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

@@ -26,8 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.google.gson.annotations.SerializedName
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -47,46 +45,34 @@ class RTn2Sp : RBaseInfo(){
     @Schema(description = "租户Id")
     @Id
     @Column(name = "tn_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 空间Id */
     @Schema(description = "空间Id")
     @Id
     @Column(name = "sp_id")
-    @JSONField(name = "Id2")
-    @SerializedName("Id2")
     var id2: String? = null
 
     /** 项目Id */
     @Schema(description = "项目Id")
     @Id
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
     /** 类型 */
     @Schema(description = "类型 " )
     @Id
     @Column(name = "type")
-    @JSONField(name = "Type")
-    @SerializedName("Type")
     var type: String? = null
 
     /** 空间类型 */
     @Schema(description = "空间类型 " )
     @Column(name = "zone_type")
-    @JSONField(name = "ZoneType")
-    @SerializedName("ZoneType")
     var zoneType: String? = null
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -40,16 +39,13 @@ open class RTnInSpBaseList : SBaseEntity() {
 
     /** 租户id */
     @Schema(description = "租户id")
-    @JSONField(name = "TenantId")
     var tenantId: String? = null
 
     /** 业务空间id列表 */
     @Schema(description = "业务空间id列表")
-    @JSONField(name = "SpaceIdList")
     var spaceIdList: ArrayList<String>? = null
 
     @Schema(description = "楼层id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
-} // Class RTnInSpBaseList
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -45,27 +44,23 @@ class RelationSpaceShaft : BaseInfo() {
     /** 关系id */
     @Schema(description = "关系id")
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** ShaftID */
     @Schema(description = "竖井id")
     @Id
     @Column(name = "shaft_id")
-    @JSONField(name = "ShaftId")
     var shaftId: String? = null
 
     /** SpaceID */
     @Schema(description = "元空间id")
     @Id
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
-} // Class RelationSpaceShaft
+}

+ 0 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/ModelScanTaskQuery.kt

@@ -245,8 +245,6 @@ class ModelScanTaskQuery : RBaseInfo() {
     @Column(name = "confirming_person_id")
     var confirmingPersonId: String? = null
 
-
-
     /** BIM模型中坐标 */
     @Schema(description = "BIM模型中坐标json")
     var locationJson: BIMLocation? = null

+ 1 - 6
data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/UpDataFloorAndBuildingRequests.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.requests
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
@@ -39,17 +38,13 @@ class UpDataFloorAndBuildingRequests : Serializable {
 
     /** 业务空间id */
     @Schema(description = "业务空间id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 建筑或楼层id */
     @Schema(description = "建筑或楼层id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 业务空间类型 */
     @Schema(description = "业务空间类型")
-    @JSONField(name = "Type")
     var type: String? = null
-
-} // Class UpDataFloorAndBuildingRequests
+}

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt

@@ -115,7 +115,7 @@ open class FloorController {
      * @param request     查询信息条件
      * @return 查询结果
      */
-    @Operation(summary = "查询楼层轮廓线信息", description = "")
+    @Operation(summary = "查询楼层轮廓线信息", description = "级联 轮廓线 floorOutline")
     @PostMapping(value = ["/outline/query"])
     fun queryOutline(@RequestBody request: SQueryRequest): SQueryResponse<FloorOutline> {
         return FloorService.floorOutlineService.pageQuery(request)

+ 11 - 11
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt

@@ -27,6 +27,8 @@
 package com.persagy.server.controllers.objects
 
 import com.persagy.database.SFilter
+import com.persagy.server.Opt
+import com.persagy.server.datacenter.models.entities.assistant.DictSpaceProject
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
@@ -95,9 +97,7 @@ open class ZoneSpaceController {
     @Operation(summary = "根据条件查询统计数量", description = "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
-        val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
-        return ZoneSpaceBaseService.count(request,withFilterList)
+        return ZoneSpaceBaseService.count(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
     } // Function count()
 
     /**
@@ -119,14 +119,14 @@ open class ZoneSpaceController {
         return ZoneSpaceBaseService.spBuildingFloor()
     }
 
-//    /**
-//     * 查询业务空间的所有类型
-//     */
-//    @Operation(summary = "查询业务空间的所有类型", description = "级联其它分区(zoneType)")
-//    @PostMapping(value = ["/type"])
-//    fun queryZoneTypeSpace(@RequestBody request: DCSQueryRequest): SQueryResponse<DictSpaceProject>{
-//        return ZoneSpaceBaseService.zoneTypequery(request)
-//    } // Fun
+    /**
+     * 查询业务空间的所有类型
+     */
+    @Operation(summary = "查询业务空间的所有类型", description = "")
+    @PostMapping(value = ["/type"])
+    fun queryZoneTypeSpace(@RequestBody request: DCSQueryRequest): SQueryResponse<DictSpaceProject>{
+        return ZoneSpaceBaseService.zoneTypequery(request)
+    } // Fun
 
 
 //    /**

+ 5 - 5
datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt

@@ -28,7 +28,7 @@ package com.persagy.server.controllers.rel
 
 import com.persagy.base.extensions.toJson
 import com.persagy.server.datacenter.models.entities.rel.RBdForEqList
-import com.persagy.server.datacenter.models.entities.rel.REq2Bd
+import com.persagy.server.datacenter.models.entities.rel.REqForBd
 import com.persagy.server.datacenter.models.entities.rel.REqForBdList
 import com.persagy.server.services.rel.REqForBdService
 import com.persagy.service.models.responses.SBaseResponse
@@ -63,7 +63,7 @@ class REqForBdController {
      */
     @Operation(summary = "创建设备服务于建筑关系", description = "必填项:EquipId(设备id)、BuildingId(建筑id)")
     @PostMapping(value = ["/link"])
-    fun create(@RequestBody req2Bd: REq2Bd): SCreateResponse<REq2Bd>{
+    fun create(@RequestBody req2Bd: REqForBd): SCreateResponse<REqForBd>{
         logger.debug("build = ${req2Bd.toJson()}")
         return REqForBdService.create(req2Bd)
     } // Function create()
@@ -76,7 +76,7 @@ class REqForBdController {
      */
     @Operation(summary = "根据对象删除设备服务于建筑的关系,只针对一个对象", description = "必填项:EquipId(设备id)、BuildingId(建筑id)")
     @PostMapping(value = ["/unlink"])
-    fun delete(@RequestBody req2Bd: REq2Bd): SBaseResponse {
+    fun delete(@RequestBody req2Bd: REqForBd): SBaseResponse {
         return REqForBdService.deletes(req2Bd)
     } // Function delete()
 
@@ -88,7 +88,7 @@ class REqForBdController {
      */
     @Operation(summary = "设备服务于建筑,设备一对多", description = "必填项:BuildingIdList(建筑id列表)、EquipId(设备id),测方法会覆盖以前的记录")
     @PostMapping(value = ["link-bd"])
-    fun createBd(@RequestBody rEqForBd: REqForBdList): SCreateResponse<REq2Bd>{
+    fun createBd(@RequestBody rEqForBd: REqForBdList): SCreateResponse<REqForBd>{
         logger.debug("build =${rEqForBd.toJson()}")
         return REqForBdService.createEq(rEqForBd)
     } // Function createBd()
@@ -101,7 +101,7 @@ class REqForBdController {
      */
     @Operation(summary = "服务于建筑的设备,建筑一对多",description = "必填项:EquipIdList(设备id列表)、BuildingId(建筑id),测方法会覆盖以前的记录")
     @PostMapping(value = ["link-sy"])
-    fun createSy(@RequestBody rEqForBd: RBdForEqList): SCreateResponse<REq2Bd>{
+    fun createSy(@RequestBody rEqForBd: RBdForEqList): SCreateResponse<REqForBd>{
         logger.debug("build =${rEqForBd.toJson()}")
         return REqForBdService.createsBd(rEqForBd)
     } // Function createSy()

+ 13 - 13
datacenter/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt

@@ -90,8 +90,8 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
 
         entityList.forEach {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
 
             try {
                 val jsonObject = JSONObject()
@@ -101,7 +101,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
                 if (it.keyValue("id").toString().startsWith("Sp")){
                     val entity = ZoneSpaceBaseService.select(SFilter.eq("id", it.keyValue("id").toString())).entity()
                     if (entity!=null){
-                        jsonObject.put("obj_type", entity.objectType)
+                        jsonObject.put("obj_type", entity.classCode)
                     }
                 }else{
                     jsonObject.put("obj_type", it.keyValue("objectType"))
@@ -109,7 +109,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
 
                 logger.debug("对象类型:${it.keyValue("objectType")}")
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenter", ObjectNotice(projectId!!, it.objectType!!, "create",IdUtils.uuidCreate(), hashSetOf(it.keyValue("id").toString())),false)
 
             } catch (e: Exception) {
@@ -125,9 +125,9 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
                 if (it.keyValue("id").toString().startsWith("Sp")){
                     val entity = ZoneSpaceBaseService.select(SFilter.eq("id", it.keyValue("id").toString())).entity()
                     if (entity!=null){
-                        dataCenterLogs.objectType = entity.objectType
+                        dataCenterLogs.objectType = entity.classCode
                         val hashMap = HashMap<String, Any?>()
-                        hashMap[entity.objectType!!] = it
+                        hashMap[entity.classCode!!] = it
                         dataCenterLogs.dataSource = hashMap
                     }
                 }else{
@@ -206,17 +206,17 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
             if (entity.keyValue("id").toString().startsWith("Sp")){
                 val entity = ZoneSpaceBaseService.select(SFilter.eq("id", entity.keyValue("id").toString())).entity()
                 if (entity!=null){
-                    dataCenterLogs.objectType = entity.objectType
+                    dataCenterLogs.objectType = entity.classCode
                 }
             }else{
-                dataCenterLogs.objectType = entity.keyValue("objectType").toString()
+                dataCenterLogs.objectType = entity.keyValue("classCode").toString()
             }
             dataCenterLogs.type = "update-before"
             dataCenterLogs.account = account
             dataCenterLogs.coming = comming
             dataCenterLogs.objectId = entity.keyValue("id").toString()
             val hashMap = HashMap<String, Any?>()
-            hashMap[entity.keyValue("objectType").toString()] = entity
+            hashMap[entity.keyValue("classCode").toString()] = entity
             dataCenterLogs.dataSource = hashMap
             logService.insert(dataCenterLogs)
         } catch (e: Exception) {
@@ -242,10 +242,10 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
             if (entityList[0].keyValue("id").toString().startsWith("Sp")){
                 val entity = ZoneSpaceBaseService.select(SFilter.eq("id", entityList[0].keyValue("id").toString())).entity()
                 if (entity!=null){
-                    jsonObject.put("obj_type", entity.objectType)
+                    jsonObject.put("obj_type", entity.classCode)
                 }
             }else{
-                jsonObject.put("obj_type", entityList[0].keyValue("objectType").toString())
+                jsonObject.put("obj_type", entityList[0].keyValue("classCode").toString())
             }
 
             val jsonArray = JSONArray()
@@ -255,10 +255,10 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
                 if (entity.keyValue("id").toString().startsWith("Sp")){
                     val entity = ZoneSpaceBaseService.select(SFilter.eq("id", entity.keyValue("id").toString())).entity()
                     if (entity!=null){
-                        type = entity.objectType!!
+                        type = entity.classCode!!
                     }
                 }else{
-                    type = entity.keyValue("objectType").toString()
+                    type = entity.keyValue("classCode").toString()
                 }
                 val jsonInfos = JSONObject()
                 jsonInfos.put("id", entity.keyValue("id"))

+ 97 - 102
datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -31,6 +31,8 @@ import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
+import com.persagy.server.datacenter.models.entities.assistant.DictSpaceProject
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
@@ -72,6 +74,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     /** 空间轮廓线 */
     val spaceOutlineService = SObjectService(SMybatisDao(SpaceOutline::class.java))
 
+    /** 空间轮廓线 */
+    val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
+
 
     /**
      * 查询业务空间
@@ -79,10 +84,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     fun querySpaces (request: DCSQueryRequest): SpaceSQueryResponse {
         return try {
 
-
             val projectId = SPageContext.getHeader("projectId")
             var spaceSQueryResponse = SpaceSQueryResponse()
-
+            spaceSQueryResponse.zoneType = request.zoneType
             val listId = ArrayList<String>()
             if(!request.buildingId.isNullOrEmpty()&&!request.floorId.isNullOrEmpty()&&request.floorId != "isnull"){
                 var rSpInFlList: ArrayList<RSpinFl>? = null
@@ -104,9 +108,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                     listSFilter.add(SFilter.eq("projectId",projectId))
                     listSFilter.add(SFilter.inList("id",listId))
                     if (!request.zoneType.isNullOrEmpty()){
-                        listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                        listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                     }else if (!request.zoneTypeList.isNullOrEmpty()){
-                        listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                        listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                     }
                   val  pageQuery = pageQuery(request, listSFilter)
                     spaceSQueryResponse.message = pageQuery.message
@@ -120,7 +124,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
 
             }else if(!request.buildingId.isNullOrEmpty()&&!request.floorId.isNullOrEmpty()&&request.floorId == "isnull"){
 
-               val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildId",request.buildingId!!)).exec()
+               val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildingId",request.buildingId!!)).exec()
                if (floorList.size>0){
                    val listFloorId = ArrayList<String>()
                    for (floor in floorList){
@@ -207,7 +211,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                            listSFilter.add(SFilter.eq("projectId",projectId))
                            listSFilter.add(SFilter.inList("id",listId))
                            if (!request.zoneTypeList.isNullOrEmpty()){
-                               listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                               listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                            }
                          val   pageQuery = pageQuery(request, listSFilter)
                            spaceSQueryResponse.message = pageQuery.message
@@ -239,9 +243,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                        listSFilter.add(SFilter.eq("projectId",projectId))
                        listSFilter.add(SFilter.inList("id",listId))
                        if (!request.zoneType.isNullOrEmpty()){
-                           listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                           listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                        }else  if (!request.zoneTypeList.isNullOrEmpty()){
-                           listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                           listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                        }
 
                      val  pageQuery = pageQuery(request, listSFilter)
@@ -274,9 +278,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                     listSFilter.add(SFilter.eq("projectId",projectId))
                     listSFilter.add(SFilter.inList("id",listId))
                     if (!request.zoneType.isNullOrEmpty()){
-                        listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                        listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                     }else if (!request.zoneTypeList.isNullOrEmpty()){
-                        listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                        listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                     }
                    val pageQuery = pageQuery(request, listSFilter)
                     spaceSQueryResponse.message = pageQuery.message
@@ -317,9 +321,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                                 listSFilter.add(SFilter.not(SFilter.inList("id", listId)))
                             }
                             if (!request.zoneType.isNullOrEmpty()){
-                                listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                                listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                             }else if (!request.zoneTypeList.isNullOrEmpty()){
-                                listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                                listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                             }
                            val pageQuery = pageQuery(request, listSFilter)
                     spaceSQueryResponse.message = pageQuery.message
@@ -334,9 +338,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                         var listSFilter = ArrayList<SFilter>()
                         listSFilter.add(SFilter.eq("projectId",projectId))
                     if (!request.zoneType.isNullOrEmpty()){
-                        listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                        listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                     }else if (!request.zoneTypeList.isNullOrEmpty()){
-                        listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                        listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                     }
                       val  pageQuery = pageQuery(request, listSFilter)
                     spaceSQueryResponse.message = pageQuery.message
@@ -351,9 +355,9 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 var listSFilter = ArrayList<SFilter>()
                 listSFilter.add(SFilter.eq("projectId",projectId!!))
                 if (!request.zoneType.isNullOrEmpty()){
-                    listSFilter.add(SFilter.eq("objectType",request.zoneType!!))
+                    listSFilter.add(SFilter.eq("classCode",request.zoneType!!))
                 }else if (!request.zoneTypeList.isNullOrEmpty()){
-                    listSFilter.add(SFilter.inList("objectType",request.zoneTypeList!!))
+                    listSFilter.add(SFilter.inList("classCode",request.zoneTypeList!!))
                 }
               val   pageQuery = pageQuery(request, listSFilter)
                 spaceSQueryResponse.message = pageQuery.message
@@ -393,7 +397,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             if (buildingList.size>0){
                 for (building in buildingList){
 
-                   val floorList = FloorService.select(SFilter.eq("projectId", projectId),SFilter.eq("buildId", building.id!!)).order("sequenceId desc").exec()
+                   val floorList = FloorService.select(SFilter.eq("projectId", projectId),SFilter.eq("buildingId", building.id!!)).order("floorSequenceId desc").exec()
                     if (floorList.size>0){
                         building .floor = floorList
                     }
@@ -431,78 +435,69 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     /**
      * 查询业务空间所有类型
      */
-//    fun zoneTypequery(request: DCSQueryRequest):SQueryResponse<DictSpaceProject> {
-//        try {
-//            /** 项目id */
-//            val projectId = SPageContext.getHeader("projectId")
-//
-//            val dictSpaceType = dictSpaceProjectService.select(SFilter.eq("projectId", projectId!!)).exec()
-//            if (dictSpaceType.size < 1) {
-//                val dClassDefList = DClassDefService.select(SFilter.eq("parentId", "Space"), SFilter.not(SFilter.eq("id", "Ispace"))).exec()
-//                if (dClassDefList.size > 0) {
-//                    for (dClassDef in dClassDefList) {
-//                        val dictSpaceProject = DictSpaceProject()
-//                        dictSpaceProject.projectId = projectId
-//                        dictSpaceProject.id = dClassDef.id
-//                        dictSpaceProject.name = dClassDef.name
-//                        dictSpaceProject.parentId = dClassDef.parentCode
-//                        dictSpaceProject.sign = 1
-//                        dictSpaceProjectService.replace(dictSpaceProject)
-//                    }
-//                }
-//            }
-//
-//            if (request.floorId.isNullOrEmpty()) {
-//                val pageQuery = dictSpaceProjectService.pageQuery(request, arrayListOf(SFilter.eq("projectId", projectId!!), SFilter.eq("parentId","Space")))
-//                return pageQuery
-//            } else {
-//                val pageQuery = dictSpaceProjectService.pageQuery(request, arrayListOf(SFilter.eq("projectId", projectId!!), SFilter.eq("parentId","Space")))
-//                val contentList = pageQuery.content
-//                if (contentList != null && contentList.size > 0) {
-//
-//                    for (content in contentList) {
-//                        if (content.name == "其它") {
-//                            if (content.zoneType != null && content.zoneType!!.size > 0) {
-//                                for (type in content.zoneType!!) {
-//                                    val rSpInFlList = RSpInFlService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("floorId", request.floorId!!), SFilter.eq("objectType", type.id!!)).exec()
-//                                    if (rSpInFlList.size > 0) {
-//                                        val idSet = ArrayList<String>()
-//                                        for (rSpInFl in rSpInFlList) {
-//                                            idSet.add(rSpInFl.spaceId!!)
-//                                        }
-//                                        val zoneSpaceBaseList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.inList("id", idSet.toList()), SFilter.eq("state", 1)).exec()
-//                                        if (zoneSpaceBaseList.size > 0) {
-//                                            type.count = zoneSpaceBaseList.size
-//                                        }
-//                                    }
-//                                }
-//                            }
-//                        } else {
-//                            val rSpInFlList = RSpInFlService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("floorId", request.floorId!!), SFilter.eq("objectType", content.id!!)).exec()
-//                            if (rSpInFlList.size > 0) {
-//                                val idSet = ArrayList<String>()
-//                                for (rSpInFl in rSpInFlList) {
-//                                    idSet.add(rSpInFl.spaceId!!)
-//                                }
-//                                val zoneSpaceBaseList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.inList("id", idSet.toList()), SFilter.eq("state", 1)).exec()
-//                                if (zoneSpaceBaseList.size > 0) {
-//                                    content.count = zoneSpaceBaseList.size
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//                return pageQuery
-//            }
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return SQueryResponse<DictSpaceProject>(SResponseType.failure,e.message.toString())
-//        }
-//    } // Fun
+    fun zoneTypequery(request: DCSQueryRequest):SQueryResponse<DictSpaceProject> {
+        try {
+            /** 项目id */
+            val projectId = SPageContext.getHeader("projectId")
+
+            if (request.floorId.isNullOrEmpty()) {
+                val pageQuery = defClassService.pageQuery(request, arrayListOf(SFilter.eq("projectId", projectId!!), SFilter.eq("parentCode","space")))
+                val list = ArrayList<DictSpaceProject>()
+                if (!pageQuery.content.isNullOrEmpty()) {
+                    for (content in pageQuery.content!!) {
+                        val dictSpaceProject = DictSpaceProject()
+                        dictSpaceProject.projectId = projectId
+                        dictSpaceProject.id = content.code
+                        dictSpaceProject.name = content.name
+                        list.add(dictSpaceProject)
+                    }
+                }
+                val sQueryResponse = SQueryResponse<DictSpaceProject>()
+                sQueryResponse.content = list
+                sQueryResponse.total = list.size.toLong()
+                sQueryResponse.result = SResponseType.success
+                return sQueryResponse
+            } else {
+                val pageQuery = defClassService.pageQuery(request, arrayListOf(SFilter.eq("projectId", projectId!!), SFilter.eq("parentCode","space")))
+                val contentList = pageQuery.content
+                val list = ArrayList<DictSpaceProject>()
+                if (contentList != null && contentList.size > 0) {
+
+                    for (content in contentList) {
+                        val dictSpaceProject = DictSpaceProject()
+                        dictSpaceProject.projectId = projectId
+                        dictSpaceProject.id = content.code
+                        dictSpaceProject.name = content.name
+
+                            val rSpInFlList = RSpInFlService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("floorId", request.floorId!!), SFilter.eq("objectType", content.id!!)).exec()
+                            if (rSpInFlList.size > 0) {
+                                val idSet = ArrayList<String>()
+                                for (rSpInFl in rSpInFlList) {
+                                    idSet.add(rSpInFl.spaceId!!)
+                                }
+                                val zoneSpaceBaseList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.inList("id", idSet.toList()), SFilter.eq("state", 1)).exec()
+                                if (zoneSpaceBaseList.size > 0) {
+                                    dictSpaceProject.count = zoneSpaceBaseList.size
+                                }
+                            }
+                        list.add(dictSpaceProject)
+                    }
+                }
+                val sQueryResponse = SQueryResponse<DictSpaceProject>()
+                sQueryResponse.content = list
+                sQueryResponse.total = list.size.toLong()
+                sQueryResponse.result = SResponseType.success
+                return sQueryResponse
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return SQueryResponse(SResponseType.failure,e.message.toString())
+        }
+    } // Fun
 
 
     override fun onCreateBefore(entity: ZoneSpace): Boolean {
-        if (entity.objectType.isNullOrEmpty()){
+        if (entity.classCode.isNullOrEmpty()){
             return false
         }
 
@@ -557,7 +552,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            ObjInfoService.createInfo(zoneSpace,true,"Sp",zoneSpace.objectType!!)
+            ObjInfoService.createInfo(zoneSpace,true,"Sp",zoneSpace.classCode!!)
         }
         val projectId = SPageContext.getHeader("projectId")
         try {
@@ -565,7 +560,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 if (!space.buildingId.isNullOrEmpty()&&!space.floorId.isNullOrEmpty()){
                     val rSpinBd = RSpinBd()
                     rSpinBd.buildingId = space.buildingId
-                    rSpinBd.objectType = space.objectType
+                    rSpinBd.objectType = space.classCode
                     rSpinBd.projectId = space.projectId
                     rSpinBd.spaceId = space.id
                     rSpinBd.sign = 1
@@ -574,14 +569,14 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                     rSpinFl.buildingId = space.buildingId
                     rSpinFl.floorId = space.floorId
                     rSpinFl.projectId = space.projectId
-                    rSpinFl.objectType = space.objectType
+                    rSpinFl.objectType = space.classCode
                     rSpinFl.spaceId = space.id
                     rSpinFl.sign = 1
                     RSpInFlService.insert(rSpinFl)
                 }else if (!space.buildingId.isNullOrEmpty()&&space.floorId.isNullOrEmpty()){
                     val rSpinBd = RSpinBd()
                     rSpinBd.buildingId = space.buildingId
-                    rSpinBd.objectType = space.objectType
+                    rSpinBd.objectType = space.classCode
                     rSpinBd.projectId = space.projectId
                     rSpinBd.spaceId = space.id
                     rSpinBd.sign = 1
@@ -611,7 +606,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             }
             val zoneSpace = entityList[0]
 
-            val relationType = relationTypeProjectservice.select(SFilter.eq("projectId", projectId!!), SFilter.eq("relationType", "eq2sp_in"),SFilter.eq("zoneType", zoneSpace.objectType!!)).entity()
+            val relationType = relationTypeProjectservice.select(SFilter.eq("projectId", projectId!!), SFilter.eq("relationType", "eq2sp_in"),SFilter.eq("zoneType", zoneSpace.classCode!!)).entity()
             if (relationType!=null){
                     relationType.computationalState = 2
                     relationTypeProjectservice.update(relationType)
@@ -628,7 +623,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
         list.add("name")
         ZoneSpaceBaseService.update(entity,list)
 
-        return !entity.objectType.isNullOrEmpty()
+        return !entity.classCode.isNullOrEmpty()
     }
 
     override fun onUpdateSuccess(entityList: ArrayList<ZoneSpace>) {
@@ -647,7 +642,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            ObjInfoService.createInfo(zoneSpace,false,"Sp",zoneSpace.objectType!!)
+            ObjInfoService.createInfo(zoneSpace,false,"Sp",zoneSpace.classCode!!)
         }
 
         try {
@@ -703,7 +698,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 try {
                     if (!id.isNullOrEmpty()) {
                         if (id.startsWith("Fl")) {
-                            val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("FloorID", id)).entity()
+                            val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", id)).entity()
 
                             if (floor!=null){
                                 /** 清除空间和建筑楼层的的数据 */
@@ -751,16 +746,16 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 if (!id.isNullOrEmpty()) {
                     if (id.startsWith("Fl")) {
                         zoneSpace.floorId = id
-                        val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("FloorId", id)).entity()
+                        val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", id)).entity()
                         zoneSpace.buildingId = floor?.buildingId
                         val list = ArrayList<String>()
-                        list.add("FloorId")
-                        list.add("BuildingId")
+                        list.add("floorId")
+                        list.add("buildingId")
                        update(zoneSpace, list)
                     } else if (id.startsWith("Bd")) {
                         val list = ArrayList<String>()
-                        list.add("FloorId")
-                        list.add("BuildingId")
+                        list.add("floorId")
+                        list.add("buildingId")
                         zoneSpace.buildingId = id
                         zoneSpace.floorId = null
                         update(zoneSpace, list)
@@ -768,8 +763,8 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 } else {
                     /** 清空建筑楼层 */
                     val list = ArrayList<String>()
-                    list.add("FloorId")
-                    list.add("BuildingId")
+                    list.add("floorId")
+                    list.add("buildingId")
                     zoneSpace.buildingId = null
                     zoneSpace.floorId = null
                     update(zoneSpace, list)
@@ -779,7 +774,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                         ||type == "HeatingZone"||type == "LightingZone"||type == "NetworkZone"
                         ||type == "PowerSupplyZone"||type == "SecurityZone"||type == "TenantZone" ){
                     /** 发送消息 */
-                    sendMessages(projectId!!, spaceId!!, id)
+//                    sendMessages(projectId!!, spaceId!!, id)
                     /** 修改空间的建筑楼层关系 */
                 }
             }

+ 29 - 32
datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt

@@ -29,7 +29,7 @@ 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.RBdForEqList
-import com.persagy.server.datacenter.models.entities.rel.REq2Bd
+import com.persagy.server.datacenter.models.entities.rel.REqForBd
 import com.persagy.server.datacenter.models.entities.rel.REqForBdList
 import com.persagy.server.services.base.RService
 import com.persagy.service.SPageContext
@@ -43,27 +43,26 @@ import org.json.JSONObject
  *
  * @author 张维新
  */
-object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
+object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
 
 
     /**
      * 创建设备服务于建筑关系
      *
-     * @param   req2Bd    设备服务于建筑关系对象
+     * @param   rEqForBd    设备服务于建筑关系对象
      */
-    fun create(req2Bd: REq2Bd): SCreateResponse<REq2Bd> {
+    fun create(rEqForBd: REqForBd): SCreateResponse<REqForBd> {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
-            req2Bd.projectId = projectId
-            req2Bd.type = "eq2bd_for"
-            val isInsert = insert(req2Bd)
+            val projectId = SPageContext.getHeader("ProjectId")
+            rEqForBd.projectId = projectId
+            val isInsert = insert(rEqForBd)
             if (isInsert){
                 val jsonObject = JSONObject()
                 jsonObject.put("type", "11")
                 jsonObject.put("projectId", projectId)
-                jsonObject.put("id", req2Bd.id1)
+                jsonObject.put("id", rEqForBd.equipId)
                 jsonObject.put("obj_type", "Eq2Bd")
-                jsonObject.put("linkId",req2Bd.id2)
+                jsonObject.put("linkId",rEqForBd.buildingId)
 
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
@@ -81,27 +80,27 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
     /**
      * 根据对象删除
      *
-     * @param    req2Bd     关系对象实例
+     * @param    rEqForBd     关系对象实例
      * @return
      */
-    fun deletes(req2Bd: REq2Bd): SBaseResponse {
+    fun deletes(rEqForBd: REqForBd): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("projectId")
-            val isDelete = delete(req2Bd)
+            val projectId = SPageContext.getHeader("ProjectId")
+            val isDelete = delete(rEqForBd)
             /** 删除成功 */
             if (isDelete) {
                 val jsonObject = JSONObject()
                 jsonObject.put("type", "12")
                 jsonObject.put("projectId", projectId)
-                jsonObject.put("id", req2Bd.id1)
+                jsonObject.put("id", rEqForBd.equipId)
                 jsonObject.put("obj_type", "Eq2Bd")
-                jsonObject.put("linkId",req2Bd.id2)
+                jsonObject.put("linkId",rEqForBd.buildingId)
 
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
 
                 val sBaseResponse = SBaseResponse(SResponseType.success)
-                sBaseResponse.message = req2Bd.toJson()
+                sBaseResponse.message = rEqForBd.toJson()
                 sBaseResponse
             } else {
                 SBaseResponse(SResponseType.failure)
@@ -117,20 +116,19 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
      *
      * @param    rEqForBdList     设备和建筑关系的对象列表
      */
-    fun createEq(rEqForBdList: REqForBdList): SCreateResponse<REq2Bd> {
+    fun createEq(rEqForBdList: REqForBdList): SCreateResponse<REqForBd> {
         return try {
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipID = '${rEqForBdList.equipId}'")
-            val projectId = SPageContext.getHeader("projectId")
+            val projectId = SPageContext.getHeader("ProjectId")
             for (buildingId in rEqForBdList.buildingIdList!!){
-                val rEqForBd = REq2Bd()
-                rEqForBd.id1 = rEqForBdList.equipId
-                rEqForBd.id2 = buildingId
+                val rEqForBd = REqForBd()
+                rEqForBd.equipId = rEqForBdList.equipId
+                rEqForBd.buildingId = buildingId
                 rEqForBd.projectId = projectId
-                rEqForBd.type = "eq2bd_for"
                 val replace = replace(rEqForBd)
                 if (replace){
                     successList.add(rEqForBd)
@@ -148,7 +146,7 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
 
-                val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
+                val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
                 }
@@ -167,20 +165,19 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
      *
      * @param    rEqForBdList    设备和建筑关系的对象列表
      */
-    fun createsBd(rEqForBdList: RBdForEqList): SCreateResponse<REq2Bd> {
+    fun createsBd(rEqForBdList: RBdForEqList): SCreateResponse<REqForBd> {
         return try {
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("buildingID = '${rEqForBdList.buildingId}'")
-            val projectId = SPageContext.getHeader("projectId")
+            val projectId = SPageContext.getHeader("ProjectId")
             for (equipId in rEqForBdList.equipIdList!!){
-                val rEqForBd = REq2Bd()
-                rEqForBd.id2 = rEqForBdList.buildingId
-                rEqForBd.id1 = equipId
+                val rEqForBd = REqForBd()
+                rEqForBd.buildingId = rEqForBdList.buildingId
+                rEqForBd.equipId = equipId
                 rEqForBd.projectId = projectId
-                rEqForBd.type = "eq2bd_for"
                 val replace = replace(rEqForBd)
                 if (replace){
                     successList.add(rEqForBd)
@@ -199,11 +196,11 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
                 messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
-                    val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
+                    val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
                     sCreateResponse
                 }else{
-                    val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
+                    val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
                     sCreateResponse
                 }
             }else{

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSpatialConnectionService.kt

@@ -26,10 +26,10 @@
 
 package com.persagy.server.services.rel
 
-import com.persagy.server.datacenter.models.entities.rel.RSpatialConnection
-import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.rel.RSpatialConnection
+import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -69,7 +69,7 @@ object RSpatialConnectionService : SObjectService<RSpatialConnection>(SMybatisDa
                     if (content.zoneType.isNullOrEmpty()) {
                         val zoneSpace = ZoneSpaceBaseService.select(SFilter.eq("id", content.spaceIdOne!!)).entity()
                         if (zoneSpace != null) {
-                            content.zoneType = zoneSpace.objectType
+                            content.zoneType = zoneSpace.classCode
                         }
                     }
                     val insert = replace(content)

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

@@ -123,7 +123,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)
                     sBaseResponse
                 } else {

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyForSpBaseService.kt

@@ -92,7 +92,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
             rSy2Sp.id2 = rSyForSpBase.spaceId
             rSy2Sp.projectId = projectId
             rSy2Sp.type = "sy2sp_for"
-            rSy2Sp.zoneType = entity!!.objectType
+            rSy2Sp.zoneType = entity!!.classCode
             val isDelete =rSy2SpService.delete(rSy2Sp)
             /** 删除成功 */
             if (isDelete) {
@@ -126,7 +126,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
                 val rSy2Sp = RSy2Sp()
                 rSy2Sp.id1 = rSyForSpBaseList.sysId
                 rSy2Sp.id2 = spaceId
-                rSy2Sp.zoneType = entity!!.objectType
+                rSy2Sp.zoneType = entity!!.classCode
                 rSy2Sp.sign = 1
                 rSy2Sp.projectId = projectId
                 rSy2Sp.type = "sy2sp_for"
@@ -172,7 +172,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
                 rSy2Sp.id2 = rSyForSpBaseList.spaceId
                 rSy2Sp.id1 = sysId
                 rSy2Sp.projectId = projectId
-                rSy2Sp.zoneType = entity!!.objectType
+                rSy2Sp.zoneType = entity!!.classCode
                 rSy2Sp.sign = 1
                 rSy2Sp.type = "sy2sp_for"
                 val replace = rSy2SpService.replace(rSy2Sp)

+ 10 - 10
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.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.RShInSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyInSh
 import com.persagy.server.datacenter.models.entities.rel.RSyInShList
 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 RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("linkId",rSyInSh.sysId)
 
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "11", IdUtils.uuidCreate(),  rSyInSh.sysId!!, rSyInSh.shaftId!!),false)
                 SCreateResponse(SResponseType.success)
             }else{
@@ -95,7 +95,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("obj_type", "Sy2Sh")
                 jsonObject.put("linkId",rSyInSh.sysId)
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "12", IdUtils.uuidCreate(),  rSyInSh.sysId!!, rSyInSh.shaftId!!),false)
                 val sBaseResponse = SBaseResponse(SResponseType.success)
                 sBaseResponse.message = rSyInSh.toJson()
@@ -142,7 +142,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("obj_type", "Sy2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "13", IdUtils.uuidCreate(),  rSyInShList.sysId!!,
 //                        null),false)
                 val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
@@ -192,7 +192,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("obj_type", "Sy2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "13", IdUtils.uuidCreate(),  rShInSyList.shaftId!!,
 //                        null),false)
 
@@ -246,7 +246,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("obj_type", "Sy2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "Sy2Sh", "14", IdUtils.uuidCreate(),  rShInSyList.shaftId!!,
 //                        null),false)
                 if (failureList.size>0){
@@ -298,7 +298,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
                 jsonObject.put("obj_type", "Sy2Sh")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 val sCreateResponse = SCreateResponse<RSyInSh>(SResponseType.success)
                 if (failureList.size>0){
@@ -329,7 +329,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             jsonObject.put("linkId",rSyInSh.sysId)
 
             /** 发送消息 */
-            messageHandler.sendMessage(jsonObject.toString())
+//            messageHandler.sendMessage(jsonObject.toString())
         }
 
     } // Function onCreateSuccess()
@@ -348,7 +348,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             jsonObject.put("obj_type", "Sy2Sh")
             jsonObject.put("linkId",rSyInSh.sysId)
             /** 发送消息 */
-            messageHandler.sendMessage(jsonObject.toString())
+//            messageHandler.sendMessage(jsonObject.toString())
         }
     } // Function onDeleteSuccess()
 

+ 8 - 8
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInSpBaseService.kt

@@ -77,7 +77,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                     jsonObject.put("obj_type", "Sy2Sp")
                     jsonObject.put("linkId",rSyInSpBase.sysId)
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
                 }
 //                if (rSyInSpBase.objectType == "HeatingZone"){
 //                    RSyInSpZoneHeatingService.create(rSyInSpBase)
@@ -158,7 +158,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                     jsonObject.put("obj_type", "Sy2Sp")
                     jsonObject.put("linkId",rSyInSpBase.sysId)
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
                 }
             }
             try {
@@ -233,7 +233,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.id1 = rSyInSpBaseList.sysId
                 rSy2Sp.id2 = spaceId
                 rSy2Sp.sign = 1
-                rSy2Sp.zoneType = entity!!.objectType
+                rSy2Sp.zoneType = entity!!.classCode
                 rSy2Sp.type = "sy2sp"
                 rSy2Sp.projectId = projectId
                 val replace = rSy2SpService.replace(rSy2Sp)
@@ -251,7 +251,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 jsonObject.put("obj_type", "Sy2Sp")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.success)
                 if (failureList.size>0){
@@ -288,7 +288,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.id1 = sysId
                 rSy2Sp.projectId = projectId
                 rSy2Sp.sign = 1
-                rSy2Sp.zoneType = entity!!.objectType
+                rSy2Sp.zoneType = entity!!.classCode
                 rSy2Sp.type = "sy2sp"
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
@@ -305,7 +305,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 jsonObject.put("obj_type", "Sy2Sp")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSyInSpBase>(SResponseType.success)
@@ -361,7 +361,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 jsonObject.put("obj_type", "Sy2Sp")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSpInSyBaseList>(SResponseType.success)
@@ -449,7 +449,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 jsonObject.put("obj_type", "Sy2Sp")
                 jsonObject.put("linkId",successList.toJson())
                 /** 发送消息 */
-                messageHandler.sendMessage(jsonObject.toString())
+//                messageHandler.sendMessage(jsonObject.toString())
 
 
                 val sCreateResponse = SCreateResponse<RSyInSpBaseList>(SResponseType.success)

+ 5 - 4
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -29,6 +29,7 @@ package com.persagy.server.services.relation_calc
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.graphtype.block.RelationAddRequest
 import com.persagy.server.datacenter.models.entities.graphtype.rel.*
@@ -95,7 +96,7 @@ open class ManualRelationCalcService {
     /** 空间 */
     private val relZoneSpaceService = SObjectService(SMybatisDao(RelZoneSpace::class.java))
     /** 类型查询 */
-    private val dClassDefService = SObjectService(SMybatisDao(DClassDef::class.java))
+    private val dClassDefService = SObjectService(SMybatisDao(DefClass::class.java))
     /** 资产所在的竖井 */
     private val rPeInShService = SObjectService(SMybatisDao(RPeInSh::class.java))
     /** 资产和竖井的资产实例 */
@@ -1955,7 +1956,7 @@ open class ManualRelationCalcService {
                 rEq2Sp.projectId = projectId
                 rEq2Sp.sign = 1
                 rEq2Sp.id2 = equipmentTo.id
-                rEq2Sp.zoneType = equipmentTo.objectType
+                rEq2Sp.zoneType = equipmentTo.classCode
                 rEq2Sp.type = "eq2sp_SensorRelationship_ss2sp"
                 rEq2SpService.replace(rEq2Sp)
             }
@@ -2021,7 +2022,7 @@ open class ManualRelationCalcService {
                 rEq2Sp.projectId = projectId
                 rEq2Sp.sign = 1
                 rEq2Sp.id2 = equipmentTo.id
-                rEq2Sp.zoneType = equipmentTo.objectType
+                rEq2Sp.zoneType = equipmentTo.classCode
                 rEq2Sp.type = "eq2sp_x"
                 rEq2SpService.replace(rEq2Sp)
             }
@@ -5784,4 +5785,4 @@ open class ManualRelationCalcService {
     } // Fun
 
 
-} // Class ManualRelationCalcService
+} // Class ManualRelationCalcService`

+ 174 - 181
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/tools/ManualRelationTools.kt

@@ -26,21 +26,14 @@
 
 package com.persagy.server.services.relation_calc.tools
 
-import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelProperty
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RPe2Sp
 import com.persagy.server.datacenter.models.entities.rel.RPeInSh
-import com.persagy.server.datacenter.models.requests.RelationAddRequest
-import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.service.SObjectService
-import com.persagy.service.models.enums.SResponseType
 import org.springframework.stereotype.Service
-import java.util.*
 
 /**
  * 关系工具类
@@ -111,27 +104,27 @@ class ManualRelationTools {
     /**
      * 添加关系
      */
-    fun  addRel(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse{
-        val sCreateResponse = ManualRelationCalcSCreateResponse()
-        when (relationAddRequest.graphicCode) {
-
-            Opt.PropertyInArch -> {
-                /** 资产所在区域关系 */
-               return pe2ShOr2Sp(relationAddRequest)
-            }
-            Opt.MechForArch -> {
-                /** 机电类服务区域关系 */
-            }
-            Opt.SpaceNeighborhood,Opt.TrafficNetwork,Opt.ConvectionNetwork,Opt.RadiationNetwork -> {
-                /** 空间邻接关系,建筑交通网络,空气流通网络,光照辐射网络 */
-            }
-            else ->{
-                /** 设备与与设备 */
-            }
-        }
-
-        return sCreateResponse
-    }
+//    fun  addRel(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse{
+//        val sCreateResponse = ManualRelationCalcSCreateResponse()
+//        when (relationAddRequest.graphicCode) {
+//
+//            Opt.PropertyInArch -> {
+//                /** 资产所在区域关系 */
+//               return pe2ShOr2Sp(relationAddRequest)
+//            }
+//            Opt.MechForArch -> {
+//                /** 机电类服务区域关系 */
+//            }
+//            Opt.SpaceNeighborhood,Opt.TrafficNetwork,Opt.ConvectionNetwork,Opt.RadiationNetwork -> {
+//                /** 空间邻接关系,建筑交通网络,空气流通网络,光照辐射网络 */
+//            }
+//            else ->{
+//                /** 设备与与设备 */
+//            }
+//        }
+//
+//        return sCreateResponse
+//    }
 
     /**
      * 资产和竖井的关系,或资产和空间的关系
@@ -139,159 +132,159 @@ class ManualRelationTools {
      * @param relationAddRequest        入参对象
      * @return 返回结果
      */
-    fun pe2ShOr2Sp(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
-        val sCreateResponse = ManualRelationCalcSCreateResponse()
-        if (relationAddRequest.type == "cadId"){
-            sCreateResponse.result = SResponseType.failure
-            sCreateResponse.message = "从对象不存在CADID编码"
-            sCreateResponse.errorType = "2"
-            return sCreateResponse
-        }
-        /** 查询资产 */
-        val relPropertyList = relPropertyService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
-        if (relPropertyList.size == 0) {
-            /** 数据不存在 */
-            sCreateResponse.result = SResponseType.failure
-            sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
-            sCreateResponse.errorType = "1"
-            return sCreateResponse
-        }else if (relPropertyList.size > 1) {
-            /** 主对象编码识别到多个实例 */
-            sCreateResponse.result = SResponseType.failure
-            sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
-            sCreateResponse.errorType = "1"
-            return sCreateResponse
-        }
-
-        if (relationAddRequest.relType == Opt.Pe2Sh){
-            /** 资产所在竖井 */
-            for (fromContent in relationAddRequest.fromContent!!){
-                val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
-                if (relZoneSpaceList.size<1){
-                    /** 从对象编码不存在 */
-                    sCreateResponse.result = SResponseType.failure
-                    sCreateResponse.message = "$fromContent:编码不存在"
-                    sCreateResponse.errorType = "2"
-                    return sCreateResponse
-                }
-            }
-
-            /** 处理关系 */
-            val setCode = HashSet<String>()
-            for (fromContent in relationAddRequest.fromContent!!){
-                setCode.add(fromContent)
-            }
-            /** 查询竖井 */
-            val relShaftList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
-            /**  遍历从对象列表 */
-            for (relShaft in relShaftList){
-                val rPe2Sh = RPeInSh(relPropertyList[0].id,relShaft.id,relationAddRequest.relType!!,Opt.projectId,relationAddRequest.graphicCode)
-                rPeInShService.replace(rPe2Sh)
-            }
-
-        } else if (relationAddRequest.relType == Opt.Pe2Sp) {
-            /** 资产所在业务空间 */
-
-            for (fromContent in relationAddRequest.fromContent!!){
-                val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
-                if (relZoneSpaceList.size<1){
-                    /** 从对象编码不存在 */
-                    sCreateResponse.result = SResponseType.failure
-                    sCreateResponse.message = "$fromContent:编码不存在"
-                    sCreateResponse.errorType = "2"
-                    return sCreateResponse
-                }
-            }
-
-            /** 处理关系 */
-            val setCode = HashSet<String>()
-            for (fromContent in relationAddRequest.fromContent!!){
-                setCode.add(fromContent)
-            }
-            /** 查询空间 */
-            val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
-            /** 遍历空间列表 */
-            for (relZoneSpace in relZoneSpaceList){
-                val rPe2Sp = RPe2Sp(relPropertyList[0].id,relZoneSpace.id,relationAddRequest.relType!!,Opt.projectId,relationAddRequest.graphicCode,relZoneSpace.objectType)
-
-                rPeInSpBaseService.replace(rPe2Sp)
-            }
-        }
-        sCreateResponse.result = SResponseType.success
-        sCreateResponse.message = "添加成功"
-        return sCreateResponse
-    }
-
-
-    fun mechForArch(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
-
-        val sCreateResponse = ManualRelationCalcSCreateResponse()
-        if (relationAddRequest.relType == Opt.Sy2Bd){
-            /** 系统服务的建筑 */
-        }else if (relationAddRequest.relType == Opt.Sy2Fl) {
-            /** 系统服务的楼层 */
-        }else if (relationAddRequest.relType == Opt.Sy2Sh) {
-            /** 系统服务的竖井 */
-        }else if (relationAddRequest.relType == Opt.Sy2Sp) {
-            /** 系统服务的空间 */
-        }else if (relationAddRequest.relType == Opt.Eq2Bd) {
-            /** 设备服务的建筑 */
-        }else if (relationAddRequest.relType == Opt.Eq2Fl) {
-            /** 设备服务的楼层 */
-        }else if (relationAddRequest.relType == Opt.Eq2Sh) {
-            /** 设备服务的竖井 */
-            /** 设备服务于竖井 */
-            if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
-                /** 从对象不存在cadId编码 */
-                sCreateResponse.result = SResponseType.failure
-                sCreateResponse.message = "从对象不存在CADID编码"
-                sCreateResponse.errorType = "2"
-                return sCreateResponse
-            }
-
-            /** 查询设备 */
-            val relPropertyList = EquipmentService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
-
-            if (relPropertyList.size<1){
-                /** 主对象编码不存在 */
-                sCreateResponse.result = SResponseType.failure
-                sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
-                sCreateResponse.errorType = "1"
-                return sCreateResponse
-            }
-
-            if (relPropertyList.size>1){
-                /** 主对象编码识别到多个实例 */
-                sCreateResponse.result = SResponseType.failure
-                sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
-                sCreateResponse.errorType = "1"
-                return sCreateResponse
-            }
-            for (fromContent in relationAddRequest.fromContent!!){
-                val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
-                if (relZoneSpaceList.size<1){
-                    /** 从对象编码不存在 */
-                    sCreateResponse.result = SResponseType.failure
-                    sCreateResponse.message = fromContent+":编码不存在"
-                    sCreateResponse.errorType = "2"
-                    return sCreateResponse
-                }
-                if (relZoneSpaceList.size>1){
-                    /** 从对象编码识别到多个实例 */
-                    sCreateResponse.result = SResponseType.failure
-                    sCreateResponse.message = fromContent+":编码存在多个实例"
-                    sCreateResponse.errorType = "2"
-                    return sCreateResponse
-                }
-            }
-
-        }else if (relationAddRequest.relType == Opt.Eq2Sp) {
-            /** 设备服务的空间 */
-        }
-        sCreateResponse.result = SResponseType.success
-        sCreateResponse.message = "添加成功"
-        return sCreateResponse
-    }
+//    fun pe2ShOr2Sp(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
+//        val sCreateResponse = ManualRelationCalcSCreateResponse()
+//        if (relationAddRequest.type == "cadId"){
+//            sCreateResponse.result = SResponseType.failure
+//            sCreateResponse.message = "从对象不存在CADID编码"
+//            sCreateResponse.errorType = "2"
+//            return sCreateResponse
+//        }
+//        /** 查询资产 */
+//        val relPropertyList = relPropertyService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
+//        if (relPropertyList.size == 0) {
+//            /** 数据不存在 */
+//            sCreateResponse.result = SResponseType.failure
+//            sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
+//            sCreateResponse.errorType = "1"
+//            return sCreateResponse
+//        }else if (relPropertyList.size > 1) {
+//            /** 主对象编码识别到多个实例 */
+//            sCreateResponse.result = SResponseType.failure
+//            sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
+//            sCreateResponse.errorType = "1"
+//            return sCreateResponse
+//        }
+//
+//        if (relationAddRequest.relType == Opt.Pe2Sh){
+//            /** 资产所在竖井 */
+//            for (fromContent in relationAddRequest.fromContent!!){
+//                val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
+//                if (relZoneSpaceList.size<1){
+//                    /** 从对象编码不存在 */
+//                    sCreateResponse.result = SResponseType.failure
+//                    sCreateResponse.message = "$fromContent:编码不存在"
+//                    sCreateResponse.errorType = "2"
+//                    return sCreateResponse
+//                }
+//            }
+//
+//            /** 处理关系 */
+//            val setCode = HashSet<String>()
+//            for (fromContent in relationAddRequest.fromContent!!){
+//                setCode.add(fromContent)
+//            }
+//            /** 查询竖井 */
+//            val relShaftList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
+//            /**  遍历从对象列表 */
+//            for (relShaft in relShaftList){
+//                val rPe2Sh = RPeInSh(relPropertyList[0].id,relShaft.id,relationAddRequest.relType!!,Opt.projectId,relationAddRequest.graphicCode)
+//                rPeInShService.replace(rPe2Sh)
+//            }
+//
+//        } else if (relationAddRequest.relType == Opt.Pe2Sp) {
+//            /** 资产所在业务空间 */
+//
+//            for (fromContent in relationAddRequest.fromContent!!){
+//                val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
+//                if (relZoneSpaceList.size<1){
+//                    /** 从对象编码不存在 */
+//                    sCreateResponse.result = SResponseType.failure
+//                    sCreateResponse.message = "$fromContent:编码不存在"
+//                    sCreateResponse.errorType = "2"
+//                    return sCreateResponse
+//                }
+//            }
+//
+//            /** 处理关系 */
+//            val setCode = HashSet<String>()
+//            for (fromContent in relationAddRequest.fromContent!!){
+//                setCode.add(fromContent)
+//            }
+//            /** 查询空间 */
+//            val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
+//            /** 遍历空间列表 */
+//            for (relZoneSpace in relZoneSpaceList){
+//                val rPe2Sp = RPe2Sp(relPropertyList[0].id,relZoneSpace.id,relationAddRequest.relType!!,Opt.projectId,relationAddRequest.graphicCode,relZoneSpace.objectType)
+//
+//                rPeInSpBaseService.replace(rPe2Sp)
+//            }
+//        }
+//        sCreateResponse.result = SResponseType.success
+//        sCreateResponse.message = "添加成功"
+//        return sCreateResponse
+//    }
+
+
+//    fun mechForArch(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
+//
+//        val sCreateResponse = ManualRelationCalcSCreateResponse()
+//        if (relationAddRequest.relType == Opt.Sy2Bd){
+//            /** 系统服务的建筑 */
+//        }else if (relationAddRequest.relType == Opt.Sy2Fl) {
+//            /** 系统服务的楼层 */
+//        }else if (relationAddRequest.relType == Opt.Sy2Sh) {
+//            /** 系统服务的竖井 */
+//        }else if (relationAddRequest.relType == Opt.Sy2Sp) {
+//            /** 系统服务的空间 */
+//        }else if (relationAddRequest.relType == Opt.Eq2Bd) {
+//            /** 设备服务的建筑 */
+//        }else if (relationAddRequest.relType == Opt.Eq2Fl) {
+//            /** 设备服务的楼层 */
+//        }else if (relationAddRequest.relType == Opt.Eq2Sh) {
+//            /** 设备服务的竖井 */
+//            /** 设备服务于竖井 */
+//            if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
+//                /** 从对象不存在cadId编码 */
+//                sCreateResponse.result = SResponseType.failure
+//                sCreateResponse.message = "从对象不存在CADID编码"
+//                sCreateResponse.errorType = "2"
+//                return sCreateResponse
+//            }
+//
+//            /** 查询设备 */
+//            val relPropertyList = EquipmentService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
+//
+//            if (relPropertyList.size<1){
+//                /** 主对象编码不存在 */
+//                sCreateResponse.result = SResponseType.failure
+//                sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
+//                sCreateResponse.errorType = "1"
+//                return sCreateResponse
+//            }
+//
+//            if (relPropertyList.size>1){
+//                /** 主对象编码识别到多个实例 */
+//                sCreateResponse.result = SResponseType.failure
+//                sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
+//                sCreateResponse.errorType = "1"
+//                return sCreateResponse
+//            }
+//            for (fromContent in relationAddRequest.fromContent!!){
+//                val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq(relationAddRequest.type!!, fromContent)).exec()
+//                if (relZoneSpaceList.size<1){
+//                    /** 从对象编码不存在 */
+//                    sCreateResponse.result = SResponseType.failure
+//                    sCreateResponse.message = fromContent+":编码不存在"
+//                    sCreateResponse.errorType = "2"
+//                    return sCreateResponse
+//                }
+//                if (relZoneSpaceList.size>1){
+//                    /** 从对象编码识别到多个实例 */
+//                    sCreateResponse.result = SResponseType.failure
+//                    sCreateResponse.message = fromContent+":编码存在多个实例"
+//                    sCreateResponse.errorType = "2"
+//                    return sCreateResponse
+//                }
+//            }
+//
+//        }else if (relationAddRequest.relType == Opt.Eq2Sp) {
+//            /** 设备服务的空间 */
+//        }
+//        sCreateResponse.result = SResponseType.success
+//        sCreateResponse.message = "添加成功"
+//        return sCreateResponse
+//    }
 
 
 

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

@@ -31,7 +31,7 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-#    url:                                jdbc:postgresql://172.17.100.16: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

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt

@@ -54,6 +54,6 @@ class SchedulerTask {
     @Scheduled(cron = "0 */3 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始")
-//        messageProcessing.syncDataCenter()
+        messageProcessing.syncDataCenter()
     }
 }

+ 2 - 2
datasyn/src/main/resources/application-dev.yml

@@ -3,10 +3,10 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
 #    username:                           postgres
 #    password:                           123qwe!@#
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
+    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 18 - 5
datasyn/src/main/resources/application-prod.yml

@@ -3,13 +3,26 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://data-center:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://data-center:5432/datacenterlabsl
+    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
     username:                           postgres
-    password:                           123qwe!@#
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
 
 
+
+    #配置rabbitMq 服务器
+  rabbitmq:
+    host: 39.102.43.179
+    port: 9936
+    username: admin
+    password: brzj123456
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /test
+
 saga:
-                                          dataPlatform:                         http://data-platform:8888/data-platform-3
-#                                          dataPlatform:                         http://api.sagacloud.cn/data-platform-3
-                                          scanBuilding:                         http://mbi.sagacloud.cn:8080/ScanBuilding
+  dataPlatform:                        http://39.102.40.239:9970
+
+mqtopid:
+  exchange:                           exchange-dmp
+  routingKey:

equip-componet/build.gradle → equip-component/build.gradle


equip-componet/src/main/kotlin/com/persagy/server/EquipComponentApp.kt → equip-component/src/main/kotlin/com/persagy/server/EquipComponentApp.kt


equip-componet/src/main/kotlin/com/persagy/server/Opt.kt → equip-component/src/main/kotlin/com/persagy/server/Opt.kt


equip-componet/src/main/kotlin/com/persagy/server/ShiroConfig.kt → equip-component/src/main/kotlin/com/persagy/server/ShiroConfig.kt


equip-componet/src/main/kotlin/com/persagy/server/Swagger2Config.kt → equip-component/src/main/kotlin/com/persagy/server/Swagger2Config.kt


+ 14 - 0
equip-componet/src/main/kotlin/com/persagy/server/Swagger3Config.kt

@@ -93,6 +93,20 @@ open class Swagger3Config {
             .build()
     }
 
+    /**
+     * 默认分组
+     */
+    @Bean
+    open fun planarApiGroup(): GroupedOpenApi {
+        return GroupedOpenApi.builder()
+            .group("平面图")
+            .pathsToMatch("/planar/**")
+            .addOperationCustomizer(operationCustomizer)
+            .build()
+    }
+
+
+
 
     /**
      * 全局参数

equip-componet/src/main/kotlin/com/persagy/server/WebMvcConfg.kt → equip-component/src/main/kotlin/com/persagy/server/WebMvcConfg.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/EquipController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/EquipController.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/FloorController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/FloorController.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/PointController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/PointController.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt


+ 4 - 7
equip-componet/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt

@@ -40,10 +40,7 @@ import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.springframework.beans.factory.annotation.Autowired
-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.*
 
 /**
  * 竖井接口
@@ -63,7 +60,7 @@ class ShaftController {
      */
    @Operation(summary="查询没有和当前竖井绑定的系统", description= "")
     @PostMapping(value = ["/unshaft-in-sys"])
-    fun unShaftSys(shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<GeneralSystem> {
+    fun unShaftSys(@RequestParam shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<GeneralSystem> {
         return GeneralSystemService.unShaftSys(shaftId, request)
     } // Function unSpaceSys()
 
@@ -72,13 +69,13 @@ class ShaftController {
      */
    @Operation(summary="查询没有和当前竖井绑定的设备", description ="")
     @PostMapping(value = ["/unshaft-in-eq"])
-    fun  unShaftEq( shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
+    fun  unShaftEq(@RequestParam shaftId: String, @RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
         return EquipmentService.pageQueryShaftEquip(shaftId,request)
     } // Function unSpaceEq()
 
    @Operation(summary="查询没有和当前竖井贯通的其它竖井", description ="")
     @PostMapping(value = ["/unshaft-through-shaft"])
-    fun  unShaftThroughShaft(shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<Shaft> {
+    fun  unShaftThroughShaft(@RequestParam shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<Shaft> {
         return ShaftService.unShaftThroughShaft(shaftId,request)
     } // Function unSpaceEq()
 

+ 9 - 8
equip-componet/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt

@@ -36,6 +36,7 @@ import com.persagy.server.service.objects.*
 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.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -145,14 +146,14 @@ class SpaceController {
         return service.updateSpacePicInfo(request)
     } // Function updateSpacePicInfo
 
-//    /**
-//     * 统计 属于多建筑楼层的空间
-//     */
-//   @Operation(summary="统计 属于多建筑楼层的空间", description ="")
-//    @PostMapping(value = ["/space-bd-fl"])
-//    fun spaceBdFl(): SCountResponse {
-//        return ZoneAirConditioningService.spaceBdFls()
-//    } // Function spaceBdFl()
+    /**
+     * 统计 属于多建筑楼层的空间
+     */
+   @Operation(summary="统计 属于多建筑楼层的空间", description ="")
+    @PostMapping(value = ["/space-bd-fl"])
+    fun spaceBdFl(): SCountResponse {
+        return ZoneSpaceBaseService.spaceBdFls()
+    } // Function spaceBdFl()
 
     /**
      * 统计 属于多建筑楼层的空间数据

equip-componet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/TenantController.kt


equip-componet/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt → equip-component/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt


+ 1 - 1
equip-componet/src/main/kotlin/com/persagy/server/controllers/labsl/LabslController.kt

@@ -60,7 +60,7 @@ class LabslController {
     /**
      * 查询项目下的设备类型
      */
-   @Operation(summary = "查询项目下所有的设备类型", description = "")
+    @Operation(summary = "查询项目下所有的设备类型", description = "")
     @PostMapping(value = ["/category"])
     fun equipClassCode(): SQueryResponse<DefClass> {
         return customSqlLabslService.equipTypeStatistics()

+ 58 - 0
equip-component/src/main/kotlin/com/persagy/server/controllers/planar/PlanarController.kt

@@ -0,0 +1,58 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.controllers.planar
+
+import com.persagy.server.models.planar.PlanarEquip
+import com.persagy.server.models.requests.PlanarEquipRequests
+import com.persagy.server.service.EquipmentComService
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+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 wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/10 13:47
+ */
+@Tag(name = "平面图")
+@RestController
+@RequestMapping("/planar")
+class PlanarController {
+
+
+    @Operation(summary = "查询设备信息", description = "")
+    @PostMapping(value = ["/equip"])
+    fun equipQuery(@RequestBody request: PlanarEquipRequests): SQueryResponse<PlanarEquip> {
+        return EquipmentComService.equipQuery(request)
+    }
+
+}

equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt → equip-component/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt → equip-component/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt → equip-component/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt → equip-component/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt → equip-component/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt → equip-component/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt → equip-component/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt


equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt → equip-component/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt


equip-componet/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt → equip-component/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt


equip-componet/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt → equip-component/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt


+ 0 - 0
equip-componet/src/main/kotlin/com/persagy/server/models/EquipComDel.kt


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini