Kaynağa Gözat

********************WX************************
数据同步:<wip>> <添加数据中心对象同步到中台,关系数据同步到中台>

zhangweixin 4 yıl önce
ebeveyn
işleme
4fed0e2d36
100 değiştirilmiş dosya ile 155 ekleme ve 3729 silme
  1. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/GeneralSystemCategory.kt
  2. 1 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointImage.kt
  3. 2 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ViewEquipSystem.kt
  4. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/base/BaseInfo.kt
  5. 0 179
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DPropertyDef.kt
  6. 0 161
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescription.kt
  7. 0 80
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescriptionProject.kt
  8. 0 64
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformScheme.kt
  9. 0 168
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformSchemeInfo.kt
  10. 0 46
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataSourceContent.kt
  11. 0 70
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictAirConditioner.kt
  12. 0 98
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBuildingFunctional.kt
  13. 0 86
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictClimate.kt
  14. 0 64
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictContaminationLevel.kt
  15. 0 86
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDevelop.kt
  16. 0 82
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDirection.kt
  17. 0 70
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictGreenBuildLev.kt
  18. 0 70
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictHeatingType.kt
  19. 0 70
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictInsulateType.kt
  20. 0 64
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictPollutionLevel.kt
  21. 0 124
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictProvincialCityCode.kt
  22. 0 80
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictRental.kt
  23. 0 58
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSeismicFortificationIntensity.kt
  24. 0 77
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DitcWeather.kt
  25. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipFamily.kt
  26. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipFamilyCategory.kt
  27. 0 65
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ExplainAllCategories.kt
  28. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/Family.kt
  29. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/GeneralSystemCategory.kt
  30. 0 59
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ProjectScheme.kt
  31. 0 162
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/PropertyDefControlInfo.kt
  32. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/SpaceInfoDic.kt
  33. 0 136
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictDatacenterProjectcustom.kt
  34. 0 106
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionDatallatformLog.kt
  35. 0 106
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionLog.kt
  36. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictScheme.kt
  37. 1 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeAndProject.kt
  38. 2 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeCategoty.kt
  39. 1 32
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MDoor.kt
  40. 2 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MLocation.kt
  41. 1 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MPoint.kt
  42. 1 28
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MWindow.kt
  43. 1 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlock.kt
  44. 1 18
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockFamilyItem.kt
  45. 1 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockSource.kt
  46. 1 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentShaft.kt
  47. 0 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelFloor.kt
  48. 1 19
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelShaft.kt
  49. 1 41
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.kt
  50. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt
  51. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt
  52. 2 41
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.kt
  53. 0 39
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt
  54. 1 41
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.kt
  55. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.kt
  56. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.kt
  57. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.kt
  58. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.kt
  59. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.kt
  60. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.kt
  61. 1 42
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.kt
  62. 1 41
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.kt
  63. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt
  64. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt
  65. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sp.kt
  66. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Sy.kt
  67. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkTwo.kt
  68. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkOne.kt
  69. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkOne.kt
  70. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireWaterNetworkTwo.kt
  71. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkTwo.kt
  72. 1 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubPrepare.kt
  73. 0 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkThree.kt
  74. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.kt
  75. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.kt
  76. 2 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.kt
  77. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.kt
  78. 1 21
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.kt
  79. 1 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/logs/DataCenterLogSync.kt
  80. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  81. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt
  82. 32 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/FloorOutline.kt
  83. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt
  84. 33 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/SpaceOutline.kt
  85. 5 24
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/TenantWithCount.kt
  86. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdForEqList.kt
  87. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdForSyList.kt
  88. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdInSyList.kt
  89. 1 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Bd.kt
  90. 1 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Fl.kt
  91. 1 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sh.kt
  92. 1 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Si.kt
  93. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sp.kt
  94. 1 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sy.kt
  95. 11 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForFl.kt
  96. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForFlList.kt
  97. 1 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForSh.kt
  98. 1 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqInSi.kt
  99. 1 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqInSpBase.kt
  100. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqInSpBaseList.kt

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -46,13 +45,11 @@ class GeneralSystemCategory : Serializable {
     @Schema(description = "设备分类编码")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备分类名字*/
     @Schema(description = "设备分类名字")
     @Column(name = "name")
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
-} // Class GeneralSystemCategory
+}

+ 1 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointImage.kt

@@ -26,7 +26,6 @@
 
 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 javax.persistence.Column
@@ -46,7 +45,6 @@ class PointImage : SBaseEntity() {
     @Schema(description =" 图片key")
     @Id
     @Column(name = "id")
-    @JSONField(name = "key")
     var id: String? = null
 
     /** 图片类型 */
@@ -64,4 +62,4 @@ class PointImage : SBaseEntity() {
     @Column(name = "object_id")
     var objectId: String? = null
 
-} // Class PointImage
+}

+ 2 - 7
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ViewEquipSystem.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -44,24 +43,20 @@ class ViewEquipSystem : Serializable {
     /** 系统id */
     @Schema(description = "系统id")
     @Column(name = "id")
-    @JSONField(name = "sysID")
     var id: String? = null
 
     /** 系统分类 */
     @Schema(description = "系统分类")
-    @Column(name = "category")
     var category: String? = null
 
     /** 系统名称 */
     @Schema(description = "系统名称")
-    @Column(name = "sys_name")
-    @JSONField(name = "SysName")
+    @Column(name = "name")
     var name: String? = null
 
     /** 系统本地名称 */
     @Schema(description = "系统本地名称")
-    @Column(name = "sys_local_name")
-    @JSONField(name = "SysLocalName")
+    @Column(name = "local_name")
     var localName: String? = null
 
     /** 设备id */

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

@@ -47,4 +47,4 @@ open class BaseInfo : SBaseEntity() {
     @JSONField(serialzeFeatures = [SerializerFeature.WriteMapNullValue])
     open var objectType: String? = null
 
-} // Class BaseInfo
+}

+ 0 - 179
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DPropertyDef.kt

@@ -1,179 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Table
-
-/**
- * 数据字典说明实体类
- *
- * @author 张维新
- */
-@Schema(description = "数据字典说明")
-@Table(name = "dict.property_def")
-class DPropertyDef : BaseInfo() {
-
-    /** 一级标签 */
-    @Schema(description = "一级标签")
-    @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
-    var firstTag: String? = null
-//
-    /** 一级标签 */
-    @Schema(description = "一级标签")
-    @Column(name = "first_name")
-    @JSONField(name = "FirstName")
-    var firstName: String? = null
-
-    /** 二级标签 */
-    @Schema(description = "二级标签")
-    @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
-    var secondTag: String? = null
-
-    /** 二级名称 */
-    @Schema(description = "二级名称")
-    @Column(name = "second_name")
-    @JSONField(name = "SecondName")
-    var secondName: String? = null
-
-    /** 信息点名称 */
-    @Schema(description = "信息点名称")
-    @Column(name = "info_point_name")
-    @JSONField(name = "InfoPointName")
-    var infoPointName: String? = null
-
-    /** 信息点编码 */
-    @Schema(description = "信息点编码")
-    @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
-    var infoPointCode: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "datatype")
-    @JSONField(name = "DataType")
-    var dataType: String? = null
-
-    /** 输入方式 */
-    @Schema(description = "输入方式")
-    @Column(name = "inputmode")
-    @JSONField(name = "InputMode")
-    var inputMode: String? = null
-
-    /** 单位 */
-    @Schema(description = "单位")
-    @Column(name = "unit")
-    @JSONField(name = "Unit")
-    var unit: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 父指针 */
-    @Schema(description = "父指针")
-    @Column(name = "parent_id")
-    @JSONField(name = "ParentId")
-    var parentId: String? = null
-
-    /** 标记 */
-    @Schema(description = "标记")
-    @Column(name = "flag")
-    @JSONField(name = "Flag")
-    var  flag: String? = null
-
-    /** 字典选择 */
-    @Schema(description = "字典选择")
-    @Column(name = "datasource")
-    @JSONField(name = "DataSource",serialize=false)
-    var dataSource: String? = null
-
-    /** 备注 */
-    @Schema(description = "字典选择")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-    /** 优先级 */
-    @Schema(description = "优先级")
-    @Column(name = "priority")
-    @JSONField(name = "Priority")
-    var priority: String? = null
-
-    /** 路径 */
-    @Schema(description = "路径")
-    @JSONField(name = "Path")
-    var path: String? = null
-        get() {
-            return if (firstTag == "基本信息"|| firstTag.isNullOrEmpty()){
-                infoPointCode
-            }else{
-                if (secondTag.isNullOrEmpty()){
-                    "$firstTag.$infoPointCode"
-                }else{
-                    "$firstTag.$secondTag.$infoPointCode"
-                }
-            }
-        }
-
-    /** 是否显示 */
-    @Schema(description = "是否显示")
-    @Column(name = "visible")
-    @JSONField(name = "Visible")
-    var visible: Boolean? = null
-
-    /** 是否编辑 */
-    @Schema(description = "是否编辑")
-    @Column(name = "editable")
-    @JSONField(name = "Editable")
-    var editable: Boolean? = null
-
-    /** 排序 */
-    @Schema(description = "排序")
-    @Column(name = "sort")
-    @JSONField(name = "Sort")
-    var sort: Int? = null
-
-    /** 禁止操作 */
-    @Schema(description = "禁止操作")
-    @Column(name = "un_disabled")
-    @JSONField(name = "UnDisabled")
-    var unDisabled: Boolean? = null
-
-    /** 字典内容 */
-    @Schema(description = "字典内容")
-    @JSONField(name = "Content")
-    var content: ArrayList<DPropertyDef>? = null
-
-} // Class PropertyDef

+ 0 - 161
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescription.kt

@@ -1,161 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 字典说明
- *
- * @author 张维新
- */
-@Schema(description = "字典说明")
-@Table(name = "dict.property_def")
-class DataDictionaryDescription: BaseInfo() {
-
-    /** 一级标签 */
-    @Schema(description = "一级标签")
-    @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
-    var firstTag: String? = ""
-
-    /** 一级名称 */
-    @Schema(description = "一级名称")
-    @Column(name = "first_name")
-    @JSONField(name = "FirstName")
-    var firstName: String? = ""
-
-    /** 二级标签 */
-    @Schema(description = "二级标签")
-    @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
-    var secondTag: String? = ""
-
-    /** 二级名称 */
-    @Schema(description = "二级名称")
-    @Column(name = "second_name")
-    @JSONField(name = "SecondName")
-    var secondName: String? = ""
-
-    /** 信息点名称 */
-    @Schema(description = "信息点名称")
-    @Column(name = "info_point_name")
-    @JSONField(name = "InfoPointName")
-    var infoPointName: String? = null
-
-    /** 信息点编码 */
-    @Schema(description = "信息点编码")
-    @Id
-    @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
-    var infoPointCode: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "datatype")
-    @JSONField(name = "DataType")
-    var dataType: String? = null
-
-    /** 输入方式 */
-    @Schema(description = "输入方式")
-    @Column(name = "inputmode")
-    @JSONField(name = "InputMode")
-    var inputMode: String? = null
-
-    /** 单位 */
-    @Schema(description = "单位")
-    @Column(name = "unit")
-    @JSONField(name = "Unit")
-    var unit: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Id
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 父指针 */
-    @Schema(description = "父指针")
-    @Column(name = "parent_id")
-    @JSONField(name = "ParentId")
-    var parentId: String? = null
-
-    /** 标记 */
-    @Schema(description = "标记")
-    @Column(name = "flag")
-    @JSONField(name = "Flag")
-    var  flag: String? = null
-
-    /** 字典选择 */
-    @Schema(description = "字典选择")
-    @Column(name = "datasource")
-    @JSONField(name = "DataSource",serialize=false)
-    var dataSource: String? = null
-
-    /** 备注 */
-    @Schema(description = "字典选择")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-    /** 优先级 */
-    @Schema(description = "优先级")
-    @Column(name = "priority")
-    @JSONField(name = "Priority")
-    var priority: String? = null
-
-    /** 是否显示 */
-    @Schema(description = "是否显示")
-    @Column(name = "visible")
-    @JSONField(name = "Visible")
-    var visible: Boolean? = null
-
-    /** 是否编辑 */
-    @Schema(description = "是否编辑")
-    @Column(name = "editable")
-    @JSONField(name = "Editable")
-    var editable: Boolean? = null
-
-    /** 排序 */
-    @Schema(description = "排序")
-    @Column(name = "sort")
-    @JSONField(name = "Sort")
-    var sort: Int? = null
-
-    /** 禁止操作 */
-    @Schema(description = "禁止操作")
-    @Column(name = "un_disabled")
-    @JSONField(name = "UnDisabled")
-    var unDisabled: Boolean? = null
-
-} // Class DataDictionaryDescription

+ 0 - 80
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescriptionProject.kt

@@ -1,80 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 项目定制化字典说明
- * 实体类默认值必须为null
- *
- *
- * @author 张维新
- */
-@Schema(description = "项目定制化字典说明")
-@Table(name = "dict.property_def_project")
-open class DataDictionaryDescriptionProject: BaseInfo() {
-
-    /** 信息点编码 */
-    @Schema(description = "信息点编码",required = true)
-    @Id
-    @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
-    var infoPointCode: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型",required = true)
-    @Id
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 是否显示 */
-    @Schema(description = "是否显示")
-    @Column(name = "visible")
-    @JSONField(name = "Visible")
-    var visible: Boolean? = null
-
-    /** 是否编辑 */
-    @Schema(description = "是否编辑")
-    @Column(name = "editable")
-    @JSONField(name = "Editable")
-    var editable: Boolean? = null
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Id
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-} // Class DataDictionaryDescriptionProject

+ 0 - 64
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformScheme.kt

@@ -1,64 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.service.models.SBaseEntity
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 物理世界自定义信息点方案
- *
- * @author 张维新
- */
-@Schema(description = "物理世界自定义信息点方案实体类")
-@Table(name = "dict.data_platform_scheme")
-class DataPlatformScheme : SBaseEntity() {
-
-    /** 方案ID */
-    @Schema(description = "方案ID")
-    @Id
-    @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
-    var schemeId: String? = null
-
-    /** 方案名称 */
-    @Schema(description = "方案名称")
-    @Column(name = "scheme_name")
-    @JSONField(name = "SchemeName")
-    var schemeName: String? = null
-
-    /** 备注 */
-    @Schema(description = "备注")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-} // Class DataPlatformScheme

+ 0 - 168
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformSchemeInfo.kt

@@ -1,168 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.service.models.SBaseEntity
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 自定义信息点具体信息
- *
- * @author 张维新
- */
-@Schema(description = "物理世界自定义信息点方案实体类")
-@Table(name = "dict.data_platform_scheme_info")
-class DataPlatformSchemeInfo : SBaseEntity() {
-
-    /** 一级标签 */
-    @Schema(description = "一级标签")
-    @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
-    var firstTag: String? = ""
-
-    /** 一级名称 */
-    @Schema(description = "一级名称")
-    @Column(name = "first_name")
-    @JSONField(name = "FirstName")
-    var firstName: String? = ""
-
-    /** 二级标签 */
-    @Schema(description = "二级标签")
-    @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
-    var secondTag: String? = ""
-
-    /** 二级名称 */
-    @Schema(description = "二级名称")
-    @Column(name = "second_name")
-    @JSONField(name = "SecondName")
-    var secondName: String? = ""
-
-    /** 信息点名称 */
-    @Schema(description = "信息点名称")
-    @Column(name = "info_point_name")
-    @JSONField(name = "InfoPointName")
-    var infoPointName: String? = null
-
-    /** 信息点编码 */
-    @Schema(description = "信息点编码")
-    @Id
-    @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
-    var infoPointCode: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "datatype")
-    @JSONField(name = "DataType")
-    var dataType: String? = null
-
-    /** 输入方式 */
-    @Schema(description = "输入方式")
-    @Column(name = "inputmode")
-    @JSONField(name = "InputMode")
-    var inputMode: String? = null
-
-    /** 单位 */
-    @Schema(description = "单位")
-    @Column(name = "unit")
-    @JSONField(name = "Unit")
-    var unit: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 父指针 */
-    @Schema(description = "父指针")
-    @Column(name = "parent_id")
-    @JSONField(name = "ParentId")
-    var parentId: String? = null
-
-    /** 标记 */
-    @Schema(description = "标记")
-    @Column(name = "flag")
-    @JSONField(name = "Flag")
-    var  flag: String? = null
-
-    /** 字典选择 */
-    @Schema(description = "字典选择")
-    @Column(name = "datasource")
-    @JSONField(name = "DataSource",serialize=false)
-    var dataSource: String? = null
-
-    /** 备注 */
-    @Schema(description = "字典选择")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-    /** 优先级 */
-    @Schema(description = "优先级")
-    @Column(name = "priority")
-    @JSONField(name = "Priority")
-    var priority: String? = null
-
-    /** 是否显示 */
-    @Schema(description = "是否显示")
-    @Column(name = "visible")
-    @JSONField(name = "Visible")
-    var visible: Boolean? = null
-
-    /** 是否编辑 */
-    @Schema(description = "是否编辑")
-    @Column(name = "editable")
-    @JSONField(name = "Editable")
-    var editable: Boolean? = null
-
-    /** 排序 */
-    @Schema(description = "排序")
-    @Column(name = "sort")
-    @JSONField(name = "Sort")
-    var sort: Int? = null
-
-    /** 方案id */
-    @Schema(description = "方案id")
-    @Id
-    @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
-    var schemeId: String? = null
-
-    /** 服务于哪个设备或部件、资产 */
-    @Schema(description = "服务于哪个设备或部件、资产")
-    @Id
-    @Column(name = "obj_type")
-    @JSONField(name = "ObjectType")
-    var objType: String? = null
-
-}  // Class DataPlatformSchemeInfo

+ 0 - 46
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataSourceContent.kt

@@ -1,46 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import java.io.Serializable
-
-/**
- * 数据选择内容
- *
- * @author 张维新
- */
-open class DataSourceContent : Serializable {
-    /** 编码 */
-    @JSONField(name = "code")
-    var code: String? = null
-
-    /** 名称 */
-    @JSONField(name = "name")
-    var name: String? = null
-
-} // Class DataSourceContent

+ 0 - 70
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictAirConditioner.kt

@@ -1,70 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 空调类型信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "空调类型信息实体类")
-@Table(name = "dict.dict_air_conditioner")
-open class DictAirConditioner: Serializable {
-
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "name_type")
-    @JSONField(name = "NameType")
-    var nameType: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: String? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: String? = null
-
-} // Class DictAirConditioner

+ 0 - 98
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBuildingFunctional.kt

@@ -1,98 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 建筑功能类型信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "建筑功能类型信息实体类")
-@Table(name = "dict.dict_building_functional")
-open class DictBuildingFunctional: Serializable {
-    /** 编码 */
-    @Schema(description = "编码")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 父节点 */
-    @Schema(description = "父节点")
-    @Column(name = "parent")
-    @JSONField(name = "Parent")
-    var parent: String? = null
-
-    /** 昼夜时间 */
-    @Schema(description = "昼夜时间")
-    @Column(name = "day_night_time")
-    @JSONField(name = "DayNightTime")
-    var dayNightTime: String? = null
-
-    /** 同类型建筑标签 */
-    @Schema(description = "同类型建筑标签")
-    @Column(name = "building_label")
-    @JSONField(name = "BuildingLabel")
-    var buildingLabel: String? = null
-
-    /** 备注 */
-    @Schema(description = "备注")
-    @Column(name = "remarks")
-    @JSONField(name = "Remarks")
-    var remarks: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: String? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: String? = null
-
-    /** 下一级节点 */
-    var dictBuildingFunctional : DictBuildingFunctional? = null
-    @JSONField(name = "Content")
-    var content: ArrayList<DictBuildingFunctional>? = null
-
-} // Class DictBuildingFunctionalMapper

+ 0 - 86
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictClimate.kt

@@ -1,86 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-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
-
-/**
- * 气候区信息实体类
- *
- * @author 张维新
- */
-@Schema(description = "气候区信息实体类")
-@Table(name = "dict.dict_climate")
-open class DictClimate: Serializable {
-
-    /** 编码 */
-    @Schema(description = "编码")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 父节点 */
-    @Schema(description = "父节点")
-    @Column(name = "parent")
-    @JSONField(name = "Parent")
-    var parent: String? = null
-
-    /** 说明 */
-    @Schema(description = "说明")
-    @Column(name = "explain")
-    @JSONField(name = "Info")
-    var explain: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: Date? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: Date? = null
-
-    /** 下一级节点 */
-    var content: ArrayList<DictClimate>? =null
-
-} // Class DictClimate

+ 0 - 64
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictContaminationLevel.kt

@@ -1,64 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 污秽等级
- *
- * @author 张维新
- */
-@Schema(description = "污秽等级")
-@Table(name = "dict.dict_contamination_level")
-class DictContaminationLevel: Serializable {
-
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 描述 */
-    @Schema(description = "描述")
-    @Column(name = "description")
-    @JSONField(name = "Description")
-    var description: String? = null
-
-} // Class DictPollutionLevel

+ 0 - 86
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDevelop.kt

@@ -1,86 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-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
-
-/**
- * 发展水平代码信息实体类
- *
- * @author 张维新
- */
-@Schema(description = "发展水平代码信息实体类")
-@Table(name = "dict.dict_develop")
-open class DictDevelop: Serializable {
-
-    /** 编码*/
-    @Schema(description = "编码")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称*/
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 父节点*/
-    @Schema(description = "父节点")
-    @Column(name = "parent")
-    @JSONField(name = "Parent")
-    var parent: String? = null
-
-    /** 说明*/
-    @Schema(description = "说明")
-    @Column(name = "remarks")
-    @JSONField(name = "Remarks")
-    var remarks: String? = null
-
-    /** 下一级 */
-    var content: ArrayList<DictDevelop>? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: Date? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: Date? = null
-
-} // Class DictDevelop

+ 0 - 82
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDirection.kt

@@ -1,82 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-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
-
-/**
- * 建筑朝向信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "建筑朝向信息实体类")
-@Table(name = "dict.dict_direction")
-open class DictDirection: Serializable {
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 方向中文描述 */
-    @Schema(description = "方向中文描述")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 方向英文描述 */
-    @Schema(description = "方向英文描述")
-    @Column(name = "direction_code")
-    @JSONField(name = "DirectionCode")
-    var directionCode: String? = null
-
-    /** 与正北方向顺时针夹角 */
-    @Schema(description = "与正北方向顺时针夹角")
-    @Column(name = "angle")
-    @JSONField(name = "Angle")
-    var angle: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: Date? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: Date? = null
-
-} // Class DictDirection

+ 0 - 70
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictGreenBuildLev.kt

@@ -1,70 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 绿建等级信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "绿建等级信息实体类")
-@Table(name = "dict.dict_green_build_lev")
-open class DictGreenBuildLev: Serializable {
-
-    /** ID */
-    @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 = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: String? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: String? = null
-
-} // Class DictGreenBuildLev

+ 0 - 70
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictHeatingType.kt

@@ -1,70 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 采暖类型信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "采暖类型信息实体类")
-@Table(name = "dict.dict_heating_type")
-open class DictHeatingType: Serializable {
-
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "name_type")
-    @JSONField(name = "NameType")
-    var nameType: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: String? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: String? = null
-
-} // Class DictHeatingType

+ 0 - 70
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictInsulateType.kt

@@ -1,70 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 保温类型信息实体类
- *
- * @author  张维新
- */
-@Schema(description = "保温类型信息实体类")
-@Table(name = "dict.dict_insulate_type")
-open class DictInsulateType: Serializable {
-
-    /** ID */
-    @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 = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: String? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: String? = null
-
-} // Class DictInsulateType

+ 0 - 64
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictPollutionLevel.kt

@@ -1,64 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.v3.oas.annotations.media.Schema
-import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 污染等级
- *
- * @author 张维新
- */
-@Schema(description = "污染等级")
-@Table(name = "dict.dict_pollution_level")
-class DictPollutionLevel: Serializable {
-
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 描述 */
-    @Schema(description = "描述")
-    @Column(name = "description")
-    @JSONField(name = "Description")
-    var description: String? = null
-
-} // Class DictPollutionLevel

+ 0 - 124
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictProvincialCityCode.kt

@@ -1,124 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 省市区代码实体类
- *
- * @author 张维新
- */
-@Schema(description = "省市区代码实体类")
-@Table(name = "dict.dict_provincial_city_code")
-open class DictProvincialCityCode : BaseInfo() {
-
-    /** 省或市或区代码 */
-    @Schema(description = "省或市或区代码")
-    @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 = "parent")
-    @JSONField(name = "Parent")
-    var parent: String? = null
-
-    /** 邮编代码 */
-    @Schema(description = "邮编代码")
-    @Column(name = "code")
-    @JSONField(name = "Code")
-    var code: String? = null
-
-    /** 经度 */
-    @Schema(description = "经度")
-    @Column(name = "longitude")
-    @JSONField(name = "Longitude")
-    var longitude: String? = null
-
-    /** 纬度 */
-    @Schema(description = "纬度")
-    @Column(name = "latitude")
-    @JSONField(name = "Latitude")
-    var latitude: String? = null
-
-    /** 海拔 */
-    @Schema(description = "海拔")
-    @Column(name = "altitude")
-    @JSONField(name = "Altitude")
-    var altitude: String? = null
-
-    /** 气候区 */
-    @Schema(description = "气候区")
-    @Column(name = "climate_zone")
-    @JSONField(name = "ClimateZone")
-    var climateZone: String? = null
-
-    /** 发展水平 */
-    @Schema(description = "发展水平")
-    @Column(name = "development_level")
-    @JSONField(name = "DevelopmentLevel")
-    var developmentLevel: String? = null
-
-    /** 地理分区 */
-    @Schema(description = "地理分区")
-    @Column(name = "geographical_zoning")
-    @JSONField(name = "GeographicalZoning")
-    var geographicalZoning: String? = null
-
-    /** 0代表普通 1代表直辖市 */
-    @Schema(description = "0代表普通 1代表直辖市")
-    @Column(name = "special_cities")
-    @JSONField(name = "SpecialCities")
-    var specialCities: Int = 0
-
-    /** 城市类型 */
-    @Schema(description = "城市类型")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 城市类型编码 */
-    @Schema(description = "城市类型编码")
-    @Column(name = "typecode")
-    @JSONField(name = "TypeCode")
-    var typeCode: String? = null
-
-} // Class DictProvincialCityCode

+ 0 - 80
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictRental.kt

@@ -1,80 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.v3.oas.annotations.media.Schema
-import java.util.*
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 租赁业态类型
- *
- * @author 张维新
- */
-@Schema(description = "租赁业态类型实体类")
-@Table(name = "dict.dict_rental")
-open class DictRental : BaseInfo() {
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 典型商铺 */
-    @Schema(description = "典型商铺")
-    @Column(name = "typical_shops")
-    @JSONField(name = "TypicalShops")
-    var typicalShops: String? = null
-
-    /** 分类原因 */
-    @Schema(description = "分类原因")
-    @Column(name = "classification_cause")
-    @JSONField(name = "ClassificationCause")
-    var classificationCause: String? = null
-
-    /** 关系值 */
-    @Schema(description = "关系值")
-    @Column(name = "parent")
-    @JSONField(name = "Parent")
-    var parent: String? = ""
-
-    /** 下一级内容 */
-    @JSONField(name = "Content")
-    var content: ArrayList<DictRental>? = null
-
-} // Class DictRental

+ 0 - 58
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSeismicFortificationIntensity.kt

@@ -1,58 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 抗震设防烈度
- *
- * @author 张维新
- */
-@Schema(description = "抗震设防烈度")
-@Table(name = "dict.dict_seismic_fortification_intensity")
-class DictSeismicFortificationIntensity : BaseInfo(){
-
-    /** ID */
-    @Schema(description = "ID")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-} // Class DictSeismicFortificationIntensity

+ 0 - 77
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DitcWeather.kt

@@ -1,77 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-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
-
-/**
- * 天气状况信息实体类
- *
- * @author 张维新
- */
-@Schema(description = "天气状况信息实体类")
-@Table(name = "dict.ditc_weather")
-open class DitcWeather: Serializable {
-
-    /** 编码 */
-    @Schema(description = "编码")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 图形标志 */
-    @Schema(description = "图形标志")
-    @Column(name = "graphic_logo")
-    @JSONField(name = "GraphicLogo")
-    var graphicLogo: String? = null
-
-    /** 更新时间 */
-    @Schema(description = "更新时间")
-    @Column(name = "last_update")
-    @JSONField(name = "LastUpdate")
-    var lastUpdate: Date? = null
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @Column(name = "create_time")
-    @JSONField(name = "CreateTime")
-    var createTime: Date? = null
-
-} // Class DitcWeather

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dict
 
-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
@@ -57,13 +56,11 @@ class EquipFamily : BaseInfo() {
     @Schema(description = "设备分类编码")
     @Id
     @Column(name = "equip_code")
-    @JSONField(name = "EquipCode")
     var equipCode: String? = null
 
     /** 设备分类名字*/
     @Schema(description = "设备分类名字")
     @Column(name = "equip_name")
-    @JSONField(name = "EquipName")
     var equipName: String? = null
 
-} // Class EquipFamily
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dict
 
-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
@@ -46,13 +45,11 @@ class EquipFamilyCategory : BaseInfo() {
     @Schema(description = "族编码")
     @Id
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 族名称 */
     @Schema(description = "族名称")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
     var familyName: String? = null
 
-} // Class EquipFamilyCategory
+}

+ 0 - 65
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ExplainAllCategories.kt

@@ -1,65 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 所有专业 设备 系统分类
- *
- * @author 张维新
- */
-@Schema(description = "所有专业 设备 系统分类")
-@Table(name = "dict.class_def")
-class ExplainAllCategories : BaseInfo() {
-
-    /** 编码code */
-    @Schema(description = "编码code")
-    @Id
-    @Column(name = "id")
-    @JSONField(name = "Code")
-    var id: String? = null
-
-    /** 名称 */
-    @Schema(description = "名称")
-    @Column(name = "name")
-    @JSONField(name = "Name")
-    var name: String? = null
-
-    /** 父类指针 */
-    @Schema(description = "父类指针")
-    @Id
-    @Column(name = "parent_id")
-    @JSONField(name = "ParentId")
-    var parentId: String? = null
-
-} // Class ExplainAllCategories

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dict
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -46,13 +45,11 @@ class Family : SBaseEntity() {
     @Schema(description = "设备族code")
     @Id
     @Column(name = "code")
-    @JSONField(name = "Code")
     var code: String? = null
 
     /** 设备族code */
     @Schema(description = "设备族code")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
-} // class Family
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dict
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -46,13 +45,11 @@ class GeneralSystemCategory : Serializable {
     @Schema(description = "设备分类编码")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备分类名字*/
     @Schema(description = "设备分类名字")
     @Column(name = "name")
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
-} // Class GeneralSystemCategory
+}

+ 0 - 59
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ProjectScheme.kt

@@ -1,59 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.service.models.SBaseEntity
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 项目和自定义信息点方案关系实体类
- *
- * @author  张维新
- */
-@Schema(description = "建筑信息实体类")
-@Table(name = "dict.project_scheme")
-class ProjectScheme : SBaseEntity(){
-
-    /** 方案ID */
-    @Schema(description = "方案ID")
-    @Column(name = "scheme_id")
-    @Id
-    @JSONField(name = "SchemeId")
-    var schemeId: String? = null
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Id
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-} // Class ProjectScheme

+ 0 - 162
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/PropertyDefControlInfo.kt

@@ -1,162 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dict
-
-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
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 字典 信息对照
- *
- * @author 张维新
- */
-@Schema(description = "字典 信息对照")
-@Table(name = "dict.property_def_control_info")
-class PropertyDefControlInfo: BaseInfo() {
-
-    /** 一级标签 */
-    @Schema(description = "一级标签")
-    @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
-    var firstTag: String? = ""
-
-    /** 一级名称 */
-    @Schema(description = "一级名称")
-    @Column(name = "first_name")
-    @JSONField(name = "FirstName")
-    var firstName: String? = ""
-
-    /** 二级标签 */
-    @Schema(description = "二级标签")
-    @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
-    var secondTag: String? = ""
-
-    /** 二级名称 */
-    @Schema(description = "二级名称")
-    @Column(name = "second_name")
-    @JSONField(name = "SecondName")
-    var secondName: String? = ""
-
-    /** 信息点名称 */
-    @Schema(description = "信息点名称")
-    @Column(name = "info_point_name")
-    @JSONField(name = "InfoPointName")
-    var infoPointName: String? = null
-
-    /** 信息点编码 */
-    @Schema(description = "信息点编码")
-    @Id
-    @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
-    var infoPointCode: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Column(name = "datatype")
-    @JSONField(name = "DataType")
-    var dataType: String? = null
-
-    /** 输入方式 */
-    @Schema(description = "输入方式")
-    @Column(name = "inputmode")
-    @JSONField(name = "InputMode")
-    var inputMode: String? = null
-
-    /** 单位 */
-    @Schema(description = "单位")
-    @Column(name = "unit")
-    @JSONField(name = "Unit")
-    var unit: String? = null
-
-    /** 类型 */
-    @Schema(description = "类型")
-    @Id
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: String? = null
-
-    /** 父指针 */
-    @Schema(description = "父指针")
-    @Column(name = "parent_id")
-    @JSONField(name = "ParentId")
-    var parentId: String? = null
-
-    /** 标记 */
-    @Schema(description = "标记")
-    @Column(name = "flag")
-    @JSONField(name = "Flag")
-    var  flag: String? = null
-
-    /** 字典选择 */
-    @Schema(description = "字典选择")
-    @Column(name = "datasource")
-    @JSONField(name = "DataSource",serialize=false)
-    var dataSource: String? = null
-
-    /** 备注 */
-    @Schema(description = "字典选择")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-    /** 优先级 */
-    @Schema(description = "优先级")
-    @Column(name = "priority")
-    @JSONField(name = "Priority")
-    var priority: String? = null
-
-    /** 是否显示 */
-    @Schema(description = "是否显示")
-    @Column(name = "visible")
-    @JSONField(name = "Visible")
-    var visible: Boolean? = null
-
-    /** 是否编辑 */
-    @Schema(description = "是否编辑")
-    @Column(name = "editable")
-    @JSONField(name = "Editable")
-    var editable: Boolean? = null
-
-    /** 排序 */
-    @Schema(description = "排序")
-    @Column(name = "sort")
-    @JSONField(name = "Sort")
-    var sort: Int? = null
-
-    /** 禁止操作 */
-    @Schema(description = "禁止操作")
-    @Column(name = "un_disabled")
-    @JSONField(name = "UnDisabled")
-    var unDisabled: Boolean? = null
-
-} // Class PropertyDefControlInfo

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dict
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -42,13 +41,11 @@ class SpaceInfoDic: Serializable {
     /** 空间类型id */
     @Schema(description = "空间类型id")
     @Column(name = "object_type")
-    @JSONField(name =  "ObjectType")
     var objectType: String? = null
 
     /** 空间类型名称 */
     @Schema(description = "空间类型名称")
     @Column(name = "object_type_name")
-    @JSONField(name =  "ObjectTypeName")
     var objectTypeName: String? = null
 
-} // Class SpaceInfoDic
+}

+ 0 - 136
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictDatacenterProjectcustom.kt

@@ -1,136 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dictdatacenter
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 数据中心字典类型对应项目自定义转换
- *
- * @author 张维新
- */
-@Schema(description = "数据中心字典类型对应项目自定义转换")
-@Table(name = "dictcustom.dict_datacenter_project_custom")
-open class DictDatacenterProjectcustom : RBaseInfo() {
-
-    /** 方案ID */
-    @Schema(description = "方案ID")
-    @Id
-    @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
-    var schemeId: String? = null
-
-    /** 数据中心数据类型 */
-    @Schema(description = "数据中心数据类型")
-    @Column(name = "dc_category")
-    @JSONField(name = "DcCategory")
-    var dcCategory: String? = null
-
-    /** 项目自定义数据类型 */
-    @Schema(description = "项目自定义数据类型")
-    @Id
-    @Column(name = "custom_category")
-    @JSONField(name = "CustomCategory")
-    var customCategory: String? = null
-
-    /** 类型1为专业 2为系统 3为设备 4为部件 */
-    @Schema(description = "数据中心数据类型")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: Int? = null
-
-    /** 数据中心类型名称 */
-    @Schema(description = "数据中心类型名称")
-    @Column(name = "dc_category_name")
-    @JSONField(name = "DcCategoryName")
-    var dcCategoryName: String? = null
-
-    /** 项目自定义类型名称 */
-    @Schema(description = "项目自定义类型名称")
-    @Column(name = "custom_category_name")
-    @JSONField(name = "CustomCategoryName")
-    var customCategoryName: String? = null
-
-    /** 数据中心向物理世界转化脚本信息 */
-    @Schema(description = "数据中心向物理世界转化脚本信息")
-    @Column(name = "switch_rule")
-    @JSONField(name = "SwitchRule")
-    var switchRule: String? = null
-
-    /** 物理世界向数据中心转换脚本 */
-    @Schema(description = "物理世界向数据中心转换脚本")
-    @Column(name = "switch_rule_dataplatform")
-    @JSONField(name = "SwitchRuleDataplatform")
-    var switchRuleDataplatform: String? = null
-
-    /** 备注信息 */
-    @Schema(description = "备注信息")
-    @Column(name = "note")
-    @JSONField(name = "Note")
-    var note: String? = null
-
-    /** 自定义父类指针 */
-    @Schema(description = "自定义父类指针")
-    @Column(name = "parent_id_custom")
-    @JSONField(name = "ParentIdCustom")
-    var parentIdCustom: String? = null
-
-    /** 数据中心父指针 */
-    @Schema(description = "数据中心父指针")
-    @Column(name = "parent_id_dc")
-    @JSONField(name = "ParentIdDc")
-    var parentIdDc: String? = null
-
-    /** 设备族 */
-    @Schema(description = "设备族")
-    @Column(name = "family")
-    @JSONField(name = "Family")
-    var family: String? = null
-
-    /** 数据中心至物理世界 0不需要脚本, 1为需要脚本 */
-    @Schema(description = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
-    @Column(name = "datacenter_sign")
-    @JSONField(name = "DatacenterSign")
-    var datacenterSign: Int? = null
-
-    /** 数据中心至物理世界 0不需要脚本, 1为需要脚本 */
-    @Schema(description = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
-    @Column(name = "dataplatform_sign")
-    @JSONField(name = "DataplatformSign")
-    var dataplatformSign: Int? = null
-
-    /** 下一级内容 */
-    @Schema(description = "下一级内容")
-    @JSONField(name = "Content")
-    var content = ArrayList<DictDatacenterProjectcustom>()
-
-} // class DictDatacenterProjectcustom

+ 0 - 106
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionDatallatformLog.kt

@@ -1,106 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dictdatacenter
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 自定义字典 未转换成功的对象 物理世界-数据中心
- *
- * @author 张维新
- */
-@Schema(description = "自定义字典 未转换成功的对象")
-@Table(name = "dictcustom.dict_type_conversion_dataplatform_log")
-class DictTypeConversionDatallatformLog : RBaseInfo(){
-
-    /** ID */
-    @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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: 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 = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "category_name")
-    @JSONField(name = "CategoryName")
-    var categoryName: String? = null
-
-    /** 对象类型 1设备 2部件 */
-    @Schema(description = "对象类型 1设备 2部件")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: Int? = null
-
-} // class DictTypeConversionDatallatformLog

+ 0 - 106
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionLog.kt

@@ -1,106 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.datacenter.models.entities.dictdatacenter
-
-import com.alibaba.fastjson.annotation.JSONField
-import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
-import javax.persistence.Table
-
-/**
- * 自定义字典 未转换成功的对象 数据中心-物理世界
- *
- * @author 张维新
- */
-@Schema(description = "自定义字典 未转换成功的对象")
-@Table(name = "dictcustom.dict_type_conversion_datacenter_log")
-class DictTypeConversionLog : RBaseInfo(){
-
-    /** ID */
-    @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
-
-    /** 项目id */
-    @Schema(description = "项目id")
-    @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    var projectId: String? = null
-
-    /** 建筑id */
-    @Schema(description = "建筑id")
-    @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
-    var buildingId: String? = null
-
-    /** 楼层id */
-    @Schema(description = "楼层id")
-    @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
-    var floorId: 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 = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
-
-    /** 类型名称 */
-    @Schema(description = "类型名称")
-    @Column(name = "category_name")
-    @JSONField(name = "CategoryName")
-    var categoryName: String? = null
-
-    /** 对象类型 1设备 2部件 */
-    @Schema(description = "对象类型 1设备 2部件")
-    @Column(name = "type")
-    @JSONField(name = "Type")
-    var type: Int? = null
-
-} // class DictTypeConversionLog

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -47,22 +46,18 @@ class DictScheme: Serializable {
     @Schema(description = "全局id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: Int? = null
 
     @Schema(description = "方案名")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     @Schema(description = "备注")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: String? = null
 
     @Schema(description = "集团id")
     @Column(name = "group_id")
-    @JSONField(name = "GroupId")
     var groupId: String? = null
 
-} // Class DictScheme
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -47,19 +46,16 @@ class DictSchemeAndProject: Serializable {
     @Schema(description = "全局id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var  id: Int? = null
 
     /** 方案id */
     @Schema(description = "方案id")
     @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
     var schemeId: Int? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
-} // Class DictSchemeAndProject
+}

+ 2 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeCategoty.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -34,6 +33,7 @@ import javax.persistence.Id
 import javax.persistence.Table
 
 /**
+ * 方案
  *
  * @author  wx
  * @date  2020/9/20 17:19
@@ -46,17 +46,14 @@ class DictSchemeCategoty: Serializable {
     @Schema(description = "全局id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id :Int? =  0
 
     @Schema(description = "方案id")
     @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
     var schemeId :Int? =  0
 
     @Schema(description = "对象类型")
     @Column(name = "class_code")
-    @JSONField(name = "ClassCode")
     var classCode: String? = null
 
-} // Class DictSchemeCategoty
+}

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

@@ -26,9 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -43,108 +41,79 @@ class MDoor : SBaseEntity() {
     /** 名称 */
     @Schema(description = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
-    @JsonProperty("Name")
     var name: String? = 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 = "location")
-    @JSONField(name = "Location")
-    @JsonProperty("Location")
     var location: MLocation? = null
 
     /** 轮廓线 */
     @Schema(description = "轮廓线")
     @Column(name = "outline")
-    @JSONField(name = "OutLine")
-    @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 面方向 */
     @Schema(description = "面方向")
     @Column(name = "face_direction")
-    @JSONField(name = "FaceDirection")
-    @JsonProperty("FaceDirection")
     var faceDirection : MPoint? = null
 
     /** Hand方向 */
     @Schema(description = "Hand方向")
     @Column(name = "hand_direction")
-    @JSONField(name = "HandDirection")
-    @JsonProperty("HandDirection")
     var handDirection : MPoint? = null
 
     /** 类型中文名称 */
     @Schema(description = "类型中文名称")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
-    @JsonProperty("FamilyName")
     var familyName: String? = null
 
     /** 族符号 */
     @Schema(description = "族符号")
     @Column(name = "family_symbol")
-    @JSONField(name = "FamilySymbol")
-    @JsonProperty("FamilySymbol")
     var familySymbol: String? = null
 
-    @JSONField(name = "Thick")
     @Schema(description = "厚度")
     @Column(name = "thick")
-    @JsonProperty("Thick")
     var thick : Double? = null
 
     /** 所属墙 */
     @Schema(description = "所属墙")
-    @JSONField(name = "WallId")
     @Column(name = "wall_id")
     var wallId: String? = null
 
     /** 拥有者的RevitId */
     @Schema(description = "拥有者的RevitId")
     @Column(name = "owner")
-    @JSONField(name = "Owner")
-    @JsonProperty("Owner")
     var owner: String? = null
 
     /** 模型id */
     @Schema(description = "模型id")
     @Column(name = "id", updatable = false)
-    @JSONField(name = "Id")
     @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
 
-} // Class MDoor
+}

+ 2 - 7
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MLocation.kt

@@ -26,8 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype
 
-import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
 import java.io.Serializable
 
 /**
@@ -35,12 +33,9 @@ import java.io.Serializable
  */
 class MLocation : Serializable {
 
-    @JSONField(name = "Type")
-    @JsonProperty("Type")
+
     val type : String? = null
 
-    @JSONField(name = "Points")
-    @JsonProperty("Points")
     var points : ArrayList<MPoint>? = null
 
-} // Class MLocation
+}

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

@@ -26,9 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  *
@@ -36,17 +34,11 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @JsonIgnoreProperties(ignoreUnknown = true)
 class MPoint (x : Double, y : Double, z : Double){
 
-    @JSONField(name = "X")
-    @JsonProperty("X")
     var x : Double = x
 
-    @JSONField(name = "Y")
-    @JsonProperty("Y")
     var y : Double = y
 
-    @JSONField(name = "Z")
-    @JsonProperty("Z")
     var z : Double = z
 
     constructor() : this(0.0, 0.0 , 0.0)
-} // Class MPoint
+}

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

@@ -26,9 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -49,93 +47,68 @@ class MWindow : SBaseEntity(){
     /** 模型所属楼层的id, 是uuid */
     @Schema(description = "模型所属楼层的id, 是uuid")
     @Column(name = "model_floor_id")
-    @JsonProperty("ModelFloorId")
-    @JSONField(name = "ModelFloorId")
     var modelFloorId: 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
 
     /** 所属墙 */
     @Schema(description = "所属墙")
     @Column(name = "wall_id")
-    @JSONField(name = "WallId")
     var wallId: String? = null
 
     /** 拥有者的RevitId */
     @Schema(description = "拥有者的RevitId")
     @Column(name = "owner")
-    @JSONField(name = "Owner")
-    @JsonProperty("Owner")
     var owner: String? = null
 
     /** 名称 */
     @Schema(description = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
-    @JsonProperty("Name")
     var name: String? = null
 
     /** 宽度 */
     @Schema(description = "宽度")
     @Column(name = "width")
-    @JSONField(name = "Width")
     var width: Double? = null
 
     /** 定位点 */
     @Schema(description = "定位点")
     @Column(name = "location")
-    @JSONField(name = "Location")
-    @JsonProperty("Location")
     var location: MLocation? = null
 
     /** 轮廓线 */
     @Schema(description = "轮廓线")
     @Column(name = "outline")
-    @JSONField(name = "OutLine")
-    @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 类型中文名称 */
     @Schema(description = "类型中文名称")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
-    @JsonProperty("FamilyName")
     var familyName: String? = null
 
     /** 族符号 */
     @Schema(description = "族符号")
     @Column(name = "family_symbol")
-    @JSONField(name = "FamilySymbol")
-    @JsonProperty("FamilySymbol")
     var familySymbol: String? = null
 
-    @JSONField(name = "Thick")
     @Schema(description = "厚度")
     @Column(name = "thick")
-    @JsonProperty("Thick")
     var thick : Double? = null
 
-} // Class MWindow
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -45,85 +44,71 @@ open class ConnectedBlock : RBaseInfo() {
     @Schema(description = "id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: Long? = null
 
     /** id1 */
     @Schema(description = "id1")
     @Column(name = "id1")
-    @JSONField(name = "Id1")
     var id1: String? = null
 
     /** type1 */
     @Schema(description = "type1")
     @Column(name = "type1")
-    @JSONField(name = "Type1")
     var type1: String? = null
 
     /** model_id1 */
     @Schema(description = "model_id1")
     @Column(name = "model_id1")
-    @JSONField(name = "ModelId1")
     var modelId1: String? = null
 
     /** id2 */
     @Schema(description = "id2")
     @Column(name = "id2")
-    @JSONField(name = "Id2")
     var id2: String? = null
 
     /** type2 */
     @Schema(description = "type2")
     @Column(name = "type2")
-    @JSONField(name = "Type2")
     var type2: String? = null
 
     /** model_id2 */
     @Schema(description = "model_id2")
     @Column(name = "model_id2")
-    @JSONField(name = "ModelId2")
     var modelId2: String? = null
 
     /** direction */
     @Schema(description = "direction, 1表示从id1流向id2, -1 表示从id2流向id1, 0表示不确定流向")
     @Column(name = "direction")
-    @JSONField(name = "Direction")
     var direction: Int? = null
 
     /** block_id */
     @Schema(description = "block_id")
     @Column(name = "block_id")
-    @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** project_id */
     @Schema(description = "project_id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** depth */
     @Schema(description = "depth")
     @Column(name = "depth")
-    @JSONField(name = "Depth")
     var depth: String? = null
 
     /** mep_system_type */
     @Schema(description = "mep_system_type")
     @Column(name = "mep_system_type")
-    @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** domain */
     @Schema(description = "domain")
     @Column(name = "domain")
-    @JSONField(name = "Domain")
     var domain: String? = null
 
     /** building_id */
     @Schema(description = "building_id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
-} // Class ConnectedBlock
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -44,97 +43,81 @@ open class ConnectedBlockFamilyItem : RBaseInfo() {
     /** id */
     @Schema(description = "id")
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** type */
     @Schema(description = "type")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** model_id */
     @Schema(description = "model_id")
     @Column(name = "model_id")
-    @JSONField(name = "ModelId")
     var modelId: String? = null
 
     /** block_id */
     @Schema(description = "block_id")
     @Column(name = "block_id")
-    @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 系统类型所属域 */
     @Schema(description = "系统类型所属域")
     @Column(name = "domain")
-    @JSONField(name = "Domain")
     var domain: String? = null
 
     /** 系统类型名称 */
     @Schema(description = "系统类型名称")
     @Column(name = "mep_system_type")
-    @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** local_id */
     @Schema(description = "local_id")
     @Column(name = "local_id")
-    @JSONField(name = "LocalId")
     var localId: String? = null
 
     /** local_name */
     @Schema(description = "local_name")
     @Column(name = "local_name")
-    @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设备类型名 : 4位编码 */
     @Schema(description = "设备类型名")
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 模型中的id */
     @Schema(description = "模型中的id")
     @Column(name = "source_id")
-    @JSONField(name = "SourceId")
     var sourceId: String? = null
 
     /** 名字 */
     @Schema(description = "名字")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     /** family_name */
     @Schema(description = "family_name")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
     var familyName: String? = null
 
     /** family_symbol */
     @Schema(description = "family_symbol")
     @Column(name = "family_symbol")
-    @JSONField(name = "FamilySymbol")
     var familySymbol: String? = null
 
     /** true是源, false是末端 */
     @Schema(description = "true是源, false是末端")
     @Column(name = "is_source")
-    @JSONField(name = "IsSource")
     var isSource: Boolean? = null
 
-} // Class ConnectedBlockFamilyItem
+}

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

@@ -46,55 +46,46 @@ open class ConnectedBlockSource : RBaseInfo() {
     @Schema(description = "id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: Long? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 分块id */
     @Schema(description = "分块id")
     @Column(name = "block_id")
-    @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** 被指定的源的id */
     @Schema(description = "被指定的源的id")
     @Column(name = "source_id")
-    @JSONField(name = "SourceId")
     var sourceId: String? = null
 
     /** 被指定的源的类型 */
     @Schema(description = "被指定的源的类型")
     @Column(name = "source_type")
-    @JSONField(name = "SourceType")
     var sourceType: String? = null
 
     /** 系统类型所属域 */
     @Schema(description = "系统类型所属域")
     @Column(name = "domain")
-    @JSONField(name = "Domain")
     var domain: String? = null
 
     /** 系统类型名称 */
     @Schema(description = "系统类型名称")
     @Column(name = "mep_system_type")
-    @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** true是源, false是末端 */
     @Schema(description = "true是源, false是末端")
     @Column(name = "is_source")
-    @JSONField(name = "IsSource")
     var isSource: Boolean? = null
 
-} // Class ConnectedBlockSource
+}

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

@@ -49,51 +49,42 @@ open class RelEquipmentShaft : 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")
-    var category: String? = null
+    var classCode: String? = null
 
     /** 设备所在建筑id */
     @Schema(description = "设备所在建筑id")

+ 0 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelFloor.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 io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -46,85 +45,71 @@ open class RelFloor : 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 = "qr_code")
-    @JSONField(name = "FloorQRCode")
     var qr_code: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectID")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingID")
     var buildingId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 楼层顺序码 */
     @Schema(description = "楼层顺序码")
     @Column(name = "sequence_id")
-    @JSONField(name = "FloorSequenceID")
     var sequenceId: Int? = null
 
     /** 结构信息 */
     @Schema(description = "结构信息")
     @Column(name = "structure_info")
-    @JSONField(name = "StructureInfo")
     var structureInfo: HashMap<String,Any?>? = null
 
     /** 人员信息 */
     @Schema(description = "结构信息")
     @Column(name = "people_info")
-    @JSONField(name = "PeopleInfo")
     var peopleInfo: HashMap<String,Any?>? = null
 
     /** 自定义 */
     @Schema(description = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String,Any?>? = null
 
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Floor"
 
     /** 工作历信息 */
     @Schema(description = "工作历信息")
     @Column(name = "work_calendar")
-    @JSONField(name = "WorkCalendar")
     var workCalendar: HashMap<String,Any?>? = null
 
 //    /** 建筑   table  对应关系表   idColumn 对应 本类的关系id    childIdColumn 级联对象的关系id */

+ 1 - 19
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelShaft.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 io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -46,53 +45,36 @@ class RelShaft : 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
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 竖井类型 */
     @Schema(description = "竖井类型")
     @Column(name = "shaftfunctype")
-    @JSONField(name = "ShaftFuncType")
     var shaftFuncType: String? = null
 
-//    /** 建筑id集合 */
-//    @Schema(description = "建筑id集合")
-//    @JSONField(name = "BuildingList")
-//    var buildingList:List<String>? = null
-//
-//    /** 楼层id集合 */
-//    @Schema(description = "楼层id集合")
-//    @JSONField(name = "FloorList")
-//    var floorList:List<String>? = null
-
-} // Class RelShaft
+}

+ 1 - 41
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.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 io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
@@ -47,80 +46,41 @@ open class RelZoneSpace: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
-} // Class RelZoneSpace
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.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
@@ -48,87 +47,47 @@ open class RelZoneSpaceAirConvection: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 
-} // Class RelZoneSpaceAirConvection
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceAirMixing: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-资产所在的空间的 */
     @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_2'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceAirMixing
+}

+ 2 - 41
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.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
@@ -48,86 +47,48 @@ open class RelZoneSpaceAirUnidirectional: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
+
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_3'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceAirUnidirectional
+}

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

@@ -48,82 +48,43 @@ open class RelZoneSpaceConnectedSp: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )

+ 1 - 41
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.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
@@ -48,86 +47,47 @@ open class RelZoneSpaceDoors: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_2'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceDoors
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceDoorsWind: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_4'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceDoorsWind
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceLightConnection: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_1'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceLightConnection
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceLightTrans: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_RadiationNetwork_2'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceLightTrans
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceNotDoorsWind: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_1'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceNotDoorsWind
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceOrdinary: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_1'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceOrdinary
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.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
@@ -48,86 +47,46 @@ open class RelZoneSpaceWind: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_SpaceNeighborhood_3'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpaceWind
+}

+ 1 - 42
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.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
@@ -48,86 +47,46 @@ open class RelZoneSpacefireClose: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
-
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_3'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpacefireClose
+}

+ 1 - 41
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.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
@@ -48,86 +47,47 @@ open class RelZoneSpacefireOpen: Serializable, 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
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-//    @JSONField(name = "Building")
-//    var building: Building? = null
-//
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-//    @JSONField(name = "Floor")
-//    var floor: Floor? = null
-//
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
-//
-//    /** 级联-建筑 */
-//    @Schema(description = "级联-建筑")
-//    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-//    @JSONField(name = "BuildingList")
-//    var buildingList: ArrayList<Building>? = null
-//
-//    /** 级联-楼层  */
-//    @Schema(description = "级联-楼层")
-//    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-//    @JSONField(name = "FloorList")
-//    var floorlList: ArrayList<Floor>? = null
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_TrafficNetwork_2'" )
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelZoneSpacefireOpen
+}

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-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 RelEquipmentSs2Eq : 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")
     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_SensorRelationship_ss2eq'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSs2Eq
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-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,88 +47,69 @@ open class RelEquipmentVv2Eq : 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")
     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_ValveRelationship_vv2eq'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentVv2Eq
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -48,88 +47,69 @@ open class RelEquipmentVv2Sp : 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")
     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_eq2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2sp_SensorRelationship_ss2sp'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelEquipmentVv2Sp
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.graphtype.rel.RelGeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -48,88 +47,69 @@ open class RelEquipmentVv2Sy : 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")
     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_eq2sy", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2sy_ValveRelationship_vv2sy'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelGeneralSystem>? = null
 
-} // Class RelEquipmentVv2Sy
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-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 RelEquipmentDHWNetworkTwo : 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")
     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_DHWNetwork_2'")
-    @JSONField(name = "objectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDHWNetworkTwo
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-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 RelEquipmentDrinkingWaterNetworkOne : 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")
     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_DrinkingWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDrinkingWaterNetworkOne
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-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,88 +47,69 @@ open class RelEquipmentFireWaterNetworkOne : 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")
     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_FireWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentFireWaterNetworkOne
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-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 RelEquipmentFireWaterNetworkTwo : 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")
     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_FireWaterNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentFireWaterNetworkTwo
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.drainage
 
-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 RelEquipmentRecycleWaterNetworkTwo : 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")
     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_RecycleWaterNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentRecycleWaterNetworkTwo
+}
 
 
 

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

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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
@@ -49,26 +48,21 @@ open class RelEquipmentHubPrepare : 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
 
 
@@ -76,64 +70,49 @@ open class RelEquipmentHubPrepare : BaseInfo() {
     /** 设计图纸中编码 */
     @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
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentHubPrepare
+}
 
 
 

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

@@ -48,55 +48,46 @@ open class RelEquipmentAcAirNetworkThree : 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")
     var category: String? = null
 
     /** 设备所在建筑id */
     @Schema(description = "设备所在建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备所在楼层id */

+ 2 - 22
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentAcAirNetworkTwo.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,88 +47,69 @@ open class RelEquipmentAcAirNetworkTwo : 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")
     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_ACAirNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentAcAirNetworkTwo
+}
 
 
 

+ 1 - 21
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopFour.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 RelEquipmentChillWaterLoopFour : 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")
     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_4'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentChillWaterLoopFour
+}
 
 
 

+ 2 - 22
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentChillWaterLoopThree.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,88 +47,69 @@ open class RelEquipmentChillWaterLoopThree : 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")
     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_3'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentChillWaterLoopThree
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentFreshAirNetworkOne.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,61 +47,51 @@ open class RelEquipmentFreshAirNetworkOne : 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")
     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 RelEquipmentFreshAirNetworkOne : 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_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eqFreshAirNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentFreshAirNetworkOne
+}
 
 
 

+ 1 - 21
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentHeatWaterLoopTwo.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 RelEquipmentHeatWaterLoopTwo : 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")
     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_HeatWaterLoop_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentHeatWaterLoopTwo
+}
 
 
 

+ 1 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/logs/DataCenterLogSync.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.logs
 
-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
@@ -46,43 +45,36 @@ class DataCenterLogSync : BaseInfo(){
     @Schema(description = "ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 操作类型 */
     @Schema(description = "操作类型")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** 数据 */
     @Schema(description = "数据")
     @Column(name = "data_source")
-    @JSONField(name = "DataSource")
     var dataSource: HashMap<String,Any?>? = null
 
     /** 操作者 */
     @Schema(description = "操作者")
     @Column(name = "author")
-    @JSONField(name = "Author")
     var author: String? = null
 
     /** 状态 */
     @Schema(description = "状态 ")
     @Column(name = "state")
-    @JSONField(name = "State")
     var state: String? = null
 
     /** 对象id */
     @Schema(description = "对象id")
     @Column(name = "object_id")
-    @JSONField(name = "ObjectId")
     var objectId: String? = null
 
-} // Class DataCenterLogs
+}

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

@@ -131,7 +131,6 @@ open class Equipment : BaseInfo() {
 
     /** 设备类型code */
     @Schema(description = "设备类型code")
-    @Id
     @Column(name = "class_code")
     var classCode: String? = null
 

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

@@ -146,7 +146,7 @@ open class Floor : BaseInfo() {
 
     /** 轮廓线 */
     @Schema(description = "轮廓线")
-    @Column(name = "outline")
+//    @Column(name = "outline")
     var outline: ArrayList<PointPosition>? = null
 
     /** 数量 */

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

@@ -26,8 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.persagy.service.models.SBaseEntity
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 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
@@ -40,7 +42,7 @@ import javax.persistence.Table
  */
 @Schema(name = "楼层轮廓线")
 @Table(name = "floor_outline")
-class FloorOutline : SBaseEntity() {
+class FloorOutline : Serializable {
 
     @Schema(description = "楼层 id")
     @Id
@@ -49,5 +51,32 @@ class FloorOutline : SBaseEntity() {
 
     @Schema(description = "楼层轮廓线")
     @Column(name = "outline")
-    var outline: String? = null
+    var outline: ArrayList<PointPosition>? = 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 id            id
+     * @param outline       轮廓线
+     */
+    constructor(id: String?, outline: ArrayList<PointPosition>?) : super() {
+        this.id = id
+        this.outline = outline
+    }
+
+    /**
+     * 无参构造
+     */
+    constructor() : super()
+
 }

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

@@ -91,7 +91,6 @@ open class Property : BaseInfo(),Comparator<Property> {
 
     /** BIM模型中坐标 */
     @Schema(description = "BIM模型中坐标json")
-    @JSONField(name = "LocationJson")
     var locationJson: BIMLocation? = null
         get() {
             if (!bimLocation.isNullOrEmpty()){

+ 33 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/SpaceOutline.kt

@@ -26,8 +26,10 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.persagy.service.models.SBaseEntity
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 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
@@ -40,7 +42,7 @@ import javax.persistence.Table
  */
 @Schema(name = "空间轮廓线")
 @Table(name = "space_outline")
-class SpaceOutline : SBaseEntity() {
+class SpaceOutline : Serializable {
 
     @Schema(description = "空间 id")
     @Id
@@ -49,5 +51,33 @@ class SpaceOutline : SBaseEntity() {
 
     @Schema(description = "空间轮廓线")
     @Column(name = "outline")
-    var outline: String? = null
+    var outline:  ArrayList<ArrayList<ArrayList<PointPosition>>>? = 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 id        id
+     * @param outline   轮廓线
+     */
+    constructor(id: String?, outline: ArrayList<ArrayList<ArrayList<PointPosition>>>?) {
+        this.id = id
+        this.outline = outline
+    }
+
+    /**
+     * 无参构造
+     */
+    constructor()
+
+
 }

+ 5 - 24
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/TenantWithCount.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-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
@@ -46,79 +45,61 @@ class TenantWithCount : BaseInfo() {
     @Schema(description = "租户id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "TenantID")
     var id: String? = null
 
     /** 租户名称 */
     @Schema(description = "租户名称")
     @Column(name = "name")
-    @JSONField(name = "TenantName")
     var name: String? = null
 
     /** 租户本地编码 */
     @Schema(description = "租户本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "TenantLocalID")
     var localId: String? = null
 
     /** 租户本地名称 */
     @Schema(description = "租户本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "TenantLocalName")
     var localName: String? = null
 
     /** 租户本地编码2 */
     @Schema(description = "租户本地编码2")
     @Column(name = "local_id2")
-    @JSONField(name = "TenantLocalID2")
     var localId2: String? = null
 
     /** 租户本地名称2 */
     @Schema(description = "租户本地名称2")
     @Column(name = "local_name2")
-    @JSONField(name = "TenantLocalName2")
     var localName2: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @Schema(description = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @Schema(description = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 房间列表 */
     @Schema(description = "房间列表")
     @Column(name = "room_id")
-    @JSONField(name = "RoomID")
     var roomId:  String? = null
 
     /** 房间数 */
     @Schema(description = "房间数")
     @Column(name = "room_count")
-    @JSONField(name = "RoomCount")
     var roomCount: Long = 0
 
-    /** 租赁信息 */
-    @Schema(description = "租赁信息")
-    @Column(name = "lease_info")
-    @JSONField(name = "LeaseInfo")
-    var leaseInfo: HashMap<String,Any?>? = null
+    /** 信息点 */
+    @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
 
-    /** 能耗信息 */
-    @Schema(description = "能耗信息")
-    @Column(name = "consumption_info")
-    @JSONField(name = "ConsumptionInfo")
-    var consumptionInfo: HashMap<String,Any?>? = null
-
-} // Class Tenant
+}

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdForEqList.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 RBdForEqList : RBaseInfo() {
 
     /** 建筑id */
     @Schema(description = "建筑id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备id列表 */
     @Schema(description = "设备id列表")
-    @JSONField(name = "EquipIdList")
     var equipIdList: ArrayList<String>? = null
 
-} // Class RBdForEqList
+}

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdForSyList.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 RBdForSyList : RBaseInfo() {
 
     /** 建筑id */
     @Schema(description = "建筑id", required = true)
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 系统列表id */
     @Schema(description = "系统id列表", required = true)
-    @JSONField(name = "sysIdList")
     var sysIdList: ArrayList<String>? = null
 
-} // Class RBdForSyList
+}

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RBdInSyList.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 RBdInSyList : RBaseInfo() {
 
     /** 建筑id */
     @Schema(description = "建筑id")
-    @JSONField(name = "Building")
     var buildingId: String? = null
 
     /** 系统id列表 */
     @Schema(description = "系统id列表")
-    @JSONField(name = "sysIdList")
     var sysIdList: ArrayList<String>? = null
 
-} // Class RBdInSyList
+}

+ 1 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Bd.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,39 +45,29 @@ class REq2Bd : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_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 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Fl.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,39 +45,29 @@ class REq2Fl : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 楼层Id */
     @Schema(description = "楼层Id")
     @Id
     @Column(name = "fl_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
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

+ 1 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sh.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,39 +45,29 @@ class REq2Sh : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 竖井Id */
     @Schema(description = "竖井Id")
     @Id
     @Column(name = "sh_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
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

+ 1 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Si.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,39 +45,29 @@ class REq2Si : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 元空间Id */
     @Schema(description = "元空间Id")
     @Id
     @Column(name = "si_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
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sp.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 REq2Sp : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_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 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REq2Sy.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,39 +45,29 @@ class REq2Sy : RBaseInfo(){
     @Schema(description = "设备Id")
     @Id
     @Column(name = "eq_id")
-    @JSONField(name = "Id1")
-    @SerializedName("Id1")
     var id1: String? = null
 
     /** 系统Id */
     @Schema(description = "系统Id")
     @Id
     @Column(name = "sy_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
 
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REq2Bd
+}

+ 11 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForFl.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,30 +45,32 @@ class REqForFl : 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 = "floor_id")
-    @JSONField(name = "FloorId")
-    @SerializedName("FloorId")
     var floorId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
-    @SerializedName("ProjectId")
     var projectId: String? = null
 
+    /** 图类型 */
+    @Schema(description = "图类型")
+    @Column(name = "graph_code")
+    var graphCode: String? = null
+
+    /** 边类型 */
+    @Schema(description = "边类型")
+    @Column(name = "type")
+    var type: String? = null
+
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
-    @SerializedName("Sign")
     var sign: Int? = null
 
-} // Class REqForFl
+}

+ 1 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForFlList.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 REqForFlList : RBaseInfo() {
 
     /** 设备id */
     @Schema(description = "设备id")
-    @JSONField(name = "EquipId")
     var equipId: String? = null
 
     /** 楼层id列表 */
     @Schema(description = "楼层id列表")
-    @JSONField(name = "FloorIdList")
     var floorIdList: ArrayList<String>? = null
 
-} // Class REqForFlList
+}

+ 1 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForSh.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,30 +45,22 @@ class REqForSh : 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 = "shaft_id")
-    @JSONField(name = "ShaftId")
-    @SerializedName("ShaftId")
     var shaftId: 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 REqForSh
+}

+ 1 - 6
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqInSi.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 REqInSi : RBaseInfo() {
     @Schema(description = "设备id")
     @Id
     @Column(name = "equip_id")
-    @JSONField(name = "EquipId")
     var equipId: String? = null
 
     /** 元空间id */
     @Schema(description = "元空间id")
     @Id
     @Column(name = "ispace_id")
-    @JSONField(name = "IspaceId")
     var ispaceId: 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 REqInSi
+}

+ 1 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqInSpBase.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
@@ -45,35 +43,27 @@ open class REqInSpBase : 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")
     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")
     var sign: Int? = null
 
-} // Class REqInSpBase
+}

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


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor