瀏覽代碼

Merge remote-tracking branch 'origin/master'

张维新 4 年之前
父節點
當前提交
996c9b186f
共有 100 個文件被更改,包括 1208 次插入1156 次删除
  1. 4 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/RelationAddRequest.kt
  2. 0 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  3. 0 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt
  4. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt
  5. 4 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt
  6. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt
  7. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpOther.kt
  8. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt
  9. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt
  10. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.kt
  11. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.kt
  12. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.kt
  13. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.kt
  14. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.kt
  15. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.kt
  16. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.kt
  17. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.kt
  18. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.kt
  19. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.kt
  20. 1 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.kt
  21. 2 19
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubOrdinary.kt
  22. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentLubPrepare.kt
  23. 1 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt
  24. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSparePower.kt
  25. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSyRoutinePower.kt
  26. 2 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentSySparePower.kt
  27. 1 14
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/hvac/RelEquipmentCoolingWaterLoopTwo.kt
  28. 1 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RShInSyList.kt
  29. 1 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpVerticalSp.kt
  30. 1 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSyEqList.kt
  31. 7 10
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt
  32. 4 4
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt
  33. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt
  34. 8 8
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyEqService.kt
  35. 490 353
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  36. 1 0
      datacenter/src/main/resources/application-prod.yml
  37. 1 9
      equip-componet/src/main/kotlin/com/persagy/server/models/PointPorperty.kt
  38. 1 1
      equip-componet/src/main/kotlin/com/persagy/server/service/RSyEqService.kt
  39. 1 1
      equip-componet/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt
  40. 1 0
      equip-componet/src/main/resources/application-prod.yml
  41. 7 0
      pendingIssues.md
  42. 8 2
      revit-algorithm/build.gradle
  43. 21 21
      revit-algorithm/src/main/kotlin/com/persagy/revit/AlgorithmApp.kt
  44. 0 85
      revit-algorithm/src/main/kotlin/com/persagy/revit/Swagger2Config.kt
  45. 155 0
      revit-algorithm/src/main/kotlin/com/persagy/revit/Swagger3Config.kt
  46. 22 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/WebMvcConfg.kt
  47. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/BackMainThread.kt
  48. 2 2
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/BaseResponse.kt
  49. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/CreateRequest.kt
  50. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/CreateResponse.kt
  51. 4 4
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCBuilding.kt
  52. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCComponent.kt
  53. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCDataBase.kt
  54. 16 14
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCEquipment.kt
  55. 7 7
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCFloor.kt
  56. 11 11
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCISpace.kt
  57. 2 2
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCProperty.kt
  58. 4 4
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/QueryRequest.kt
  59. 6 6
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/QueryResponse.kt
  60. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/UpdateRequest.kt
  61. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/CheckErrorState_11.kt
  62. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/CheckPassedState_2.kt
  63. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/DataCheckState_10.kt
  64. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/DataExportState_20.kt
  65. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ExportErrorState_21.kt
  66. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ExportPassedState_3.kt
  67. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/FinishState_4.kt
  68. 1 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ModelState.kt
  69. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/SyncDataErrorState_31.kt
  70. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/UploadState_0.kt
  71. 0 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/UploadedState_1.kt
  72. 5 1
      revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/sync/SyncEquipment.kt
  73. 4 4
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/LogController.kt
  74. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/log/SyncLogController.kt
  75. 4 4
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/BaseGraphController.kt
  76. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/BeaconController.kt
  77. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/ColumnController.kt
  78. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/ConnectorController.kt
  79. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/DoorController.kt
  80. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/DuctController.kt
  81. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/EquipPartController.kt
  82. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/EquipmentController.kt
  83. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/GridController.kt
  84. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/LevelController.kt
  85. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/OtherController.kt
  86. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/PipeController.kt
  87. 116 0
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/RoomController.kt
  88. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/SpaceController.kt
  89. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/VirtualWallController.kt
  90. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/WallController.kt
  91. 8 8
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/WindowController.kt
  92. 11 11
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/FloorModelController.kt
  93. 16 16
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelFileController.kt
  94. 9 9
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelFileFolderController.kt
  95. 5 5
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelMonitorController.kt
  96. 5 5
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ReportController.kt
  97. 64 0
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/TestController.kt
  98. 5 5
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/UploadController.kt
  99. 6 6
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/relation/CheckController.kt
  100. 0 0
      revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/relation/RelationCheckController.kt

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

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

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

@@ -44,19 +44,16 @@ open class RelBuilding : 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
 
     /** 建筑本地名称 */

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

@@ -48,32 +48,26 @@ open class RelEquipmentBuilding : 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模型中编码 */

+ 2 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.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,61 +47,51 @@ open class RelEquipmentControlRelationOne : 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 RelEquipmentControlRelationOne : 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 = 'eq2eq_ControlRelation_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentControlRelationOne
+}
 
 
 

+ 4 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.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,61 +47,53 @@ open class RelEquipmentControlRelationTwoSy : 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 +105,19 @@ open class RelEquipmentControlRelationTwoSy : 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_eq2sy", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlRelation_2'")
-    @JSONField(name = "objectInfo")
     var objectInfo: ArrayList<RelGeneralSystem>? = null
 
-} // Class RelEquipmentControlRelationTwoSy
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.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.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -47,61 +46,51 @@ open class RelEquipmentEq2SpControlEquipNetwork : 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 */
@@ -113,22 +102,19 @@ open class RelEquipmentEq2SpControlEquipNetwork : 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 = 'eq2eq_ControlEquipNetwork'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentEq2SpControlEquipNetwork>? = null
 
-} // Class RelEquipmentEq2SpControlEquipNetwork
+}
 
 
 

+ 2 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpOther.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,61 +47,51 @@ open class RelEquipmentEq2SpOther : 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 RelEquipmentEq2SpOther : 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_eq2sp", idColumn="eq_id", childIdColumn="sp_id",self = false,filter = "type = 'eq2sp_x'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
-} // Class RelEquipmentEq2SpOther
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.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,61 +47,51 @@ open class RelEquipmentSensorNetworkOne : 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 RelEquipmentSensorNetworkOne : 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 = 'eq2eq_SensorNetwork_1'")
-    @JSONField(name = "objectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSensorNetworkOne
+}
 
 
 

+ 2 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.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,61 +47,51 @@ open class RelEquipmentSs2Sy : 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 RelEquipmentSs2Sy : 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_eq2sy", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2sy_SensorRelationship_ss2sy'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelGeneralSystem>? = null
 
-} // Class RelEquipmentSs2Sy
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDHWNetworkOne.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,61 +47,51 @@ open class RelEquipmentDHWNetworkOne : 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 RelEquipmentDHWNetworkOne : 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 = 'eq2eq_DHWNetwork_1'")
-    @JSONField(name = "objectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDHWNetworkOne
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkOne.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,61 +47,51 @@ open class RelEquipmentDrainingWaterNetworkOne : 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 RelEquipmentDrainingWaterNetworkOne : 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 = 'eq2eq_DrainingWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDrainingWaterNetworkOne
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrainingWaterNetworkTwo.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,61 +47,51 @@ open class RelEquipmentDrainingWaterNetworkTwo : 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 RelEquipmentDrainingWaterNetworkTwo : 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 = 'eq2eq_DrainingWaterNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDrainingWaterNetworkTwo
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentDrinkingWaterNetworkTwo.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,61 +47,51 @@ open class RelEquipmentDrinkingWaterNetworkTwo : 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 RelEquipmentDrinkingWaterNetworkTwo : 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 = 'eq2eq_DrinkingWaterNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentDrinkingWaterNetworkTwo
+}
 
 
 

+ 2 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentFireVentNetworkOne.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,61 +47,51 @@ open class RelEquipmentFireVentNetworkOne : 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 RelEquipmentFireVentNetworkOne : 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 = 'eq2eq_FireVentNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentFireVentNetworkOne
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkOne.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,61 +47,51 @@ open class RelEquipmentGasNetworkOne : 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,19 +103,16 @@ open class RelEquipmentGasNetworkOne : 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 = 'eq2eq_GasNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentGasNetworkOne
+}

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentGasNetworkTwo.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,61 +47,51 @@ open class RelEquipmentGasNetworkTwo : 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 RelEquipmentGasNetworkTwo : 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 = 'eq2eq_GasNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentGasNetworkTwo
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentRecycleWaterNetworkOne.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,61 +47,51 @@ open class RelEquipmentRecycleWaterNetworkOne : 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 RelEquipmentRecycleWaterNetworkOne : 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 = 'eq2eq_RecycleWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentRecycleWaterNetworkOne
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkOne.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,61 +47,51 @@ open class RelEquipmentSupplyWaterNetworkOne : 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 RelEquipmentSupplyWaterNetworkOne : 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 = 'eq2eq_SupplyWaterNetwork_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSupplyWaterNetworkOne
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/drainage/RelEquipmentSupplyWaterNetworkTwo.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,61 +47,51 @@ open class RelEquipmentSupplyWaterNetworkTwo : 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 RelEquipmentSupplyWaterNetworkTwo : 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 = 'eq2eq_SupplyWaterNetwork_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSupplyWaterNetworkTwo
+}
 
 
 

+ 1 - 16
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentHubOrdinary.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 RelEquipmentHubOrdinary : 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,37 +70,31 @@ open class RelEquipmentHubOrdinary : 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 */
@@ -118,22 +106,19 @@ open class RelEquipmentHubOrdinary : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_HUDistribution_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentHubOrdinary
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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
@@ -49,64 +48,51 @@ open class RelEquipmentLubOrdinary : 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
 
     /** 设备所在建筑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 */
@@ -118,22 +104,19 @@ open class RelEquipmentLubOrdinary : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentLubOrdinary
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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,61 +47,51 @@ open class RelEquipmentLubPrepare : 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 RelEquipmentLubPrepare : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_LUDistribution_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class Equipment
+}
 
 
 

+ 1 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.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
@@ -48,61 +47,51 @@ open class RelEquipmentRoutinePower : 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 RelEquipmentRoutinePower : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_1'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentRoutinePower
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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,61 +47,51 @@ open class RelEquipmentSparePower : 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 RelEquipmentSparePower : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSparePower
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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,61 +47,51 @@ open class RelEquipmentSyRoutinePower : 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 RelEquipmentSyRoutinePower : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_3'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSyRoutinePower
+}
 
 
 

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

@@ -26,9 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.electricity
 
-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,61 +47,51 @@ open class RelEquipmentSySparePower : 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 RelEquipmentSySparePower : BaseInfo() {
     /** Revit族 */
     @Schema(description = "Revit族 ")
     @Column(name = "family_name")
-    @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
     @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
-    @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
     @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'eq2eq_EquipPower_4'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentSySparePower
+}
 
 
 

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

@@ -48,61 +48,51 @@ open class RelEquipmentCoolingWaterLoopTwo : 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 +104,19 @@ open class RelEquipmentCoolingWaterLoopTwo : 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 = 'eq2eq_CoolingWaterLoop_2'")
-    @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
-} // Class RelEquipmentCoolingWaterLoopTwo
+}
 
 
 

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

+ 1 - 7
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpVerticalSp.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
@@ -44,32 +43,27 @@ class RSpVerticalSp : RBaseInfo(){
     @Schema(description = "空间id", required = true)
     @Id
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 关系空间id */
     @Schema(description = "关系空间id", required = true)
     @Id
     @Column(name = "space_other_id")
-    @JSONField(name = "SpaceOtherId")
     var spaceOtherId: String? = null
 
     /** 项目id */
     @Schema(description = "项目id", required = true)
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 空间类型 */
     @Schema(description = "空间类型", required = true)
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     var objectType: String? = null
 
     /** 标记手动 1 自动 2 */
     @Schema(description = "标记手动 1 自动 2 ", required = true)
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = null
 
-} // Class RSpVerticalSp
+}

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

@@ -49,12 +49,11 @@ class RSyEqList : RBaseInfo(){
 
     /** 系统id */
     @Schema(description = "系统id", required = true)
-    @JSONField(name = "SysID")
     var sysId: String? = null
 
     /** 设备id */
     @Schema(description = "设备id列表", required = true)
     @JSONField(name = "EquipIdList")
-    var listEquipId: ArrayList<String>? = null
+    var equipIdList: ArrayList<String>? = null
 
 } // Class RSyEq

+ 7 - 10
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt

@@ -47,10 +47,7 @@ import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 /**
  * 系统接口
@@ -176,9 +173,9 @@ open class GeneralSystemController {
      *
      * @param   sysId        系统id
      */
-    @Operation(summary ="查询没有和当前系统关联的设备", description ="sysId 为系统id")
+    @Operation(summary ="查询没有和当前系统关联的设备", description ="id 为系统id")
     @PostMapping(value = ["/un-sys-equip"])
-    fun unSysEquip( sysId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment>{
+    fun unSysEquip(@RequestParam sysId: String, @RequestBody request: SQueryRequest): SQueryResponse<Equipment>{
         return GeneralSystemService.unSysEquip(sysId, request)
     } // Fun unSysEquip()
 
@@ -187,9 +184,9 @@ open class GeneralSystemController {
      *
      * @param   sysId        系统id
      */
-    @Operation(summary ="查询没有和当前系统关联的竖井", description ="sysId 为系统id")
+    @Operation(summary ="查询没有和当前系统关联的竖井", description ="id 为系统id")
     @PostMapping(value = ["/un-sys-shaft"])
-    fun unSysShaft( sysId: String,@RequestBody request: SQueryRequest): SQueryResponse<Shaft>{
+    fun unSysShaft(@RequestParam sysId: String,@RequestBody request: SQueryRequest): SQueryResponse<Shaft>{
         return GeneralSystemService.unSysShaft(sysId, request)
     } //  Fun unSysShaft()
 
@@ -198,9 +195,9 @@ open class GeneralSystemController {
      *
      * @param   sysId        系统id
      */
-    @Operation(summary ="查询没有和当前系统关联的业务空间", description ="sysId 为系统id")
+    @Operation(summary ="查询没有和当前系统关联的业务空间", description ="id 为系统id")
     @PostMapping(value = ["/un-sys-zoneSpaceBaseTable"])
-    fun unSysZoneSpaceBaseTable( sysId: String,@RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace>{
+    fun unSysZoneSpaceBaseTable(@RequestParam sysId: String,@RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace>{
         return GeneralSystemService.unSysZoneSpaceBaseTable(sysId, request)
     } // Fun unSysZoneSpaceBaseTable()
 

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt

@@ -64,7 +64,7 @@ class ManualRelationCalcController {
     @PostMapping(value = ["/query"])
     fun query(@RequestBody manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
         return service.query(manualRelationCalcRequest)
-    } // Fun
+    }
 
     /**
      * 添加关系
@@ -73,7 +73,7 @@ class ManualRelationCalcController {
     @PostMapping(value = ["/add"])
     fun addRels(@RequestBody relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
         return service.addRel(relationAddRequest)
-    } // Fun
+    }
 
     /**
      * 删除关系
@@ -82,9 +82,9 @@ class ManualRelationCalcController {
     @PostMapping(value = ["/del"])
     fun delRels(@RequestBody manualRelationCalcDel: ManualRelationCalcDel): SBaseResponse {
         return service.delRel(manualRelationCalcDel)
-    } // Fun
+    }
 
-} // Class ManualRelationCalcController
+}
 
 
 

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt

@@ -348,7 +348,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
             /** 失败集合 */
             val failureList = ArrayList<Any>()
 
-            for (equipId in rSyEqList.listEquipId!!){
+            for (equipId in rSyEqList.equipIdList!!){
                 val r = RSyEq()
                 r.sysId = sysId
                 r.equipId = equipId

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

@@ -26,14 +26,14 @@
 
 package com.persagy.server.services.rel
 
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.REqSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.datacenter.models.entities.rel.RSyEqList
 import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
@@ -152,8 +152,8 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            if (rSyEqList.listEquipId!=null&&rSyEqList.listEquipId!!.isNotEmpty()){
-                for (eqId in rSyEqList.listEquipId!!){
+            if (rSyEqList.equipIdList!=null&&rSyEqList.equipIdList!!.isNotEmpty()){
+                for (eqId in rSyEqList.equipIdList!!){
                     val rSyEq = RSyEq()
                     rSyEq.equipId = eqId
                     rSyEq.sysId =  rSyEqList.sysId
@@ -272,11 +272,11 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
 
             /** 失败集合 */
             val failureList = ArrayList<RSyEq>()
-            if (rSyEqList.listEquipId!=null&&rSyEqList.listEquipId!!.isNotEmpty()){
+            if (rSyEqList.equipIdList!=null&&rSyEqList.equipIdList!!.isNotEmpty()){
 
                 /** 成功集合 */
                 val successList = ArrayList<RSyEq>()
-                for (eqId in rSyEqList.listEquipId!!){
+                for (eqId in rSyEqList.equipIdList!!){
                     val rSyEq = RSyEq()
                     logger.debug("设备和系统11 =${eqId}")
                     rSyEq.equipId = eqId
@@ -310,7 +310,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
                     jsonObject.put("obj_type", "SystemEquip")
                     jsonObject.put("linkId",successList.toJson())
                     /** 发送消息 */
-                    messageHandler.sendMessage(jsonObject.toString())
+//                    messageHandler.sendMessage(jsonObject.toString())
 //                    kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "SystemEquip", "14", IdUtils.uuidCreate(),  rSyEqList.sysId!!, null),false)
                     val sCreateResponse = SCreateResponse<RSyEq>(SResponseType.success)
                     if (failureList.size>0){

File diff suppressed because it is too large
+ 490 - 353
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt


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

@@ -33,6 +33,7 @@ spring:
 #    password:                           123qwe!@#
 #    url:                                jdbc:postgresql://172.17.100.16:5432/datacenterlabsl
     url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 1 - 9
equip-componet/src/main/kotlin/com/persagy/server/models/PointPorperty.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.models
 
-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
@@ -39,43 +38,36 @@ class PointPorperty : BaseInfo() {
     /** id */
     @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
 
     /** 坐标x */
     @Schema(description = "坐标x")
     @Column(name = "x")
-    @JSONField(name = "X")
     var x: Double? = null
 
     /** 坐标y */
     @Schema(description = "坐标y")
     @Column(name = "y")
-    @JSONField(name = "Y")
     var y: Double? = null
 
     /** 数量资产 */
     @Schema(description = "数量资产")
     @Column(name = "total")
-    @JSONField(name = "Total")
     var total: Int? = null
 
     /** 未修订数量 */
     @Schema(description = "未修订数量")
     @Column(name = "nocheck")
-    @JSONField(name = "Nocheck")
     var nocheck: Int? = null
 
     /** 图片key值 */
     @Schema(description = "图片key值")
     @Column(name = "image")
-    @JSONField(name = "Image")
     var image: String? = null
 
-} // Class PointPorperty
+}

+ 1 - 1
equip-componet/src/main/kotlin/com/persagy/server/service/RSyEqService.kt

@@ -99,7 +99,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyEqList.sysId}'")
-            for (eqId in rSyEqList.listEquipId!!){
+            for (eqId in rSyEqList.equipIdList!!){
                 val rSyEq = RSyEq()
 //                rSyEq.id = IdUtils.uuidCreate()
                 rSyEq.equipId = eqId

+ 1 - 1
equip-componet/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -644,7 +644,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                         sBaseResponse.message = "设备id不能为空"
                         sBaseResponse
                     }
-                    val equip = select(SFilter.eq("projectId", projectId!!), SFilter.eq("equipId", equipUpDateEnclosure.equipId!!)).entity()
+                    val equip = select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", equipUpDateEnclosure.equipId!!)).entity()
 
                     if (equip == null){
                         continue

+ 1 - 0
equip-componet/src/main/resources/application-prod.yml

@@ -21,6 +21,7 @@ spring:
 #    password:                           123qwe!@#
 #    url:                                jdbc:postgresql://172.17.100.16:5432/datacenterlabsl
     url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 7 - 0
pendingIssues.md

@@ -44,4 +44,11 @@ ip: 192.168.12.14
 
 ```
 
+```
+登录网址  https://signin.aliyun.com/login.htm  
+账户  fanxiaoyu@1942828987597127.onaliyun.com  
+密码  fanxiaoyu-ram  
+查询操作  华北2(北京)  控制台-》实例-》标签-》team-》saga
+```
+
 

+ 8 - 2
revit-algorithm/build.gradle

@@ -73,8 +73,14 @@ dependencies {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // RESTful API 文档生成工具
     // https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui
-    compile group: "io.springfox", name: "springfox-swagger-ui", version: SWAGGER_VERSION
-    compile group: "io.springfox", name: "springfox-swagger2", version: SWAGGER_VERSION
+//    compile group: "io.springfox", name: "springfox-swagger-ui", version: SWAGGER_VERSION
+//    compile group: "io.springfox", name: "springfox-swagger2", version: SWAGGER_VERSION
+
+    // RESTful API 文档生成工具
+    // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui
+    compile group: 'org.springdoc', name: 'springdoc-openapi-ui', version: SPRING_DOC_VERSION
+    // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-common
+    compile group: "org.springdoc", name: "springdoc-openapi-common", version: SPRING_DOC_VERSION
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Sybotan依赖

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

@@ -52,27 +52,27 @@ open class AlgorithmApp : SpringBootServletInitializer() {
      *
      * @return  HttpMessageConverters
      */
-    @Bean
-    @Suppress("MoveLambdaOutsideParentheses")
-    open fun jsonHttpMessageConverters(): SJsonHttpMessageConverter {
-//        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
-        val fastConverter = SJsonHttpMessageConverter()
-        fastConverter.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
-        return fastConverter
-    } // Function fastJsonHttpMessageConverters()
-    /**
-     * 配置FastJson
-     *
-     * @return  HttpMessageConverters
-     */
-    @Bean
-    @Suppress("MoveLambdaOutsideParentheses")
-    open fun jsonMessageConverterConfig(): SerializeConfig {
-//        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
-        val config = SerializeConfig()
-        config.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
-        return config
-    } // Function fastJsonHttpMessageConverters()
+//    @Bean
+//    @Suppress("MoveLambdaOutsideParentheses")
+//    open fun jsonHttpMessageConverters(): SJsonHttpMessageConverter {
+////        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
+//        val fastConverter = SJsonHttpMessageConverter()
+//        fastConverter.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
+//        return fastConverter
+//    } // Function fastJsonHttpMessageConverters()
+//    /**
+//     * 配置FastJson
+//     *
+//     * @return  HttpMessageConverters
+//     */
+//    @Bean
+//    @Suppress("MoveLambdaOutsideParentheses")
+//    open fun jsonMessageConverterConfig(): SerializeConfig {
+////        ParserConfig.getGlobalInstance().isAutoTypeSupport = true
+//        val config = SerializeConfig()
+//        config.propertyNamingStrategy = PropertyNamingStrategy.PascalCase
+//        return config
+//    } // Function fastJsonHttpMessageConverters()
 
     /**
      * 配置应用

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

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

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

@@ -0,0 +1,155 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.revit
+
+import io.swagger.v3.oas.annotations.enums.ParameterIn
+import io.swagger.v3.oas.models.Components
+import io.swagger.v3.oas.models.OpenAPI
+import io.swagger.v3.oas.models.Operation
+import io.swagger.v3.oas.models.info.Contact
+import io.swagger.v3.oas.models.info.Info
+import io.swagger.v3.oas.models.info.License
+import io.swagger.v3.oas.models.media.StringSchema
+import io.swagger.v3.oas.models.parameters.Parameter
+import io.swagger.v3.oas.models.security.SecurityScheme
+import org.springdoc.core.GroupedOpenApi
+import org.springdoc.core.customizers.OperationCustomizer
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.method.HandlerMethod
+
+/**
+ * RESTful API文档生成器Swagger2配置
+ *
+ * @author  PLX
+ */
+@Configuration
+open class Swagger3Config {
+
+    /** 标题 */
+    private val title = "模型服务 API"
+    /** API 版本号 */
+    private val version = "1.0"
+
+    val operationCustomizer = GlobalHeaderOperationCustomizer()
+
+    /**
+     * API 信息
+     */
+    @Bean
+    open fun openApi(): OpenAPI {
+        val contact = Contact().name("庞利祥").email("sybotan@126.com")
+        return OpenAPI()
+            .components(
+                Components()
+                .addSecuritySchemes("basicScheme", SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("basic")))
+            .info(
+                Info()
+                .title(title)
+                .version(version)
+                .termsOfService("http://www.sybotan.com")
+                .contact(contact)
+                .license(
+                    License()
+                    .name("Apache 2.0")
+                    .url("http://www.sybotan.com")))
+    }
+
+
+
+    /**
+     * 默认分组
+     */
+    @Bean
+    open fun defaultApiGroup(): GroupedOpenApi {
+        return GroupedOpenApi.builder()
+            .group("默认")
+            .pathsToMatch("/**")
+            .addOperationCustomizer(operationCustomizer)
+            .build()
+    }
+
+//    /**
+//     * 对象 API 组
+//     */
+//    @Bean
+//    open fun objectApiGroup(): GroupedOpenApi {
+//        return GroupedOpenApi.builder()
+//            .group("对象")
+//            .pathsToMatch("/object/**")
+//            .addOperationCustomizer(operationCustomizer)
+//            .build()
+//    }
+//
+//    /**
+//     * 对象 API 组
+//     */
+//    @Bean
+//    open fun relApiGroup(): GroupedOpenApi {
+//        return GroupedOpenApi.builder()
+//            .group("关系")
+//            .pathsToMatch("/rel/**")
+//            .addOperationCustomizer(operationCustomizer)
+//            .build()
+//    }
+//
+//    /**
+//     * 对象 API 组
+//     */
+//    @Bean
+//    open fun dictApiGroup(): GroupedOpenApi {
+//        return GroupedOpenApi.builder()
+//            .group("字典")
+//            .pathsToMatch("/dict/**")
+//            .addOperationCustomizer(operationCustomizer)
+//            .build()
+//    }
+
+    /**
+     * 全局参数
+     *
+     * @author  庞利祥 <sybotan@126.com>
+     */
+    class GlobalHeaderOperationCustomizer : OperationCustomizer {
+        /**
+         * 接口定义器
+         *
+         * @param   operation       接口
+         * @param   handlerMethod   原接口方法
+         * @return  新定义的接口
+         */
+        override fun customize(operation: Operation, handlerMethod: HandlerMethod): Operation {
+            val projectId = Parameter().`in`(ParameterIn.HEADER.toString())
+                .name("projectId").description("项目 id")
+                .schema(StringSchema()).required(false)
+            operation.addParametersItem(projectId)
+
+            return operation
+        }
+    }
+
+} // Class Swagger2Config

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

@@ -1,8 +1,13 @@
 package com.persagy.revit
 
+import com.alibaba.fastjson.PropertyNamingStrategy
 import com.persagy.service.interceptors.SPageInterceptor
+import com.persagy.service.json.SJsonHttpMessageConverter
 import org.springframework.context.annotation.Configuration
+import org.springframework.http.converter.HttpMessageConverter
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 /**
@@ -11,7 +16,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  * @author jxing
  */
 @Configuration
-open class WebMvcConfg: WebMvcConfigurerAdapter() {
+open class WebMvcConfg: WebMvcConfigurer {
 
     /**
      * 设置接口超时时间
@@ -36,4 +41,20 @@ open class WebMvcConfg: WebMvcConfigurerAdapter() {
         registry.addInterceptor(SPageInterceptor()).addPathPatterns("/**")
         super.addInterceptors(registry)
     } // Function addInterceptors()
+
+
+    /**
+     * 配置 json 转换使用 FastJson
+     *
+     * @param   converterList       转换器列表
+     */
+    override fun configureMessageConverters(converterList: MutableList<HttpMessageConverter<*>>) {
+        // 先把JackSon的消息转换器删除.
+        converterList.removeIf { item -> item is MappingJackson2HttpMessageConverter }
+
+        val converter = SJsonHttpMessageConverter()
+        // 设置 Json 序列化,属性首字母小写
+        converter.propertyNamingStrategy = PropertyNamingStrategy.CamelCase
+        converterList.add(converter)
+    }
 } // Class WebMvcConf()

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/BackMainThread.kt

@@ -1,6 +1,6 @@
 package com.persagy.revit.backstage
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
+import com.persagy.revit.backstage.state.ModelState
 import com.persagy.revit.backstage.state.UploadState_0
 import com.persagy.revit.backstage.state.UploadedState_1
 import com.persagy.revit.backstage.state.*

+ 2 - 2
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/BaseResponse.kt

@@ -8,9 +8,9 @@ import com.alibaba.fastjson.annotation.JSONField
  * @author jxing
  */
 open class BaseResponse {
-    @JSONField(name = "Result")
+//    @JSONField(name = "Result")
     var result : String? = null
 
-    @JSONField(name = "Message")
+//    @JSONField(name = "Message")
     var message : String? = null
 }

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/CreateRequest.kt

@@ -8,6 +8,6 @@ import com.alibaba.fastjson.annotation.JSONField
  * @author jxing
  */
 class CreateRequest<T> {
-    @JSONField(name = "Content")
+//    @JSONField(name = "Content")
     var content : ArrayList<T>? = null
 }

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/CreateResponse.kt

@@ -9,6 +9,6 @@ import com.alibaba.fastjson.annotation.JSONField
  */
 class CreateResponse<T> : BaseResponse(){
 
-    @JSONField(name = "EntityList")
+//    @JSONField(name = "EntityList")
     var entityList : ArrayList<T>? = null
 }

+ 4 - 4
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCBuilding.kt

@@ -8,18 +8,18 @@ import com.alibaba.fastjson.annotation.JSONField
  * @author jxing
  */
 class DCBuilding {
-    @JSONField(name = "EquipID")
+//    @JSONField(name = "EquipID")
     var id : String? = null
 
     /** 建筑体名称 */
-    @JSONField(name = "BuildName")
+//    @JSONField(name = "BuildName")
     var name: String? = null
 
     /** 建筑本地编码 */
-    @JSONField(name = "BuildLocalID")
+//    @JSONField(name = "BuildLocalID")
     var localId: String? = null
 
     /** 建筑本地名称 */
-    @JSONField(name = "BuildLocalName")
+//    @JSONField(name = "BuildLocalName")
     var localName: String? = null
 }

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCComponent.kt

@@ -30,7 +30,7 @@ class DCComponent : DCEquipment(){
 //    var floorId: String? = null
 
     // 所属设备的id, 仅部件使用
-    @JSONField(name = "ParentId")
+    @JSONField(name = "parentId")
     var equipId : String? = null
 
     @JSONField(serialize=false)

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCDataBase.kt

@@ -8,6 +8,6 @@ import com.alibaba.fastjson.annotation.JSONField
  * @author jxing
  */
 open class DCDataBase {
-    @JSONField(name = "BIMID")
+//    @JSONField(name = "BIMID")
     var bimId : String? = null
 }

+ 16 - 14
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCEquipment.kt

@@ -1,7 +1,5 @@
 package com.persagy.revit.backstage.model
 
-import com.alibaba.fastjson.annotation.JSONField
-
 /**
  *
  *
@@ -12,39 +10,43 @@ open class DCEquipment : DCDataBase() {
 //    @JSONField(name = "BIMID")
 //    var bimId : String? = null
 
-    @JSONField(name = "EquipID")
+//    @JSONField(name = "EquipID")
     var id : String? = null
 
-    @JSONField(name = "BimLocation")
+//    @JSONField(name = "BimLocation")
     var bimLocation : String? = null
 
-    @JSONField(name = "EquipLocalName")
+//    @JSONField(name = "EquipLocalName")
     var localName : String? = null
 
-    @JSONField(name = "EquipLocalID")
+//    @JSONField(name = "EquipLocalID")
     var localId : String? = null
 
-    @JSONField(name = "Category")
+//    @JSONField(name = "Category")
     var category : String? = null
 
-    @JSONField(name = "FloorId")
+//    @JSONField(name = "FloorId")
     var floorId: String? = null
 
-    @JSONField(name = "CADID")
+//    @JSONField(name = "CADID")
     var cadId: String? = null
 
-    @JSONField(name = "ModelId")
+//    @JSONField(name = "ModelId")
     var modelId: String? = null
 
-    @JSONField(name = "BIMFamilyName")
+//    @JSONField(name = "BIMFamilyName")
     var familyName : String? = null
 
-    @JSONField(name = "BIMFamilySymbol")
+//    @JSONField(name = "BIMFamilySymbol")
     var familySymbol : String? = null
 
-    @JSONField(name = "BuildingId")
+//    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
-    @JSONField(name = "BIMTypeID")
+//    @JSONField(name = "BIMTypeID")
     var bimTypeID: String? = null
+
+    /** 转换后的信息点 */
+//    @JSONField(name = "Infos")
+    var infos: Map<String,String>? = null
 }

+ 7 - 7
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCFloor.kt

@@ -10,29 +10,29 @@ import com.alibaba.fastjson.annotation.JSONField
  */
 class DCFloor {
 
-    @JSONField(name = "FloorID")
+//    @JSONField(name = "floorID")
 //    @JSONField(name = "Id")
     var id : String? = null
 
     // 更新FloorMap 为 文件服务器上的key
-    @JSONField(name = "StructureInfo")
+    @JSONField(name = "infos")
     var structureInfo : HashMap<String, String>? = null
 
-    @JSONField(name = "ModelId")
+    @JSONField(name = "modelId")
     var modelId : String? = null
 
-    @JSONField(name = "Outline")
+    @JSONField(name = "outline")
     var outline : ArrayList<Point>? = null
 
     /** 楼层名称 */
-    @JSONField(name = "FloorName")
+//    @JSONField(name = "floorName")
     var name: String? = null
 
     /** 楼层本地名称 */
-    @JSONField(name = "FloorLocalName")
+//    @JSONField(name = "floorLocalName")
     var localName: String? = null
 
     /** 建筑id */
-    @JSONField(name = "BuildID")
+    @JSONField(name = "buildingId")
     var buildId: String? = null
 }

+ 11 - 11
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCISpace.kt

@@ -13,37 +13,37 @@ class DCISpace : DCDataBase(){
 //    @JSONField(name = "BIMID")
 //    var bimId : String? = null
 
-    @JSONField(name = "RoomID")
+//    @JSONField(name = "roomID")
     var id : String? = null
 
-    @JSONField(name = "BimLocation")
+//    @JSONField(name = "BimLocation")
     var bimLocation : String? = null
 
-    @JSONField(name = "RoomLocalName")
+//    @JSONField(name = "RoomLocalName")
     var localName : String? = null
 
-    @JSONField(name = "FloorId")
+//    @JSONField(name = "FloorId")
     var floorId: String? = null
 
-    @JSONField(name = "Height")
+//    @JSONField(name = "Height")
     var height: Double? = null
 
-    @JSONField(name = "Outline")
+//    @JSONField(name = "Outline")
     var outline: ArrayList<ArrayList<Point>>? = null
 
-    @JSONField(name = "Outline2")
+//    @JSONField(name = "Outline2")
     var outerOutline: ArrayList<ArrayList<Point>>? = null
 
-    @JSONField(name = "CADID")
+//    @JSONField(name = "CADID")
     var cadId: String? = null
 
-    @JSONField(name = "ModelId")
+//    @JSONField(name = "ModelId")
     var modelId: String? = null
 
     /** 建筑id */
-    @JSONField(name = "BuildingId")
+//    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
-    @JSONField(name = "CustomParam")
+//    @JSONField(name = "CustomParam")
     var customParam : HashMap<String, Any?>? = null
 }

+ 2 - 2
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/DCProperty.kt

@@ -10,10 +10,10 @@ import com.alibaba.fastjson.annotation.JSONField
 class DCProperty {
 
     /** 资产id */
-    @JSONField(name = "EquipID")
+//    @JSONField(name = "equipID")
     var id: String? = null
 
     /** 资产关联设备id */
-    @JSONField(name = "EquipmentId")
+//    @JSONField(name = "equipmentId")
     var equipId: String? = null
 }

+ 4 - 4
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/QueryRequest.kt

@@ -9,15 +9,15 @@ import com.alibaba.fastjson.annotation.JSONField
  */
 class QueryRequest {
 
-    @JSONField(name = "Filters")
+//    @JSONField(name = "Filters")
     var filters : String? = null
 
-    @JSONField(name = "PageNumber")
+//    @JSONField(name = "PageNumber")
     var pageNumber : Int = 1
 
-    @JSONField(name = "PageSize")
+//    @JSONField(name = "PageSize")
     var pageSize : Int = 60
 
-    @JSONField(name = "Orders")
+//    @JSONField(name = "Orders")
     var orders : String? = null
 }

+ 6 - 6
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/QueryResponse.kt

@@ -9,21 +9,21 @@ import com.alibaba.fastjson.annotation.JSONField
  */
 class QueryResponse<T> {
 
-    @JSONField(name = "Content")
+//    @JSONField(name = "Content")
     var content : ArrayList<T>? = null
 
-    @JSONField(name = "Result")
+//    @JSONField(name = "Result")
     var result : String? = null
 
-    @JSONField(name = "Message")
+//    @JSONField(name = "Message")
     var message : String? = null
 
-    @JSONField(name = "Total")
+//    @JSONField(name = "Total")
     var total : Int = 0
 
-    @JSONField(name = "PageNumber")
+//    @JSONField(name = "PageNumber")
     var pageNumber : Int = 0
 
-    @JSONField(name = "PageSize")
+//    @JSONField(name = "PageSize")
     var pageSize : Int = 0
 }

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/model/UpdateRequest.kt

@@ -8,6 +8,6 @@ import com.alibaba.fastjson.annotation.JSONField
  * @author jxing
  */
 class UpdateRequest<T> {
-    @JSONField(name = "Content")
+//    @JSONField(name = "Content")
     var content : ArrayList<T>? = null
 }

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/CheckErrorState_11.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.models.config.MyProperties
 import com.persagy.revit.models.modelFile.ModelFile

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/CheckPassedState_2.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.backstage.request.task.TaskCmd
 import com.persagy.revit.models.modelFile.ModelFile

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/DataCheckState_10.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/DataExportState_20.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ExportErrorState_21.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.models.config.MyProperties
 import com.persagy.revit.models.modelFile.ModelFile

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ExportPassedState_3.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.backstage.sync.SyncFloor
 import com.persagy.revit.backstage.sync.SyncUtil

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/FinishState_4.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.revit.models.modelFile.ModelFile
 import com.persagy.revit.models.modelFile.StatusInfo
 import com.persagy.revit.services.BaseDataService

+ 1 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/ModelState.kt

@@ -1,4 +1,4 @@
-package cn.sagacloud.server.algorithm.backstage.state
+package com.persagy.revit.backstage.state
 
 import org.springframework.stereotype.Component
 

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/SyncDataErrorState_31.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.models.modelFile.ModelFile
 import com.persagy.revit.services.BaseDataService

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/UploadState_0.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.models.config.MyProperties
 import com.persagy.revit.models.modelFile.ModelFile

+ 0 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/state/UploadedState_1.kt

@@ -1,6 +1,5 @@
 package com.persagy.revit.backstage.state
 
-import cn.sagacloud.server.algorithm.backstage.state.ModelState
 import com.persagy.database.SFilter
 import com.persagy.revit.backstage.request.task.TaskCmd
 import com.persagy.revit.models.modelFile.ModelFile

+ 5 - 1
revit-algorithm/src/main/kotlin/com/persagy/revit/backstage/sync/SyncEquipment.kt

@@ -1,12 +1,12 @@
 package com.persagy.revit.backstage.sync
 
 import cn.sagacloud.server.algorithm.backstage.sync.SyncObject
-import com.persagy.revit.models.entities.Equipment
 import com.persagy.revit.models.jsonAnalyzer.Point
 import com.persagy.revit.services.BaseDataService
 import com.persagy.database.SFilter
 import com.persagy.revit.backstage.model.DCEquipment
 import com.persagy.revit.backstage.model.DCFloor
+import com.persagy.revit.models.entities.Equipment
 import com.persagy.revit.models.modelFile.FloorModel
 import com.persagy.revit.services.CommonService
 import com.persagy.revit.services.datacenter.DataCenterService
@@ -160,6 +160,8 @@ class SyncEquipment : SyncObject {
             dcEquip.familySymbol = it.value.familySymbol
             dcEquip.modelId = it.value.modelId
             dcEquip.bimTypeID = it.value.bimTypeID
+            //添加信息点
+            dcEquip.infos = it.value.infos
             generateCADID(dcEquip)
             val point = it.value.location?.points?.get(0)
             addLocationAndFloorId(point, dcEquip, sb)
@@ -206,6 +208,8 @@ class SyncEquipment : SyncObject {
         dcEquip.familySymbol = equip.familySymbol
         dcEquip.modelId = equip.modelId
         dcEquip.bimTypeID = equip.bimTypeID
+        //更新信息点
+        dcEquip.infos = equip.infos
         updateList.add(dcEquip)
         if(equip.propertyId != null && dcEquip.id != null)
             propertyMap[equip.propertyId!!] = dcEquip.id!!

+ 4 - 4
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/LogController.kt

@@ -7,8 +7,8 @@ import com.persagy.revit.models.excel.nonBlockingReport.EquipNameCodeReport
 import com.persagy.revit.services.BaseDataService
 import com.persagy.revit.services.excel.ExcelService
 import com.persagy.service.utils.SSpringContextUtil
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse
  *
  * @author jxing
  */
-@Api(tags = ["楼层模型接口"])
+@Tag(name = "楼层模型接口")
 @RestController
 @RequestMapping("/log")
 class LogController {
@@ -42,7 +42,7 @@ class LogController {
     * @param   buildingCheckRequest     请求建筑文件夹id
     * @return  创建结果应答信息
     */
-    @ApiOperation(value = "检查建筑文件夹下的楼层", notes = "")
+    @Operation(summary = "检查建筑文件夹下的楼层", description =  "")
     @PostMapping(value = ["/building-check/excel"])
 //    fun buildingCheckExcel(response : HttpServletResponse, @RequestBody(required = true) buildingCheckRequest: BuildingCheckRequest) : SBaseResponse{
     fun buildingCheckExcel(response : HttpServletResponse, @RequestBody(required = true) buildingCheckRequest: PreciseCellValue){

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/log/SyncLogController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["同步日志接口"])
+@Tag(name = "同步日志接口")
 @RestController
 @RequestMapping("/sync-log")
 class SyncLogController {
@@ -61,7 +61,7 @@ class SyncLogController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建同步日志", notes = "")
+    @Operation(summary = "创建同步日志", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<SyncLogEntity>): SCreateResponse<SyncLogEntity> {
         return dataService.syncLogService.createList(entity)
@@ -73,7 +73,7 @@ class SyncLogController {
      * @param   idList      同步日志ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除同步日志", notes = "")
+    @Operation(summary = "删除同步日志", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<SyncLogEntity>): SBaseResponse {
         return dataService.syncLogService.deleteByKeysList(idList)
@@ -85,7 +85,7 @@ class SyncLogController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新同步日志", notes = "")
+    @Operation(summary = "更新同步日志", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<SyncLogEntity>): SBaseResponse {
         return dataService.syncLogService.updateList(request)
@@ -97,7 +97,7 @@ class SyncLogController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询同步日志", notes = "")
+    @Operation(summary = "查询同步日志", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<SyncLogEntity> {
         return dataService.syncLogService.pageQuery(request)
@@ -106,7 +106,7 @@ class SyncLogController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.syncLogService.count(request)

+ 4 - 4
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/BaseGraphController.kt

@@ -3,8 +3,8 @@ package com.persagy.revit.controllers.modelEntity
 import com.persagy.revit.models.request.BaseGraphRequest
 import com.persagy.revit.services.endpoint.BaseGraphService
 import com.persagy.service.models.responses.SBaseResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["获取底图接口"])
+@Tag(name = "获取底图接口")
 @RestController
 @RequestMapping("/base-graph")
 class BaseGraphController {
@@ -31,7 +31,7 @@ class BaseGraphController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value="查询底图", notes="")
+    @Operation(summary = "查询底图", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: BaseGraphRequest): SBaseResponse {
         return BaseGraphService.composeBaseGraph(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/BeaconController.kt

@@ -31,8 +31,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-信标接口"])
+@Tag(name = "构件-信标接口")
 @RestController
 @RequestMapping("/beacon")
 open class BeaconController {
@@ -63,7 +63,7 @@ open class BeaconController {
      * @param   entity     信标实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建信标", notes = "")
+    @Operation(summary = "创建信标", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Beacon>): SCreateResponse<Beacon> {
         return dataService.beaconService.createList(entity)
@@ -75,7 +75,7 @@ open class BeaconController {
      * @param   idList      信标ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除信标", notes = "")
+    @Operation(summary = "删除信标", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Beacon>): SBaseResponse {
         return dataService.beaconService.deleteByKeysList(idList)
@@ -87,7 +87,7 @@ open class BeaconController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value="更新信标", notes="")
+    @Operation(summary = "更新信标", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Beacon>): SBaseResponse {
         return dataService.beaconService.updateList(request)
@@ -99,7 +99,7 @@ open class BeaconController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value="查询信标", notes="")
+    @Operation(summary = "查询信标", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Beacon> {
         return dataService.beaconService.pageQuery(request)
@@ -108,7 +108,7 @@ open class BeaconController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.beaconService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/ColumnController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-柱子接口"])
+@Tag(name = "构件-柱子接口")
 @RestController
 @RequestMapping("/column")
 class ColumnController {
@@ -60,7 +60,7 @@ class ColumnController {
      * @param   entity     柱子实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建柱子", notes = "")
+    @Operation(summary = "创建柱子", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Column>): SCreateResponse<Column> {
         return dataService.columnService.createList(entity)
@@ -72,7 +72,7 @@ class ColumnController {
      * @param   idList      柱子ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除柱子", notes = "")
+    @Operation(summary = "删除柱子", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Column>): SBaseResponse {
         return dataService.columnService.deleteByKeysList(idList)
@@ -84,7 +84,7 @@ class ColumnController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新柱子", notes = "")
+    @Operation(summary = "更新柱子", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Column>): SBaseResponse {
         return dataService.columnService.updateList(request)
@@ -96,7 +96,7 @@ class ColumnController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询柱子", notes = "")
+    @Operation(summary = "查询柱子", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Column> {
         return dataService.columnService.pageQuery(request)
@@ -105,7 +105,7 @@ class ColumnController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.columnService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/ConnectorController.kt

@@ -10,8 +10,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-连接件接口"])
+@Tag(name = "构件-连接件接口")
 @RestController
 @RequestMapping("/connector")
 class ConnectorController {
@@ -41,7 +41,7 @@ class ConnectorController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建连接件", notes = "")
+    @Operation(summary = "创建连接件", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Connector>): SCreateResponse<Connector> {
         return dataService.connectorService.createList(entity)
@@ -53,7 +53,7 @@ class ConnectorController {
      * @param   idList      连接件ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除连接件", notes = "")
+    @Operation(summary = "删除连接件", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Connector>): SBaseResponse {
         return dataService.connectorService.deleteByKeysList(idList)
@@ -65,7 +65,7 @@ class ConnectorController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新连接件", notes = "")
+    @Operation(summary = "更新连接件", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Connector>): SBaseResponse {
         return dataService.connectorService.updateList(request)
@@ -77,7 +77,7 @@ class ConnectorController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询连接件", notes = "")
+    @Operation(summary = "查询连接件", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Connector> {
         return dataService.connectorService.pageQuery(request)
@@ -86,7 +86,7 @@ class ConnectorController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.connectorService.count(request)

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

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-门接口"])
+@Tag(name = "构件-门接口")
 @RestController
 @RequestMapping("/door")
 class DoorController {
@@ -60,7 +60,7 @@ class DoorController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建门", notes = "")
+    @Operation(summary = "创建门", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Door>): SCreateResponse<Door> {
         return dataService.doorService.createList(entity)
@@ -72,7 +72,7 @@ class DoorController {
      * @param   idList      门ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除门", notes = "")
+    @Operation(summary = "删除门", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Door>): SBaseResponse {
         return dataService.doorService.deleteByKeysList(idList)
@@ -84,7 +84,7 @@ class DoorController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新门", notes = "")
+    @Operation(summary = "更新门", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Door>): SBaseResponse {
         return dataService.doorService.updateList(request)
@@ -96,7 +96,7 @@ class DoorController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询门", notes = "")
+    @Operation(summary = "查询门", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Door> {
         return dataService.doorService.pageQuery(request)
@@ -105,7 +105,7 @@ class DoorController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.doorService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/DuctController.kt

@@ -32,8 +32,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-风管接口"])
+@Tag(name = "构件-风管接口")
 @RestController
 @RequestMapping("/duct")
 class DuctController {
@@ -63,7 +63,7 @@ class DuctController {
      * @param   entity     风管实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建风管", notes = "")
+    @Operation(summary = "创建风管", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Duct>): SCreateResponse<Duct> {
         return ductService.createList(entity)
@@ -75,7 +75,7 @@ class DuctController {
      * @param   idList      风管ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除风管", notes = "")
+    @Operation(summary = "删除风管", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Duct>): SBaseResponse {
         return ductService.deleteByKeysList(idList)
@@ -87,7 +87,7 @@ class DuctController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新风管", notes = "")
+    @Operation(summary = "更新风管", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Duct>): SBaseResponse {
         return ductService.updateList(request)
@@ -99,7 +99,7 @@ class DuctController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询风管", notes = "")
+    @Operation(summary = "查询风管", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Duct> {
         return ductService.pageQuery(request)
@@ -108,7 +108,7 @@ class DuctController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return ductService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/EquipPartController.kt

@@ -32,8 +32,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-部件接口"])
+@Tag(name = "构件-部件接口")
 @RestController
 @RequestMapping("/equip-part")
 class EquipPartController {
@@ -63,7 +63,7 @@ class EquipPartController {
      * @param   entity     部件实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建部件", notes = "")
+    @Operation(summary = "创建部件", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<EquipPart>): SCreateResponse<EquipPart> {
         return equipPartService.createList(entity)
@@ -75,7 +75,7 @@ class EquipPartController {
      * @param   idList      部件ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除部件", notes = "")
+    @Operation(summary = "删除部件", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<EquipPart>): SBaseResponse {
         return equipPartService.deleteByKeysList(idList)
@@ -87,7 +87,7 @@ class EquipPartController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新部件", notes = "")
+    @Operation(summary = "更新部件", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<EquipPart>): SBaseResponse {
         return equipPartService.updateList(request)
@@ -99,7 +99,7 @@ class EquipPartController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询部件", notes = "")
+    @Operation(summary = "查询部件", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<EquipPart> {
         return equipPartService.pageQuery(request)
@@ -108,7 +108,7 @@ class EquipPartController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return equipPartService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/EquipmentController.kt

@@ -31,8 +31,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-设备接口"])
+@Tag(name = "构件-设备接口")
 @RestController
 @RequestMapping("/equipment")
 class EquipmentController {
@@ -63,7 +63,7 @@ class EquipmentController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建设备", notes = "")
+    @Operation(summary = "创建设备", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Equipment>): SCreateResponse<Equipment> {
         return equipmentService.createList(entity)
@@ -75,7 +75,7 @@ class EquipmentController {
      * @param   idList      设备ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除设备", notes = "")
+    @Operation(summary = "删除设备", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Equipment>): SBaseResponse {
         return equipmentService.deleteByKeysList(idList)
@@ -87,7 +87,7 @@ class EquipmentController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新设备", notes = "")
+    @Operation(summary = "更新设备", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Equipment>): SBaseResponse {
         return equipmentService.updateList(request)
@@ -99,7 +99,7 @@ class EquipmentController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询设备", notes = "")
+    @Operation(summary = "查询设备", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
         return equipmentService.pageQuery(request)
@@ -108,7 +108,7 @@ class EquipmentController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return equipmentService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/GridController.kt

@@ -31,8 +31,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 庞利祥
  */
-@Api(tags = ["构件-轴网接口"])
+@Tag(name = "构件-轴网接口")
 @RestController
 @RequestMapping("/grid")
 class GridController {
@@ -62,7 +62,7 @@ class GridController {
      * @param   entity     轴网
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建轴网", notes = "")
+    @Operation(summary = "创建轴网", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Grid>): SCreateResponse<Grid> {
         return buildingService.createList(entity)
@@ -74,7 +74,7 @@ class GridController {
      * @param   idList      轴网列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除轴网", notes = "")
+    @Operation(summary = "删除轴网", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Grid>): SBaseResponse {
         return buildingService.deleteByKeysList(idList)
@@ -86,7 +86,7 @@ class GridController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新轴网", notes = "")
+    @Operation(summary = "更新轴网", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Grid>): SBaseResponse {
         return buildingService.updateList(request)
@@ -98,7 +98,7 @@ class GridController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询轴网", notes = "")
+    @Operation(summary = "查询轴网", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Grid> {
         return buildingService.pageQuery(request)
@@ -107,7 +107,7 @@ class GridController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return buildingService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/LevelController.kt

@@ -31,8 +31,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-标高接口"])
+@Tag(name = "构件-标高接口")
 @RestController
 @RequestMapping("/level")
 class LevelController {
@@ -63,7 +63,7 @@ class LevelController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建标高", notes = "")
+    @Operation(summary = "创建标高", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Level>): SCreateResponse<Level> {
         return levelService.createList(entity)
@@ -75,7 +75,7 @@ class LevelController {
      * @param   idList      标高ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除标高", notes = "")
+    @Operation(summary = "删除标高", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Level>): SBaseResponse {
         return levelService.deleteByKeysList(idList)
@@ -87,7 +87,7 @@ class LevelController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新标高", notes = "")
+    @Operation(summary = "更新标高", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Level>): SBaseResponse {
         return levelService.updateList(request)
@@ -99,7 +99,7 @@ class LevelController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询标高", notes = "")
+    @Operation(summary = "查询标高", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Level> {
         return levelService.pageQuery(request)
@@ -108,7 +108,7 @@ class LevelController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return levelService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/OtherController.kt

@@ -10,8 +10,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-其他对象接口"])
+@Tag(name = "构件-其他对象接口")
 @RestController
 @RequestMapping("/other")
 class OtherController {
@@ -41,7 +41,7 @@ class OtherController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建连接件", notes = "")
+    @Operation(summary = "创建连接件", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Other>): SCreateResponse<Other> {
         return dataService.otherService.createList(entity)
@@ -53,7 +53,7 @@ class OtherController {
      * @param   idList      其他对象ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除其他对象", notes = "")
+    @Operation(summary = "删除其他对象", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Other>): SBaseResponse {
         return dataService.otherService.deleteByKeysList(idList)
@@ -65,7 +65,7 @@ class OtherController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新其他对象", notes = "")
+    @Operation(summary = "更新其他对象", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Other>): SBaseResponse {
         return dataService.otherService.updateList(request)
@@ -77,7 +77,7 @@ class OtherController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询其他对象", notes = "")
+    @Operation(summary = "查询其他对象", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Other> {
         return dataService.otherService.pageQuery(request)
@@ -86,7 +86,7 @@ class OtherController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.otherService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/PipeController.kt

@@ -32,8 +32,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-水管接口"])
+@Tag(name = "构件-水管接口")
 @RestController
 @RequestMapping("/pipe")
 class PipeController {
@@ -62,7 +62,7 @@ class PipeController {
      * @param   entity     水管实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建水管", notes = "")
+    @Operation(summary = "创建水管", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Pipe>): SCreateResponse<Pipe> {
         return pipeService.createList(entity)
@@ -74,7 +74,7 @@ class PipeController {
      * @param   idList      水管ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除水管", notes = "")
+    @Operation(summary = "删除水管", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Pipe>): SBaseResponse {
         return pipeService.deleteByKeysList(idList)
@@ -86,7 +86,7 @@ class PipeController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新水管", notes = "")
+    @Operation(summary = "更新水管", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Pipe>): SBaseResponse {
         return pipeService.updateList(request)
@@ -98,7 +98,7 @@ class PipeController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询水管", notes = "")
+    @Operation(summary = "查询水管", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Pipe> {
         return pipeService.pageQuery(request)
@@ -107,7 +107,7 @@ class PipeController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return pipeService.count(request)

+ 116 - 0
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/RoomController.kt

@@ -0,0 +1,116 @@
+/*
+ * ********************************************************************************************************************
+ *
+ *                      :*$@@%$*:                         ;:                ;;    ;;
+ *                    :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
+ *                   :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
+ *                   =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
+ *                   =@*                                  %!              @ $= % %@=   =%@!      %=
+ *              *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
+ *            %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
+ *          ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
+ *          $@*   ;@@@%=!:                *@*
+ *          =@$    ;;;!=%@@@@=!           =@!
+ *           %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
+ *            ;%@@$=$@@%*       *@@@$=%@@%;
+ *               ::;::             ::;::                                              All rights reserved.
+ *
+ * ********************************************************************************************************************
+ */
+
+package com.persagy.revit.controllers.modelEntity
+
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.revit.models.entities.Room
+import com.persagy.service.SObjectService
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 房间接口
+ *
+ * @author Cainga
+ */
+@Tag(name = "房间接口")
+@RestController
+@RequestMapping("/room")
+class RoomController {
+
+    companion object {
+        // 日志
+        private val logger = LoggerFactory.getLogger(RoomController::class.java)
+    } // Companion object
+
+    private var roomService = SObjectService(SMybatisDao(Room::class.java))
+
+
+    /**
+     * 创建房间
+     *
+     * @param   entity     实体
+     * @return  创建结果应答信息
+     */
+    @Operation(summary = "创建房间", description =  "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody entity: SCreateRequest<Room>): SCreateResponse<Room> {
+        return roomService.createList(entity)
+    } // Function create()
+
+    /**
+     * 删除房间
+     *
+     * @param   idList      房间ID列表
+     * @return  删除结果应答信息
+     */
+    @Operation(summary = "删除房间", description =  "")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<Room>): SBaseResponse {
+        return roomService.deleteByKeysList(idList)
+    } // Function delete()
+
+    /**
+     * 更新房间
+     *
+     * @param   request     更新请求
+     * @return  更新结果应答信息
+     */
+    @Operation(summary = "更新房间", description =  "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<Room>): SBaseResponse {
+        return roomService.updateList(request)
+    } // Function update()
+
+    /**
+     * 查询房间
+     *
+     * @param   request     查询请求
+     * @return  查询结果应答信息
+     */
+    @Operation(summary = "查询房间", description =  "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Room> {
+        return roomService.pageQuery(request)
+    } // Function query()
+
+    /**
+     * 根据条件查询统计数量
+     */
+    @Operation(summary = "根据条件查询统计数量", description =  "")
+    @PostMapping(value = ["/count"])
+    fun count(@RequestBody request: SCountRequest): SCountResponse {
+        return roomService.count(request)
+    } // Function count()
+}

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/SpaceController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-空间接口"])
+@Tag(name = "构件-空间接口")
 @RestController
 @RequestMapping("/space")
 class SpaceController {
@@ -60,7 +60,7 @@ class SpaceController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建空间", notes = "")
+    @Operation(summary = "创建空间", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Space>): SCreateResponse<Space> {
         return dataService.spaceService.createList(entity)
@@ -72,7 +72,7 @@ class SpaceController {
      * @param   idList      空间ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除空间", notes = "")
+    @Operation(summary = "删除空间", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Space>): SBaseResponse {
         return dataService.spaceService.deleteByKeysList(idList)
@@ -84,7 +84,7 @@ class SpaceController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新空间", notes = "")
+    @Operation(summary = "更新空间", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Space>): SBaseResponse {
         return dataService.spaceService.updateList(request)
@@ -96,7 +96,7 @@ class SpaceController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询空间", notes = "")
+    @Operation(summary = "查询空间", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Space> {
         return dataService.spaceService.pageQuery(request)
@@ -105,7 +105,7 @@ class SpaceController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.spaceService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/VirtualWallController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-虚拟墙接口"])
+@Tag(name = "构件-虚拟墙接口")
 @RestController
 @RequestMapping("/vwall")
 class VirtualWallController {
@@ -60,7 +60,7 @@ class VirtualWallController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建虚拟墙", notes = "")
+    @Operation(summary = "创建虚拟墙", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<VirtualWall>): SCreateResponse<VirtualWall> {
         return dataService.virtualWallService.createList(entity)
@@ -72,7 +72,7 @@ class VirtualWallController {
      * @param   idList      虚拟墙ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除虚拟墙", notes = "")
+    @Operation(summary = "删除虚拟墙", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<VirtualWall>): SBaseResponse {
         return dataService.virtualWallService.deleteByKeysList(idList)
@@ -84,7 +84,7 @@ class VirtualWallController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新虚拟墙", notes = "")
+    @Operation(summary = "更新虚拟墙", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<VirtualWall>): SBaseResponse {
         return dataService.virtualWallService.updateList(request)
@@ -96,7 +96,7 @@ class VirtualWallController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询虚拟墙", notes = "")
+    @Operation(summary = "查询虚拟墙", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<VirtualWall> {
         return dataService.virtualWallService.pageQuery(request)
@@ -105,7 +105,7 @@ class VirtualWallController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.virtualWallService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/WallController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-墙接口"])
+@Tag(name = "构件-墙接口")
 @RestController
 @RequestMapping("/wall")
 class WallController {
@@ -61,7 +61,7 @@ class WallController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建墙", notes = "")
+    @Operation(summary = "创建墙", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Wall>): SCreateResponse<Wall> {
         return dataService.wallService.createList(entity)
@@ -73,7 +73,7 @@ class WallController {
      * @param   idList      墙ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除墙", notes = "")
+    @Operation(summary = "删除墙", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Wall>): SBaseResponse {
         return dataService.wallService.deleteByKeysList(idList)
@@ -85,7 +85,7 @@ class WallController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新墙", notes = "")
+    @Operation(summary = "更新墙", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Wall>): SBaseResponse {
         return dataService.wallService.updateList(request)
@@ -97,7 +97,7 @@ class WallController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询墙", notes = "")
+    @Operation(summary = "查询墙", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Wall> {
         return dataService.wallService.pageQuery(request)
@@ -106,7 +106,7 @@ class WallController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.wallService.count(request)

+ 8 - 8
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelEntity/WindowController.kt

@@ -30,8 +30,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["构件-窗接口"])
+@Tag(name = "构件-窗接口")
 @RestController
 @RequestMapping("/window")
 class WindowController {
@@ -61,7 +61,7 @@ class WindowController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建窗", notes = "")
+    @Operation(summary = "创建窗", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<Window>): SCreateResponse<Window> {
         return dataService.windowService.createList(entity)
@@ -73,7 +73,7 @@ class WindowController {
      * @param   idList      窗ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除窗", notes = "")
+    @Operation(summary = "删除窗", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Window>): SBaseResponse {
         return dataService.windowService.deleteByKeysList(idList)
@@ -85,7 +85,7 @@ class WindowController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新窗", notes = "")
+    @Operation(summary = "更新窗", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Window>): SBaseResponse {
         return dataService.windowService.updateList(request)
@@ -97,7 +97,7 @@ class WindowController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询窗", notes = "")
+    @Operation(summary = "查询窗", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Window> {
         return dataService.windowService.pageQuery(request)
@@ -106,7 +106,7 @@ class WindowController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         return dataService.windowService.count(request)

+ 11 - 11
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/FloorModelController.kt

@@ -42,8 +42,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.PostMapping
@@ -56,7 +56,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["楼层模型接口"])
+@Tag(name = "楼层模型接口")
 @RestController
 @RequestMapping("/model-floor")
 class FloorModelController {
@@ -92,7 +92,7 @@ class FloorModelController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询文件夹下的所有楼层", notes = "")
+    @Operation(summary = "查询文件夹下的所有楼层", description =  "")
     @PostMapping(value = ["/query-list"])
     fun queryList(@RequestBody request: SQueryRequest): SQueryResponse<FloorModelView> {
         val response = FloorModelService.pageQuery(request)
@@ -109,7 +109,7 @@ class FloorModelController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询文件夹下的所有楼层", notes = "")
+    @Operation(summary = "查询文件夹下的所有楼层", description =  "")
     @PostMapping(value = ["/query-list-missing"])
     fun queryListWithMissing(@RequestBody request: SQueryRequest): SQueryResponse<FloorModelView> {
         val response = FloorModelService.pageQuery(request)
@@ -129,7 +129,7 @@ class FloorModelController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询楼层", notes = "")
+    @Operation(summary = "查询楼层", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<FloorModel> {
         val sb = StringBuilder()
@@ -151,7 +151,7 @@ class FloorModelController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建模型楼层", notes = "")
+    @Operation(summary = "创建模型楼层", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<FloorModel>): SCreateResponse<FloorModel> {
         entity.content.stream().forEach { x ->
@@ -167,7 +167,7 @@ class FloorModelController {
      * @param   idList      删除模型文件夹ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除模型文件夹", notes = "")
+    @Operation(summary = "删除模型文件夹", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<FloorModel>): SBaseResponse {
         return dataService.floorModelService.deleteByKeysList(idList)
@@ -179,7 +179,7 @@ class FloorModelController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新模型文件名字", notes = "")
+    @Operation(summary = "更新模型文件名字", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<FloorModel>): SBaseResponse {
         return dataService.floorModelService.updateList(request)
@@ -188,7 +188,7 @@ class FloorModelController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val sb = StringBuilder()
@@ -207,7 +207,7 @@ class FloorModelController {
     /**
      * 绑定数据中心楼层id, 并生成底图文件上传文件服务器
      */
-    @ApiOperation(value = "绑定数据中心楼层id (FloorId), 并生成底图文件上传文件服务器", notes = "输入需要Id(模型文件管理id), FloorId(数据中心楼层id)")
+    @Operation(summary = "绑定数据中心楼层id (FloorId), 并生成底图文件上传文件服务器", description =  "输入需要Id(模型文件管理id), FloorId(数据中心楼层id)")
     @PostMapping(value = ["/bind"])
     fun bind(@RequestBody request: FloorModel): SBaseResponse {
         try {

+ 16 - 16
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelFileController.kt

@@ -46,8 +46,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.*
@@ -58,7 +58,7 @@ import java.util.*
  *
  * @author jxing
  */
-@Api(tags = ["模型文件接口"])
+@Tag(name = "模型文件接口")
 @RestController
 @RequestMapping("/model-file")
 class ModelFileController {
@@ -94,7 +94,7 @@ class ModelFileController {
      * @param   idList      删除列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除模型文件(只有记录, 文件不动)", notes = "")
+    @Operation(summary = "删除模型文件(只有记录, 文件不动)", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<ModelFile>): SBaseResponse {
         return dataService.modelFileService.deleteByKeysList(idList)
@@ -106,7 +106,7 @@ class ModelFileController {
      * @param   modelFile      要删除的模型文件
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除模型文件 (真删除模型文件, 模型文件记录做删除标记, 有个别情况不允许删除文件)", notes = "")
+    @Operation(summary = "删除模型文件 (真删除模型文件, 模型文件记录做删除标记, 有个别情况不允许删除文件)", description =  "")
     @PostMapping(value = ["/delete-file"])
     fun deleteFile(@RequestBody modelFile: ModelFile): SBaseResponse {
         return modelFileService.removeSingle(modelFile, properties, isForce = modelFile.isForce?:false, isMarkDelete = true)
@@ -119,7 +119,7 @@ class ModelFileController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新模型记录, 并非文件", notes = "")
+    @Operation(summary = "更新模型记录, 并非文件", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<ModelFile>): SBaseResponse {
         return dataService.modelFileService.updateList(request)
@@ -131,7 +131,7 @@ class ModelFileController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询模型文件", notes = "")
+    @Operation(summary = "查询模型文件", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<ModelFile> {
         if(SPageContext.getHeader("ProjectId") != null && SPageContext.getHeader("ProjectId")!!.isNotEmpty())
@@ -145,7 +145,7 @@ class ModelFileController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建模型文件", notes = "")
+    @Operation(summary = "创建模型文件", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<ModelFile>): SCreateResponse<ModelFile> {
         entity.content.stream().forEach { x ->
@@ -160,7 +160,7 @@ class ModelFileController {
 //     */
 //    @PostMapping("/uploadaa")
 //    @ResponseBody
-//    @ApiOperation(value = "上传模型文件接口", notes = "")
+//    @Operation(summary = "上传模型文件接口", description =  "")
 //    fun multiUpload(@RequestParam("file") file: MultipartFile, @RequestParam("model") modelFile: ModelFile): SBaseResponse {
 //        try {
 //            // 检查是否可以上传(所属楼层模型是否存在, 是否有人正在上传模型), 检测文件是否正常
@@ -220,7 +220,7 @@ class ModelFileController {
      */
     @PostMapping("/upload")
     @ResponseBody
-    @ApiOperation(value = "准备分片上传模型文件接口", notes = "")
+    @Operation(summary = "准备分片上传模型文件接口", description =  "")
     fun multipartUpload(@RequestBody request: UploadModelRequest): SBaseResponse {
         try {
             modelFileService.checkUploadInputValid(request)
@@ -259,7 +259,7 @@ class ModelFileController {
 
     @PostMapping("/merge")
     @ResponseBody
-    @ApiOperation(value = "在完成分片上传之后, 合并所有已上传的分片接口", notes = "")
+    @Operation(summary = "在完成分片上传之后, 合并所有已上传的分片接口", description =  "")
     fun mergeMultipartUpload(@RequestBody request: MergeMultipartRequest): SBaseResponse {
         try{
             modelFileService.checkMergeUploadInputValid(request)
@@ -299,7 +299,7 @@ class ModelFileController {
     @Autowired
     lateinit var producer: JMSProducer
 
-    @ApiOperation(value = "测试发送JMS消息", notes = "")
+    @Operation(summary = "测试发送JMS消息", description =  "")
     @PostMapping(value = ["/sendmsg"])
     fun testJMS(@RequestBody request: String) : SBaseResponse{
         try {
@@ -313,7 +313,7 @@ class ModelFileController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val sb = StringBuilder()
@@ -334,7 +334,7 @@ class ModelFileController {
 //     */
 //    @PostMapping("/upload")
 //    @ResponseBody
-//    @ApiOperation(value = "上传模型文件接口", notes = "")
+//    @Operation(summary = "上传模型文件接口", description =  "")
 //    fun multiUpload(request : HttpServletRequest, @RequestParam("note") note: String) : String {
 //        val multipartRequest = request as MultipartHttpServletRequest
 //        val jsonTxt = note
@@ -357,7 +357,7 @@ class ModelFileController {
     /**
      * 模型文件json数据导入
      */
-    @ApiOperation(value = "模型文件json数据导入", notes = "")
+    @Operation(summary = "模型文件json数据导入", description =  "")
     @GetMapping(value = ["/export"])
     fun export(@RequestParam modelId: String): SBaseResponse {
         try {
@@ -368,7 +368,7 @@ class ModelFileController {
             // 解析json
             jsonData = jsonAnalyzerService.analyzeJsonzFile(fileStream)
             val importResult = jsonAnalyzerService.importModelData(jsonData!!, "")
-            return SBaseResponse(SResponseType.success)
+            return importResult
         }catch (e : Exception){
             return SBaseResponse(SResponseType.failure, e.message?: "")
         }

+ 9 - 9
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelFileFolderController.kt

@@ -35,8 +35,8 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.PostMapping
@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["模型文件夹接口"])
+@Tag(name = "模型文件夹接口")
 @RestController
 @RequestMapping("/model-folder")
 class ModelFileFolderController {
@@ -69,7 +69,7 @@ class ModelFileFolderController {
      * @param   entity     实体
      * @return  创建结果应答信息
      */
-    @ApiOperation(value = "创建模型文件夹", notes = "")
+    @Operation(summary = "创建模型文件夹", description =  "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody entity: SCreateRequest<ModelFileFolder>): SCreateResponse<ModelFileFolder> {
         entity.content.stream().forEach { x ->
@@ -85,7 +85,7 @@ class ModelFileFolderController {
      * @param   idList      删除模型文件夹ID列表
      * @return  删除结果应答信息
      */
-    @ApiOperation(value = "删除模型文件夹", notes = "")
+    @Operation(summary = "删除模型文件夹", description =  "")
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<ModelFileFolder>): SBaseResponse {
         return ModelFileFolderService.deleteFolder(idList)
@@ -97,7 +97,7 @@ class ModelFileFolderController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新模型文件夹名字", notes = "")
+    @Operation(summary = "更新模型文件夹名字", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<ModelFileFolder>): SBaseResponse {
         return dataService.folderService.updateList(request)
@@ -109,7 +109,7 @@ class ModelFileFolderController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询模型文件夹", notes = "")
+    @Operation(summary = "查询模型文件夹", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<ModelFileFolder> {
         var sb = StringBuilder()
@@ -128,7 +128,7 @@ class ModelFileFolderController {
     /**
      * 根据条件查询统计数量
      */
-    @ApiOperation(value = "根据条件查询统计数量", notes = "")
+    @Operation(summary = "根据条件查询统计数量", description =  "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val sb = StringBuilder()
@@ -148,7 +148,7 @@ class ModelFileFolderController {
     /**
      * 根据模型id获取模型所属楼层名, 所属文件夹名
      */
-    @ApiOperation(value = "根据楼层id获取楼层名, 所属文件夹名", notes = "只填楼层Id")
+    @Operation(summary = "根据楼层id获取楼层名, 所属文件夹名", description =  "只填楼层Id")
     @PostMapping(value = ["/get-name"])
     fun getName(@RequestBody request: ModelFile): SBaseResponse {
         if(request.id.isNullOrBlank()){

+ 5 - 5
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ModelMonitorController.kt

@@ -6,8 +6,8 @@ import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.requests.SUpdateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author jxing
  */
-@Api(tags = ["楼层模型接口"])
+@Tag(name = "楼层模型接口")
 @RestController
 @RequestMapping("/model-monitor")
 class ModelMonitorController {
@@ -37,7 +37,7 @@ class ModelMonitorController {
      * @param   request     查询请求
      * @return  查询结果应答信息
      */
-    @ApiOperation(value = "查询监控记录", notes = "")
+    @Operation(summary = "查询监控记录", description =  "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<ModelMonitor> {
         return dataService.modelMonitorService.pageQuery(request)
@@ -49,7 +49,7 @@ class ModelMonitorController {
      * @param   request     更新请求
      * @return  更新结果应答信息
      */
-    @ApiOperation(value = "更新监控记录", notes = "")
+    @Operation(summary = "更新监控记录", description =  "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<ModelMonitor>): SBaseResponse {
         return dataService.modelMonitorService.updateList(request)

+ 5 - 5
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/ReportController.kt

@@ -18,8 +18,8 @@ import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse
  *
  * @author jxing
  */
-@Api(tags = ["报告接口"])
+@Tag(name = "报告接口")
 @RestController
 @RequestMapping("/report")
 class ReportController {
@@ -52,7 +52,7 @@ class ReportController {
     /**
      * 根据模型id获取模型所属楼层名, 所属文件夹名
      */
-    @ApiOperation(value = "非阻塞性报告列表", notes = "填文件夹Id和项目id")
+    @Operation(summary = "非阻塞性报告列表", description =  "填文件夹Id和项目id")
     @PostMapping(value = ["/list/non-blocking"])
     fun getNonBlockingReportList(@RequestBody(required = true) request: ModelFileFolder) : SBaseResponse{
         val errorResponse = SBaseResponse(SResponseType.failure)
@@ -91,7 +91,7 @@ class ReportController {
     /**
      * 根据模型id获取模型所属楼层名, 所属文件夹名
      */
-    @ApiOperation(value = "下载非阻塞性报告", notes = "填文件夹Id和项目id")
+    @Operation(summary = "下载非阻塞性报告", description =  "填文件夹Id和项目id")
     @PostMapping(value = ["/non-blocking"])
     fun getNonBlockingReport(response : HttpServletResponse, @RequestBody(required = true) request: ModelFileFolder){
         val errorResponse = SBaseResponse(SResponseType.failure)

+ 64 - 0
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/TestController.kt

@@ -0,0 +1,64 @@
+package com.persagy.revit.controllers.modelFile
+
+import com.persagy.base.extensions.toJson
+import com.persagy.revit.models.config.MyProperties
+import com.persagy.revit.models.jsonAnalyzer.AllComponents
+import com.persagy.revit.models.jsonAnalyzer.BaseObj
+import com.persagy.revit.services.CommonService
+import com.persagy.revit.services.http.HttpService
+import com.persagy.revit.services.json.JSONAnalyzerService
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * @author Cainga
+ * @date 2020/12/8 9:35
+ */
+@Tag(name = "测试接口")
+@RestController
+@RequestMapping("/test")
+open class TestController {
+
+    @Autowired
+    private val prop: MyProperties? = null
+
+    @Autowired
+    lateinit var jsonAnalyzerService : JSONAnalyzerService
+
+    @Autowired
+    lateinit var myProperties : MyProperties
+
+    /**
+     * 测试
+     */
+    @Operation(summary = "模型文件json数据导入", description =  "")
+    @GetMapping(value = ["/test"])
+    fun test11(){
+
+
+        "a67ac1ec8fef11ea9dfea9a679dda25a"
+        val id = "03e4dbc2192011ebb7c2517abf7cc6d61"
+        var jsonData : BaseObj<AllComponents>?
+        var size = 0L
+        try {
+            val url = CommonService.getExportJSONDownloadUrl(id, myProperties)
+            println(url)
+//            size = CommonService.getRemoteHttpFileSize(url)
+            val fileStream = HttpService.getInputStream(url)
+            //解析json
+            jsonData = jsonAnalyzerService.analyzeJsonzFile(fileStream)
+
+//            jsonData = JSONObject.parseObject(josn,BaseObj<AllComponents>().javaClass)
+
+            val importResult = jsonAnalyzerService.importModelData(jsonData!!, "")
+            println(importResult.toJson())
+        }catch (e : Exception){
+            println(e.message)
+        }
+
+    }
+}

+ 5 - 5
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/modelFile/UploadController.kt

@@ -7,8 +7,8 @@ import com.persagy.revit.services.json.JSONAnalyzerService
 import com.persagy.revit.services.monitor.ModelMonitorService
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.*
@@ -21,7 +21,7 @@ import java.util.*
  *
  * @author jxing
  */
-@Api(tags = ["上传json-zip接口"])
+@Tag(name = "上传json-zip接口")
 @RestController
 @RequestMapping("/upload-json-zip")
 class UploadController {
@@ -51,7 +51,7 @@ class UploadController {
      */
     @PostMapping("/upload")
     @ResponseBody
-    @ApiOperation(value = "上传Zip文件", notes = "")
+    @Operation(summary = "上传Zip文件", description =  "")
     fun upload(@RequestParam("file") file: MultipartFile): SBaseResponse {
         val beginTime = Date()
         var modelId : String? = null
@@ -91,7 +91,7 @@ class UploadController {
 //     */
 //    @PostMapping("/upload_old")
 //    @ResponseBody
-//    @ApiOperation(value = "上传Zip文件", notes = "")
+//    @Operation(summary = "上传Zip文件", description =  "")
 //    fun upload_old(@RequestParam("file") file: MultipartFile): SBaseResponse {
 //        try {
 //            val map = UploadService.getJSONObjectMap(file.inputStream)

+ 6 - 6
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/relation/CheckController.kt

@@ -23,8 +23,8 @@ package com.persagy.revit.controllers.relation
 import com.persagy.revit.models.responses.CheckFloorMissResponse
 import com.persagy.revit.models.responses.CheckFloorSequenceResponse
 import com.persagy.revit.models.responses.CheckGridResponse
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 庞利祥
  */
-@Api(tags = ["检查-楼层审核"])
+@Tag(name = "检查-楼层审核")
 @RestController
 @RequestMapping("/check")
 class CheckController {
@@ -47,7 +47,7 @@ class CheckController {
     /**
      * 楼层缺失检查
      */
-    @ApiOperation(value = "楼层缺失检查", notes = "")
+    @Operation(summary = "楼层缺失检查", description =  "")
     @PostMapping(value = ["/floor-miss"])
     fun floorMiss(): CheckFloorMissResponse {
         return CheckFloorMissResponse()
@@ -56,7 +56,7 @@ class CheckController {
     /**
      * 楼层顺序号检查
      */
-    @ApiOperation(value = "楼层缺失检查", notes = "")
+    @Operation(summary = "楼层缺失检查", description =  "")
     @PostMapping(value = ["/floor-sequence"])
     fun floorSequence(): CheckFloorSequenceResponse {
         return CheckFloorSequenceResponse()
@@ -65,7 +65,7 @@ class CheckController {
     /**
      * 轴网检查
      */
-    @ApiOperation(value = "轴网检查", notes = "")
+    @Operation(summary = "轴网检查", description =  "")
     @PostMapping(value = ["/grid"])
     fun grid(): CheckGridResponse {
         return CheckGridResponse()

+ 0 - 0
revit-algorithm/src/main/kotlin/com/persagy/revit/controllers/relation/RelationCheckController.kt


Some files were not shown because too many files changed in this diff