Browse Source

********************WX************************
蜡笔森林:<wip>> <修改服务接口>
数据中心:<wip>> <添加MQ>
数据中同步:<wip>> <添加MQ>

zhangweixin 4 years ago
parent
commit
660f0bada7
100 changed files with 1097 additions and 1254 deletions
  1. 4 3
      data-core/build.gradle
  2. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/AttPic.kt
  3. 4 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/BIMLocation.kt
  4. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/BuildingFloorInfo.kt
  5. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/GeneralSystemCategory.kt
  6. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ObjInfos.kt
  7. 7 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointImage.kt
  8. 4 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointPosition.kt
  9. 4 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ShaftFuncType.kt
  10. 13 44
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ShaftWithCount.kt
  11. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/TaskPic.kt
  12. 7 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ViewEquipSystem.kt
  13. 3 3
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/base/BaseInfo.kt
  14. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/base/RBaseInfo.kt
  15. 10 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DClassDef.kt
  16. 23 24
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DPropertyDef.kt
  17. 23 32
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DPropertyDefML.kt
  18. 23 24
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataCenterPropertyDefScheme.kt
  19. 21 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescription.kt
  20. 7 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataDictionaryDescriptionProject.kt
  21. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformScheme.kt
  22. 22 23
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataPlatformSchemeInfo.kt
  23. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictAirConditioner.kt
  24. 4 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBatchProcessing.kt
  25. 10 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBuildingFunctional.kt
  26. 6 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBuildingStructureType.kt
  27. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictClimate.kt
  28. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictContaminationLevel.kt
  29. 8 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDevelop.kt
  30. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDirection.kt
  31. 7 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDustproof.kt
  32. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictFloorType.kt
  33. 6 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictGreenBuildLev.kt
  34. 6 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictHeatingType.kt
  35. 6 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictInsulateType.kt
  36. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictPollutionLevel.kt
  37. 15 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictProvincialCityCode.kt
  38. 7 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictRental.kt
  39. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSeismicFortificationIntensity.kt
  40. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSpaceFunctionalTypes.kt
  41. 9 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSpaceProject.kt
  42. 11 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictWind.kt
  43. 7 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DitcWeather.kt
  44. 9 24
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipCategory.kt
  45. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipFamily.kt
  46. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipFamilyCategory.kt
  47. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ExplainAllCategories.kt
  48. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/Family.kt
  49. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/GeneralSystemCategory.kt
  50. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/ProjectScheme.kt
  51. 22 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/PropertyDefControlInfo.kt
  52. 24 25
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/PropertyDefProjectInfo.kt
  53. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/SpaceInfoDic.kt
  54. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictCustomScheme.kt
  55. 17 18
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictDatacenterProjectcustom.kt
  56. 14 15
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictProjectCustomDatacenterNew.kt
  57. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictSchemeProject.kt
  58. 12 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionDatallatformLog.kt
  59. 12 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictTypeConversionLog.kt
  60. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefClass.kt
  61. 44 44
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt
  62. 3 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdProject.kt
  63. 3 4
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdScheme.kt
  64. 10 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictMajor.kt
  65. 8 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictProject.kt
  66. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictScheme.kt
  67. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeAndProject.kt
  68. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeCategoty.kt
  69. 6 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictSchemeCategotyInfo.kt
  70. 9 10
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/Group.kt
  71. 10 11
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/GraphicType.kt
  72. 18 19
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MDoor.kt
  73. 11 12
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MVirtualWall.kt
  74. 17 18
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/MWindow.kt
  75. 25 26
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationType.kt
  76. 29 30
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationTypeProject.kt
  77. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlock.kt
  78. 18 19
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockFamilyItem.kt
  79. 5 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockItem.kt
  80. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockResponse.kt
  81. 11 12
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockSource.kt
  82. 7 9
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/ConnectedBlockSourceRequest.kt
  83. 4 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/EquipIdUUIDMap.kt
  84. 7 8
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/MepSourceTypeEntity.kt
  85. 5 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/RelationAddRequest.kt
  86. 15 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  87. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt
  88. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentFloor.kt
  89. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelEquipmentShaft.kt
  90. 22 23
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelFloor.kt
  91. 30 31
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystem.kt
  92. 30 31
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemBuilding.kt
  93. 30 31
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemFloor.kt
  94. 30 31
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystemShaft.kt
  95. 15 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelProperty.kt
  96. 15 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelPropertyShaft.kt
  97. 11 12
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelShaft.kt
  98. 15 16
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.kt
  99. 16 17
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt
  100. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt

+ 4 - 3
data-core/build.gradle

@@ -33,9 +33,10 @@ 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
+    // 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
 
 //    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
 //    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION

+ 8 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/AttPic.kt

@@ -20,8 +20,7 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Table
@@ -31,35 +30,35 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "图片实体类")
+@Schema(description = "图片实体类")
 @Table(name = "att_pic")
 class AttPic: Serializable {
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     @Column(name = "id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     var name: String? = null
 
     /** key */
-    @ApiModelProperty(value = "key")
+    @Schema(description = "key")
     @Column(name = "key")
     var key: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     var type: String? = null
 
     /** 系统id */
-    @ApiModelProperty(value = "系统id")
+    @Schema(description = "系统id")
     @Column(name = "system_id")
     var systemId: String? = null
 
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     var createTime: String? = null
 
 } // Class AttPic

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

@@ -1,7 +1,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
 /**
@@ -12,18 +12,15 @@ import java.io.Serializable
 class BIMLocation : Serializable {
 
     /** 坐标x */
-    @ApiModelProperty(value = "坐标X")
-    @JSONField(name = "X")
+    @Schema(description = "坐标X")
     var x: Double? = null
 
     /** 坐标y */
-    @ApiModelProperty(value = "坐标y")
-    @JSONField(name = "Y")
+    @Schema(description = "坐标y")
     var y: Double? = null
 
     /** 坐标Z */
-    @ApiModelProperty(value = "坐标Z")
-    @JSONField(name = "Z")
+    @Schema(description = "坐标Z")
     var z: Double? = null
 
 } // Class BIMLocation

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 
@@ -31,29 +30,29 @@ import javax.persistence.Column
  *
  * @author 张维新
  */
-@ApiModel(description = "建筑楼层信息")
+@Schema(description = "建筑楼层信息")
 class BuildingFloorInfo : Serializable {
 
     /** 建筑体ID */
-    @ApiModelProperty(value = "建筑体ID")
+    @Schema(description = "建筑体ID")
     @Column(name = "build_id")
     @JSONField(name = "BuildID")
     var buildID: String? = null
 
     /** 建筑体名称 */
-    @ApiModelProperty(value = "建筑体名称")
+    @Schema(description = "建筑体名称")
     @Column(name = "build_name")
     @JSONField(name = "BuildName")
     var buildName: String? = null
 
     /** 楼层ID */
-    @ApiModelProperty(value = "楼层ID")
+    @Schema(description = "楼层ID")
     @Column(name = "floor_id")
     @JSONField(name = "FloorID")
     var floorID: String? = null
 
     /** 楼层名称 */
-    @ApiModelProperty(value = "楼层名称")
+    @Schema(description = "楼层名称")
     @Column(name = "floor_name")
     @JSONField(name = "FloorName")
     var floorName: String? = null

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统分类")
+@Schema(description = "系统分类")
 @Table(name = "dict.class_def")
 class GeneralSystemCategory : Serializable {
 
     /** 设备分类编码 */
-    @ApiModelProperty(value = "设备分类编码")
+    @Schema(description = "设备分类编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备分类名字*/
-    @ApiModelProperty(value = "设备分类名字")
+    @Schema(description = "设备分类名字")
     @Column(name = "name")
     @JSONField(name = "CategoryName")
     var categoryName: String? = null

+ 8 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ObjInfos.kt

@@ -20,8 +20,7 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Table
@@ -31,37 +30,37 @@ import javax.persistence.Table
  *
  * @author 李井强
  */
-@ApiModel(description = "obj_infos")
+@Schema(description = "obj_infos")
 @Table(name = "pointconfig.obj_infos")
 open class ObjInfos : Serializable {
 
     /** project_id */
-    @ApiModelProperty(value = "project_id")
+    @Schema(description = "project_id")
     @Column(name = "project_id")
     var projectId: String? = null
 
     /** obj_type */
-    @ApiModelProperty(value = "obj_type")
+    @Schema(description = "obj_type")
     @Column(name = "obj_type")
     var objType: String? = null
 
     /** obj_id */
-    @ApiModelProperty(value = "obj_id")
+    @Schema(description = "obj_id")
     @Column(name = "obj_id")
     var objId: String? = null
 
     /** info_id */
-    @ApiModelProperty(value = "info_id")
+    @Schema(description = "info_id")
     @Column(name = "info_id")
     var infoId: String? = null
 
     /** time */
-    @ApiModelProperty(value = "time")
+    @Schema(description = "time")
     @Column(name = "time")
     var time: String? = null
 
     /** s_value */
-    @ApiModelProperty(value = "s_value")
+    @Schema(description = "s_value")
     @Column(name = "s_value")
     var value: String? = null
 

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,33 +12,30 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "点位图片")
+@Schema(description = "点位图片")
 @Table(name = "scanbuilding.image")
 class PointImage : SBaseEntity() {
 
     /** 图片 key */
-    @ApiModelProperty(value =" 图片key")
+    @Schema(description =" 图片key")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Key")
+    @JSONField(name = "key")
     var id: String? = null
 
     /** 图片类型 */
-    @ApiModelProperty(value =" 图片类型")
+    @Schema(description =" 图片类型")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** 图片类型 */
-    @ApiModelProperty(value =" 图片类型")
+    @Schema(description =" 图片类型")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     /** 对象id */
-    @ApiModelProperty(value =" 对象id")
+    @Schema(description =" 对象id")
     @Column(name = "object_id")
-    @JSONField(name = "ObjectId")
     var objectId: String? = null
 
 } // Class PointImage

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

@@ -1,6 +1,6 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
 /**
@@ -11,15 +11,15 @@ import java.io.Serializable
 class PointPosition : Serializable{
 
     /** 坐标x */
-    @ApiModelProperty(value = "坐标x",required = true)
+    @Schema(description = "坐标x",required = true)
     var x: Double? = null
 
     /** 坐标y */
-    @ApiModelProperty(value = "坐标y",required = true)
+    @Schema(description = "坐标y",required = true)
     var y: Double? = null
 
     /** 坐标z */
-    @ApiModelProperty(value = "坐标z",required = true)
+    @Schema(description = "坐标z",required = true)
     var z: Double? = null
 
 } // Class PointPosition

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,21 +12,19 @@ import javax.persistence.Table
  *
  * @author  李井强
  */
-@ApiModel(description = "竖井功能实体类")
+@Schema(description = "竖井功能实体类")
 @Table(name = "shaft_func_type")
 class ShaftFuncType : BaseInfo() {
 
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
 } // Class ShaftFuncType

+ 13 - 44
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ShaftWithCount.kt

@@ -1,9 +1,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,90 +11,61 @@ import javax.persistence.Table
  *
  * @author  李井强
  */
-@ApiModel(description = "竖井信息(带统计)实体类")
+@Schema(description = "竖井信息(带统计)实体类")
 @Table(name = "shaft_statis")
 class ShaftWithCount : BaseInfo() {
 
     /** 竖井id */
-    @ApiModelProperty(value = "竖井id")
+    @Schema(description = "竖井id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "ShaftID")
     var id: String? = null
 
     /** 竖井名称 */
-    @ApiModelProperty(value = "竖井名称")
+    @Schema(description = "竖井名称")
     @Column(name = "name")
-    @JSONField(name = "ShaftName")
     var name: String? = null
 
     /** 竖井本地编码 */
-    @ApiModelProperty(value = "竖井本地编码")
+    @Schema(description = "竖井本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "ShaftLocalID")
     var localId: String? = null
 
     /** 竖井本地名称 */
-    @ApiModelProperty(value = "竖井本地名称")
+    @Schema(description = "竖井本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "ShaftLocalName")
     var localName: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
-//    /** 竖井功能 */
-//    @ApiModelProperty(value = "竖井功能")
-//    @Column(name = "func_type")
-//    @JSONField(name = "ShaftFuncType")
-//    var funcType: String? = null
-//
-//    /** 竖井面积 */
-//    @ApiModelProperty(value = "竖井面积")
-//    @Column(name = "area")
-//    @JSONField(name = "Area")
-//    var area: Double? = null
-//
-//    /** 竖井高 */
-//    @ApiModelProperty(value = "竖井高")
-//    @Column(name = "height")
-//    @JSONField(name = "Height")
-//    var height: Double? = null
-
     /** 建筑id集合 */
-    @ApiModelProperty(value = "建筑id集合")
-    @JSONField(name = "BuildingList")
+    @Schema(description = "建筑id集合")
     var buildingList: List<String>? = null
 
     /** 楼层id集合 */
-    @ApiModelProperty(value = "楼层id集合")
-    @JSONField(name = "FloorList")
+    @Schema(description = "楼层id集合")
     var floorList: List<String>? = null
 
     /** 空间数 */
-    @ApiModelProperty(value = "空间数")
+    @Schema(description = "空间数")
     @Column(name = "spacecount")
-    @JSONField(name = "SpaceCount")
     var spacecount: Long = 0
 
     /** 空间列表 */
-    @ApiModelProperty(value = "空间列表")
+    @Schema(description = "空间列表")
     @Column(name = "spacelist")
-    @JSONField(name = "SpaceList")
     var spacelist: String? = null
 
     /** 结构信息 */
-    @ApiModelProperty(value = "结构信息")
+    @Schema(description = "结构信息")
     @Column(name = "structure_info")
-    @JSONField(name = "StructureInfo")
     var structureInfo: HashMap<String, Any?>? = null
 } // Class ShaftWithCount

+ 8 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/TaskPic.kt

@@ -1,7 +1,6 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
 /**
@@ -9,30 +8,30 @@ import java.io.Serializable
  *
  * @author  张维新
  */
-@ApiModel(description = "图片实体类")
+@Schema(description = "图片实体类")
 class TaskPic : Serializable {
 
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     var name: String? = null
 
     /** key */
-    @ApiModelProperty(value = "key")
+    @Schema(description = "key")
     var key: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     var type: String? = null
 
     /** 系统id */
-    @ApiModelProperty(value = "系统id")
+    @Schema(description = "系统id")
     var systemId: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     var createTime: String? = null
 } // Class TaskPic

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Table
@@ -12,35 +11,35 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "设备关联的系统")
+@Schema(description = "设备关联的系统")
 @Table(name = "v_equip_system")
 class ViewEquipSystem : Serializable {
 
     /** 系统id */
-    @ApiModelProperty(value = "系统id")
+    @Schema(description = "系统id")
     @Column(name = "id")
     @JSONField(name = "sysID")
     var id: String? = null
 
     /** 系统分类 */
-    @ApiModelProperty(value = "系统分类")
+    @Schema(description = "系统分类")
     @Column(name = "category")
     var category: String? = null
 
     /** 系统名称 */
-    @ApiModelProperty(value = "系统名称")
+    @Schema(description = "系统名称")
     @Column(name = "sys_name")
     @JSONField(name = "SysName")
     var name: String? = null
 
     /** 系统本地名称 */
-    @ApiModelProperty(value = "系统本地名称")
+    @Schema(description = "系统本地名称")
     @Column(name = "sys_local_name")
     @JSONField(name = "SysLocalName")
     var localName: String? = null
 
     /** 设备id */
-    @ApiModelProperty(value = "设备id")
+    @Schema(description = "设备id")
     @Column(name = "equip_id")
     var equipId: String? = null
 

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

@@ -24,7 +24,7 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.alibaba.fastjson.serializer.SerializerFeature
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 
 /**
@@ -35,10 +35,10 @@ import javax.persistence.Column
 open class BaseInfo : SBaseEntity() {
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    @JSONField(name ="ObjectType",serialzeFeatures = [SerializerFeature.WriteMapNullValue])
+    @JSONField(serialzeFeatures = [SerializerFeature.WriteMapNullValue])
     open var objectType: String? = null
 
 } // Class BaseInfo

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

@@ -30,12 +30,12 @@ import com.persagy.service.models.SBaseEntity
  */
 open class RBaseInfo : SBaseEntity() {
 //    /** 对象类型 */
-//    @ApiModelProperty(value = "对象类型")
+//    @Schema(description = "对象类型")
 //    @Column(name = "object_type")
 //    open var objectType: String? = null
 
 //    /** 关系id */
-//    @ApiModelProperty(value = "关系id")
+//    @Schema(description = "关系id")
 //    @Column(name = "id")
 //    @JSONField(name =value = "Id")
 //    var id: String? = null

+ 10 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DClassDef.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,54 +12,54 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "数据字典类型")
+@Schema(description = "数据字典类型")
 @Table(name = "dict.class_def")
 class DClassDef : BaseInfo() {
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 别编码 */
-    @ApiModelProperty(value = "别编码")
+    @Schema(description = "别编码")
     @Column(name = "alias_code")
     @JSONField(name = "AliasCode")
     var aliasCode: String? = null
 
     /** 别名称 */
-    @ApiModelProperty(value = "别名称")
+    @Schema(description = "别名称")
     @Column(name = "alias_name")
     @JSONField(name = "AliasName")
     var aliasName: String? = null
 
     /** 父类指针 */
-    @ApiModelProperty(value = "父类指针")
+    @Schema(description = "父类指针")
     @Column(name = "parent_code")
     @JSONField(name = "ParentCode")
     var parentCode: String? = null
 
     /** 标志 1为专业 2为系统 3为设备 4为部件 */
-    @ApiModelProperty(value = "标志 1为专业 2为系统 3为设备 4为部件")
+    @Schema(description = "标志 1为专业 2为系统 3为设备 4为部件")
     @Column(name = "sign")
     @JSONField(name = "Sign")
     var sign: String? = null
 
     /** 子集列表 */
-    @ApiModelProperty(value = "子集列表")
+    @Schema(description = "子集列表")
     @JSONField(name = "ListClassDef")
     var listClassDef:ArrayList<DClassDef>? = null
 
     /** 对应物理世界对象类型 */
-    @ApiModelProperty(value = "对应物理世界对象类型")
+    @Schema(description = "对应物理世界对象类型")
     @Column(name = "type_platform")
     @JSONField(name = "TypePlatform")
     var typePlatform: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Table
 
@@ -12,102 +11,102 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "数据字典说明")
+@Schema(description = "数据字典说明")
 @Table(name = "dict.property_def")
 class DPropertyDef : BaseInfo() {
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = null
 //
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = null
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = null
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = null
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource",serialize=false)
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 路径 */
-    @ApiModelProperty(value = "路径")
+    @Schema(description = "路径")
     @JSONField(name = "Path")
     var path: String? = null
         get() {
@@ -123,31 +122,31 @@ class DPropertyDef : BaseInfo() {
         }
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null
 
     /** 字典内容 */
-    @ApiModelProperty(value = "字典内容")
+    @Schema(description = "字典内容")
     @JSONField(name = "Content")
     var content: ArrayList<DPropertyDef>? = null
 

+ 23 - 32
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DPropertyDefML.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Table
 
@@ -12,102 +11,94 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "数据字典说明")
+@Schema(description = "数据字典说明")
 @Table(name = "dict.property_def")
 class DPropertyDefML : BaseInfo() {
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
     var firstTag: String? = null
 //
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_name")
-    @JSONField(name = "FirstName")
     var firstName: String? = null
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
     var secondTag: String? = null
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
-    @JSONField(name = "SecondName")
     var secondName: String? = null
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
-    @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
-    @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
-    @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource")
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 路径 */
-    @ApiModelProperty(value = "路径")
+    @Schema(description = "路径")
     @JSONField(name = "Path")
     var path: String? = null
         get() {
@@ -123,31 +114,31 @@ class DPropertyDefML : BaseInfo() {
         }
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null
 
     /** 字典内容 */
-    @ApiModelProperty(value = "字典内容")
+    @Schema(description = "字典内容")
     @JSONField(name = "Content")
     var content: ArrayList<DPropertyDefML>? = null
 

+ 23 - 24
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DataCenterPropertyDefScheme.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,128 +12,128 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "字典说明")
+@Schema(description = "字典说明")
 @Table(name = "dict.datacenter_property_def_scheme")
 class DataCenterPropertyDefScheme : BaseInfo(){
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = null
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = null
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = null
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = null
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Id
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource",serialize=false)
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null
 
     /** 路径 */
-    @ApiModelProperty(value = "路径")
+    @Schema(description = "路径")
     @JSONField(name = "Path")
     var path: String? = null
         get() {
@@ -150,7 +149,7 @@ class DataCenterPropertyDefScheme : BaseInfo(){
         }
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")

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

@@ -22,8 +22,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -33,122 +32,122 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "字典说明")
+@Schema(description = "字典说明")
 @Table(name = "dict.property_def")
 class DataDictionaryDescription: BaseInfo() {
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = ""
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = ""
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = ""
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = ""
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Id
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource",serialize=false)
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null

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

@@ -21,10 +21,8 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -36,38 +34,38 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "项目定制化字典说明")
+@Schema(description = "项目定制化字典说明")
 @Table(name = "dict.property_def_project")
 open class DataDictionaryDescriptionProject: BaseInfo() {
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码",required = true)
+    @Schema(description = "信息点编码",required = true)
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型",required = true)
+    @Schema(description = "类型",required = true)
     @Id
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Id
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,25 +12,25 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "物理世界自定义信息点方案实体类")
+@Schema(description = "物理世界自定义信息点方案实体类")
 @Table(name = "dict.data_platform_scheme")
 class DataPlatformScheme : SBaseEntity() {
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 方案名称 */
-    @ApiModelProperty(value = "方案名称")
+    @Schema(description = "方案名称")
     @Column(name = "scheme_name")
     @JSONField(name = "SchemeName")
     var schemeName: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,128 +12,128 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "物理世界自定义信息点方案实体类")
+@Schema(description = "物理世界自定义信息点方案实体类")
 @Table(name = "dict.data_platform_scheme_info")
 class DataPlatformSchemeInfo : SBaseEntity() {
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = ""
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = ""
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = ""
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = ""
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource",serialize=false)
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 方案id */
-    @ApiModelProperty(value = "方案id")
+    @Schema(description = "方案id")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 服务于哪个设备或部件、资产 */
-    @ApiModelProperty(value = "服务于哪个设备或部件、资产")
+    @Schema(description = "服务于哪个设备或部件、资产")
     @Id
     @Column(name = "obj_type")
     @JSONField(name = "ObjectType")

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -33,31 +32,31 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "空调类型信息实体类")
+@Schema(description = "空调类型信息实体类")
 @Table(name = "dict.dict_air_conditioner")
 open class DictAirConditioner: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name_type")
     @JSONField(name = "NameType")
     var nameType: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -1,7 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 
 /**
  * 字典 批量处理
@@ -11,15 +11,15 @@ import io.swagger.annotations.ApiModelProperty
 class DictBatchProcessing : SBaseEntity(){
 
     /** 方案 id */
-    @ApiModelProperty(value = "方案 id")
+    @Schema(description = "方案 id")
     var schemeId:String? = null
 
     /** 优先级列表 */
-    @ApiModelProperty(value = "优先级列表")
+    @Schema(description = "优先级列表")
     var priorityList:ArrayList<String>? = null
 
     /** 一级标签名称列表 */
-    @ApiModelProperty(value = "一级标签名称列表")
+    @Schema(description = "一级标签名称列表")
     var firstNameList:ArrayList<String>? = null
 
 } // Class DictBatchProcessing

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -33,54 +32,54 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "建筑功能类型信息实体类")
+@Schema(description = "建筑功能类型信息实体类")
 @Table(name = "dict.dict_building_functional")
 open class DictBuildingFunctional: Serializable {
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父节点 */
-    @ApiModelProperty(value = "父节点")
+    @Schema(description = "父节点")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = null
 
     /** 昼夜时间 */
-    @ApiModelProperty(value = "昼夜时间")
+    @Schema(description = "昼夜时间")
     @Column(name = "day_night_time")
     @JSONField(name = "DayNightTime")
     var dayNightTime: String? = null
 
     /** 同类型建筑标签 */
-    @ApiModelProperty(value = "同类型建筑标签")
+    @Schema(description = "同类型建筑标签")
     @Column(name = "building_label")
     @JSONField(name = "BuildingLabel")
     var buildingLabel: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
     @Column(name = "remarks")
     @JSONField(name = "Remarks")
     var remarks: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

+ 6 - 8
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBuildingStructureType.kt

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,31 +32,31 @@ import javax.persistence.Table
 *
 * @author  张维新
 */
-@ApiModel(description = "建筑结构类型信息实体类")
+@Schema(description = "建筑结构类型信息实体类")
 @Table(name = "dict.dict_building_structure_type")
 open class DictBuildingStructureType: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -34,43 +33,43 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "气候区信息实体类")
+@Schema(description = "气候区信息实体类")
 @Table(name = "dict.dict_climate")
 open class DictClimate: Serializable {
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父节点 */
-    @ApiModelProperty(value = "父节点")
+    @Schema(description = "父节点")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = null
 
     /** 说明 */
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "explain")
     @JSONField(name = "Info")
     var explain: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,25 +12,25 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "污秽等级")
+@Schema(description = "污秽等级")
 @Table(name = "dict.dict_contamination_level")
 class DictContaminationLevel: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 描述 */
-    @ApiModelProperty(value = "描述")
+    @Schema(description = "描述")
     @Column(name = "description")
     @JSONField(name = "Description")
     var description: String? = null

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

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -35,31 +33,31 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "发展水平代码信息实体类")
+@Schema(description = "发展水平代码信息实体类")
 @Table(name = "dict.dict_develop")
 open class DictDevelop: Serializable {
 
     /** 编码*/
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称*/
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父节点*/
-    @ApiModelProperty(value = "父节点")
+    @Schema(description = "父节点")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = null
 
     /** 说明*/
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "remarks")
     @JSONField(name = "Remarks")
     var remarks: String? = null
@@ -68,13 +66,13 @@ open class DictDevelop: Serializable {
     var content: ArrayList<DictDevelop>? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -34,42 +33,42 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "建筑朝向信息实体类")
+@Schema(description = "建筑朝向信息实体类")
 @Table(name = "dict.dict_direction")
 open class DictDirection: Serializable {
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 方向中文描述 */
-    @ApiModelProperty(value = "方向中文描述")
+    @Schema(description = "方向中文描述")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 方向英文描述 */
-    @ApiModelProperty(value = "方向英文描述")
+    @Schema(description = "方向英文描述")
     @Column(name = "direction_code")
     @JSONField(name = "DirectionCode")
     var directionCode: String? = null
 
     /** 与正北方向顺时针夹角 */
-    @ApiModelProperty(value = "与正北方向顺时针夹角")
+    @Schema(description = "与正北方向顺时针夹角")
     @Column(name = "angle")
     @JSONField(name = "Angle")
     var angle: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

+ 7 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictDustproof.kt

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -35,36 +33,36 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "防尘等级实体类")
+@Schema(description = "防尘等级实体类")
 @Table(name = "dict.dict_dustproof")
 class DictDustproof: Serializable {
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "info")
     @JSONField(name = "Info")
     var info: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

+ 6 - 7
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictFloorType.kt

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -33,31 +32,31 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "楼层性质信息实体类")
+@Schema(description = "楼层性质信息实体类")
 @Table(name = "dict.dict_floor_type")
 open class DictFloorType: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,31 +32,31 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "绿建等级信息实体类")
+@Schema(description = "绿建等级信息实体类")
 @Table(name = "dict.dict_green_build_lev")
 open class DictGreenBuildLev: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,31 +32,31 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "采暖类型信息实体类")
+@Schema(description = "采暖类型信息实体类")
 @Table(name = "dict.dict_heating_type")
 open class DictHeatingType: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name_type")
     @JSONField(name = "NameType")
     var nameType: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,31 +32,31 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "保温类型信息实体类")
+@Schema(description = "保温类型信息实体类")
 @Table(name = "dict.dict_insulate_type")
 open class DictInsulateType: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: String? = null

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,25 +12,25 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "污染等级")
+@Schema(description = "污染等级")
 @Table(name = "dict.dict_pollution_level")
 class DictPollutionLevel: Serializable {
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 描述 */
-    @ApiModelProperty(value = "描述")
+    @Schema(description = "描述")
     @Column(name = "description")
     @JSONField(name = "Description")
     var description: String? = null

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

@@ -22,8 +22,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -33,85 +32,85 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "省市区代码实体类")
+@Schema(description = "省市区代码实体类")
 @Table(name = "dict.dict_provincial_city_code")
 open class DictProvincialCityCode : BaseInfo() {
 
     /** 省或市或区代码 */
-    @ApiModelProperty(value = "省或市或区代码")
+    @Schema(description = "省或市或区代码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 省或市或区名称 */
-    @ApiModelProperty(value = "省或市或区名称")
+    @Schema(description = "省或市或区名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父类标识 */
-    @ApiModelProperty(value = "父类标识")
+    @Schema(description = "父类标识")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = null
 
     /** 邮编代码 */
-    @ApiModelProperty(value = "邮编代码")
+    @Schema(description = "邮编代码")
     @Column(name = "code")
     @JSONField(name = "Code")
     var code: String? = null
 
     /** 经度 */
-    @ApiModelProperty(value = "经度")
+    @Schema(description = "经度")
     @Column(name = "longitude")
     @JSONField(name = "Longitude")
     var longitude: String? = null
 
     /** 纬度 */
-    @ApiModelProperty(value = "纬度")
+    @Schema(description = "纬度")
     @Column(name = "latitude")
     @JSONField(name = "Latitude")
     var latitude: String? = null
 
     /** 海拔 */
-    @ApiModelProperty(value = "海拔")
+    @Schema(description = "海拔")
     @Column(name = "altitude")
     @JSONField(name = "Altitude")
     var altitude: String? = null
 
     /** 气候区 */
-    @ApiModelProperty(value = "气候区")
+    @Schema(description = "气候区")
     @Column(name = "climate_zone")
     @JSONField(name = "ClimateZone")
     var climateZone: String? = null
 
     /** 发展水平 */
-    @ApiModelProperty(value = "发展水平")
+    @Schema(description = "发展水平")
     @Column(name = "development_level")
     @JSONField(name = "DevelopmentLevel")
     var developmentLevel: String? = null
 
     /** 地理分区 */
-    @ApiModelProperty(value = "地理分区")
+    @Schema(description = "地理分区")
     @Column(name = "geographical_zoning")
     @JSONField(name = "GeographicalZoning")
     var geographicalZoning: String? = null
 
     /** 0代表普通 1代表直辖市 */
-    @ApiModelProperty(value = "0代表普通 1代表直辖市")
+    @Schema(description = "0代表普通 1代表直辖市")
     @Column(name = "special_cities")
     @JSONField(name = "SpecialCities")
     var specialCities: Int = 0
 
     /** 城市类型 */
-    @ApiModelProperty(value = "城市类型")
+    @Schema(description = "城市类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 城市类型编码 */
-    @ApiModelProperty(value = "城市类型编码")
+    @Schema(description = "城市类型编码")
     @Column(name = "typecode")
     @JSONField(name = "TypeCode")
     var typeCode: String? = null

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

@@ -22,8 +22,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.util.*
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,36 +33,36 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "租赁业态类型实体类")
+@Schema(description = "租赁业态类型实体类")
 @Table(name = "dict.dict_rental")
 open class DictRental : BaseInfo() {
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 典型商铺 */
-    @ApiModelProperty(value = "典型商铺")
+    @Schema(description = "典型商铺")
     @Column(name = "typical_shops")
     @JSONField(name = "TypicalShops")
     var typicalShops: String? = null
 
     /** 分类原因 */
-    @ApiModelProperty(value = "分类原因")
+    @Schema(description = "分类原因")
     @Column(name = "classification_cause")
     @JSONField(name = "ClassificationCause")
     var classificationCause: String? = null
 
     /** 关系值 */
-    @ApiModelProperty(value = "关系值")
+    @Schema(description = "关系值")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = ""

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "抗震设防烈度")
+@Schema(description = "抗震设防烈度")
 @Table(name = "dict.dict_seismic_fortification_intensity")
 class DictSeismicFortificationIntensity : BaseInfo(){
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null

+ 8 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSpaceFunctionalTypes.kt

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -34,43 +33,43 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "空间功能类型")
+@Schema(description = "空间功能类型")
 @Table(name = "dict.dict_space_functional_types")
 open class DictSpaceFunctionalTypes: Serializable {
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父节点 */
-    @ApiModelProperty(value = "父节点")
+    @Schema(description = "父节点")
     @Column(name = "parent")
     @JSONField(name = "Parent")
     var parent: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
     @Column(name = "remarks")
     @JSONField(name = "Remarks")
     var remarks: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

+ 9 - 10
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSpaceProject.kt

@@ -3,8 +3,7 @@ package com.persagy.server.datacenter.models.entities.dict
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,50 +12,50 @@ import javax.persistence.Table
 /**
  * 业务空间类型
  */
-@ApiModel(description = "业务空间类型")
+@Schema(description = "业务空间类型")
 @Table(name = "dict.dict_space_project")
 class DictSpaceProject: SBaseEntity(),Serializable {
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父类指针 */
-    @ApiModelProperty(value = "父类指针")
+    @Schema(description = "父类指针")
     @Id
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Id
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "sign")
     @JSONField(name = "Sign")
     var sign: Int? = null
 
     /** 数量 */
-    @ApiModelProperty(value = "数量")
+    @Schema(description = "数量")
     @JSONField(name = "Count")
     var count: Int? = 0
 
     /** 级联-设备所在的竖井 */
-    @ApiModelProperty(value = "级联-设备所在的竖井")
+    @Schema(description = "级联-设备所在的竖井")
     @SCascade(table="dict.dict_space_project", idColumn="parent_id", childIdColumn="id")
     @JSONField(name = "ZoneType")
     var zoneType: ArrayList<DictSpaceProject>? = null

+ 11 - 13
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictWind.kt

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -35,60 +33,60 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "空气风力等级信息实体类")
+@Schema(description = "空气风力等级信息实体类")
 @Table(name = "dict.dict_wind")
 class DictWind: Serializable {
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 风级 */
-    @ApiModelProperty(value = "风级")
+    @Schema(description = "风级")
     @Column(name = "wind_degree")
     @JSONField(name = "WindDegree")
     var windDegree: String? = null
 
     /** 陆地地面物象 */
-    @ApiModelProperty(value = "陆地地面物象")
+    @Schema(description = "陆地地面物象")
     @Column(name = "phenomenon")
     @JSONField(name = "Phenomenon")
     var phenomenon: String? = null
 
     /** 风速 */
-    @ApiModelProperty(value = "风速")
+    @Schema(description = "风速")
     @Column(name = "wind_speed")
     @JSONField(name = "WindSpeed")
     var windSpeed: String? = null
 
     /** 海面波浪 */
-    @ApiModelProperty(value = "海面波浪")
+    @Schema(description = "海面波浪")
     @Column(name = "wave")
     @JSONField(name = "wave")
     var wave: String? = null
 
     /** 风等级状况 */
-    @ApiModelProperty(value = "风等级状况")
+    @Schema(description = "风等级状况")
     @Column(name = "wind")
     @JSONField(name = "wind")
     var wind: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

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

@@ -21,9 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import java.util.*
 import javax.persistence.Column
@@ -35,37 +33,37 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "天气状况信息实体类")
+@Schema(description = "天气状况信息实体类")
 @Table(name = "dict.ditc_weather")
 open class DitcWeather: Serializable {
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 图形标志 */
-    @ApiModelProperty(value = "图形标志")
+    @Schema(description = "图形标志")
     @Column(name = "graphic_logo")
     @JSONField(name = "GraphicLogo")
     var graphicLogo: String? = null
 
     /** 更新时间 */
-    @ApiModelProperty(value = "更新时间")
+    @Schema(description = "更新时间")
     @Column(name = "last_update")
     @JSONField(name = "LastUpdate")
     var lastUpdate: Date? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JSONField(name = "CreateTime")
     var createTime: Date? = null

+ 9 - 24
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipCategory.kt

@@ -1,9 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,34 +11,21 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "设备分类实体类")
-@Table(name = "equip_family")
+@Schema(description = "设备分类实体类")
+@Table(name = "dict.def_class")
 class EquipCategory : BaseInfo() {
 
     /** 设备分类编码 */
-    @ApiModelProperty(value = "设备分类编码")
+    @Schema(description = "设备分类编码")
     @Id
-    @Column(name = "equip_code")
-    @JSONField(name = "EquipCode")
-    var equipCode: String? = null
+    @Column(name = "code")
+    var code: String? = null
 
     /** 设备分类名字*/
-    @ApiModelProperty(value = "设备分类名字")
-    @Column(name = "equip_name")
-    @JSONField(name = "EquipName")
-    var equipName: String? = null
+    @Schema(description = "设备分类名字")
+    @Column(name = "name")
+    var name: String? = null
 
-    /** 族编码 */
-    @ApiModelProperty(value = "族编码")
-    @Id
-    @Column(name = "family")
-    @JSONField(name = "Family")
-    var family: String? = null
 
-    /** 族名称 */
-    @ApiModelProperty(value = "族名称")
-    @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
-    var familyName: String? = null
 
 } // Class EquipCategory

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,30 +12,30 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "设备信息实体类")
+@Schema(description = "设备信息实体类")
 @Table(name = "dict.equip_family")
 class EquipFamily : BaseInfo() {
 
     /** 族编码 */
-    @ApiModelProperty(value = "族编码")
+    @Schema(description = "族编码")
     @Id
     @Column(name = "family")
     var family: String? = null
 
     /** 族名称 */
-    @ApiModelProperty(value = "族名称")
+    @Schema(description = "族名称")
     @Column(name = "family_name")
     var familyName: String? = null
 
     /** 设备分类编码 */
-    @ApiModelProperty(value = "设备分类编码")
+    @Schema(description = "设备分类编码")
     @Id
     @Column(name = "equip_code")
     @JSONField(name = "EquipCode")
     var equipCode: String? = null
 
     /** 设备分类名字*/
-    @ApiModelProperty(value = "设备分类名字")
+    @Schema(description = "设备分类名字")
     @Column(name = "equip_name")
     @JSONField(name = "EquipName")
     var equipName: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "设备族实体类")
+@Schema(description = "设备族实体类")
 @Table(name = "equip_family")
 class EquipFamilyCategory : BaseInfo() {
 
     /** 族编码 */
-    @ApiModelProperty(value = "族编码")
+    @Schema(description = "族编码")
     @Id
     @Column(name = "family")
     @JSONField(name = "Family")
     var family: String? = null
 
     /** 族名称 */
-    @ApiModelProperty(value = "族名称")
+    @Schema(description = "族名称")
     @Column(name = "family_name")
     @JSONField(name = "FamilyName")
     var familyName: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,25 +12,25 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "所有专业 设备 系统分类")
+@Schema(description = "所有专业 设备 系统分类")
 @Table(name = "dict.class_def")
 class ExplainAllCategories : BaseInfo() {
 
     /** 编码code */
-    @ApiModelProperty(value = "编码code")
+    @Schema(description = "编码code")
     @Id
     @Column(name = "id")
     @JSONField(name = "Code")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 父类指针 */
-    @ApiModelProperty(value = "父类指针")
+    @Schema(description = "父类指针")
     @Id
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "设备族信息")
+@Schema(description = "设备族信息")
 @Table(name = "dict.family")
 class Family : SBaseEntity() {
 
     /** 设备族code */
-    @ApiModelProperty(value = "设备族code")
+    @Schema(description = "设备族code")
     @Id
     @Column(name = "code")
     @JSONField(name = "Code")
     var code: String? = null
 
     /** 设备族code */
-    @ApiModelProperty(value = "设备族code")
+    @Schema(description = "设备族code")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统分类")
+@Schema(description = "系统分类")
 @Table(name = "dict.class_def")
 class GeneralSystemCategory : Serializable {
 
     /** 设备分类编码 */
-    @ApiModelProperty(value = "设备分类编码")
+    @Schema(description = "设备分类编码")
     @Id
     @Column(name = "id")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备分类名字*/
-    @ApiModelProperty(value = "设备分类名字")
+    @Schema(description = "设备分类名字")
     @Column(name = "name")
     @JSONField(name = "CategoryName")
     var categoryName: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "建筑信息实体类")
+@Schema(description = "建筑信息实体类")
 @Table(name = "dict.project_scheme")
 class ProjectScheme : SBaseEntity(){
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Column(name = "scheme_id")
     @Id
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Id
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")

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

@@ -22,8 +22,8 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -33,122 +33,122 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "字典 信息对照")
+@Schema(description = "字典 信息对照")
 @Table(name = "dict.property_def_control_info")
 class PropertyDefControlInfo: BaseInfo() {
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = ""
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = ""
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = ""
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = ""
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Id
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource",serialize=false)
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null

+ 24 - 25
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/PropertyDefProjectInfo.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,140 +12,140 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "字典说明")
+@Schema(description = "字典说明")
 @Table(name = "dict.property_def_project_info")
 class PropertyDefProjectInfo : BaseInfo(){
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     @JSONField(name = "FirstTag")
     var firstTag: String? = null
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     @JSONField(name = "FirstName")
     var firstName: String? = null
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     @JSONField(name = "SecondTag")
     var secondTag: String? = null
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     @JSONField(name = "SecondName")
     var secondName: String? = null
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "info_point_name")
     @JSONField(name = "InfoPointName")
     var infoPointName: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "info_point_code")
     @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "datatype")
     @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "inputmode")
     @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 类型 */
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Id
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: String? = null
 
     /** 父指针 */
-    @ApiModelProperty(value = "父指针")
+    @Schema(description = "父指针")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "flag")
     @JSONField(name = "Flag")
     var  flag: String? = null
 
     /** 字典选择 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "datasource")
     @JSONField(name = "DataSource")
     var dataSource: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "字典选择")
+    @Schema(description = "字典选择")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 优先级 */
-    @ApiModelProperty(value = "优先级")
+    @Schema(description = "优先级")
     @Column(name = "priority")
     @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = true
 
     /** 关键信息点 */
-    @ApiModelProperty(value = "关键信息点")
+    @Schema(description = "关键信息点")
     @Column(name = "key_word")
     @JSONField(name = "KeyWord")
     var keyWord: Boolean? = false
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Id
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 路径 */
-    @ApiModelProperty(value = "路径")
+    @Schema(description = "路径")
     @JSONField(name = "Path")
     var path: String? = null
         get() {

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

@@ -21,8 +21,7 @@
 package com.persagy.server.datacenter.models.entities.dict
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 
@@ -31,17 +30,17 @@ import javax.persistence.Column
  *
  * @author 邓婷婷
  */
-@ApiModel(description = "空间类型信息")
+@Schema(description = "空间类型信息")
 class SpaceInfoDic: Serializable {
 
     /** 空间类型id */
-    @ApiModelProperty(value = "空间类型id")
+    @Schema(description = "空间类型id")
     @Column(name = "object_type")
     @JSONField(name =  "ObjectType")
     var objectType: String? = null
 
     /** 空间类型名称 */
-    @ApiModelProperty(value = "空间类型名称")
+    @Schema(description = "空间类型名称")
     @Column(name = "object_type_name")
     @JSONField(name =  "ObjectTypeName")
     var objectTypeName: String? = null

+ 5 - 6
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictCustomScheme.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,25 +12,25 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "自定义字典方案")
+@Schema(description = "自定义字典方案")
 @Table(name = "dictcustom.dict_custom_scheme")
 class DictCustomScheme : RBaseInfo() {
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "SchemeId")
     var id: String? = null
 
     /** 方案名称 */
-    @ApiModelProperty(value = "方案名称")
+    @Schema(description = "方案名称")
     @Column(name = "name")
     @JSONField(name = "SchemeName")
     var name: String? = null
 
     /** 方案描述 */
-    @ApiModelProperty(value = "方案描述")
+    @Schema(description = "方案描述")
     @Column(name = "desc")
     @JSONField(name = "Desc")
     var desc: String? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,98 +12,98 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "数据中心字典类型对应项目自定义转换")
+@Schema(description = "数据中心字典类型对应项目自定义转换")
 @Table(name = "dictcustom.dict_datacenter_project_custom")
 open class DictDatacenterProjectcustom : RBaseInfo() {
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 数据中心数据类型 */
-    @ApiModelProperty(value = "数据中心数据类型")
+    @Schema(description = "数据中心数据类型")
     @Column(name = "dc_category")
     @JSONField(name = "DcCategory")
     var dcCategory: String? = null
 
     /** 项目自定义数据类型 */
-    @ApiModelProperty(value = "项目自定义数据类型")
+    @Schema(description = "项目自定义数据类型")
     @Id
     @Column(name = "custom_category")
     @JSONField(name = "CustomCategory")
     var customCategory: String? = null
 
     /** 类型1为专业 2为系统 3为设备 4为部件 */
-    @ApiModelProperty(value = "数据中心数据类型")
+    @Schema(description = "数据中心数据类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: Int? = null
 
     /** 数据中心类型名称 */
-    @ApiModelProperty(value = "数据中心类型名称")
+    @Schema(description = "数据中心类型名称")
     @Column(name = "dc_category_name")
     @JSONField(name = "DcCategoryName")
     var dcCategoryName: String? = null
 
     /** 项目自定义类型名称 */
-    @ApiModelProperty(value = "项目自定义类型名称")
+    @Schema(description = "项目自定义类型名称")
     @Column(name = "custom_category_name")
     @JSONField(name = "CustomCategoryName")
     var customCategoryName: String? = null
 
     /** 数据中心向物理世界转化脚本信息 */
-    @ApiModelProperty(value = "数据中心向物理世界转化脚本信息")
+    @Schema(description = "数据中心向物理世界转化脚本信息")
     @Column(name = "switch_rule")
     @JSONField(name = "SwitchRule")
     var switchRule: String? = null
 
     /** 物理世界向数据中心转换脚本 */
-    @ApiModelProperty(value = "物理世界向数据中心转换脚本")
+    @Schema(description = "物理世界向数据中心转换脚本")
     @Column(name = "switch_rule_dataplatform")
     @JSONField(name = "SwitchRuleDataplatform")
     var switchRuleDataplatform: String? = null
 
     /** 备注信息 */
-    @ApiModelProperty(value = "备注信息")
+    @Schema(description = "备注信息")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 自定义父类指针 */
-    @ApiModelProperty(value = "自定义父类指针")
+    @Schema(description = "自定义父类指针")
     @Column(name = "parent_id_custom")
     @JSONField(name = "ParentIdCustom")
     var parentIdCustom: String? = null
 
     /** 数据中心父指针 */
-    @ApiModelProperty(value = "数据中心父指针")
+    @Schema(description = "数据中心父指针")
     @Column(name = "parent_id_dc")
     @JSONField(name = "ParentIdDc")
     var parentIdDc: String? = null
 
     /** 设备族 */
-    @ApiModelProperty(value = "设备族")
+    @Schema(description = "设备族")
     @Column(name = "family")
     @JSONField(name = "Family")
     var family: String? = null
 
     /** 数据中心至物理世界 0不需要脚本, 1为需要脚本 */
-    @ApiModelProperty(value = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
+    @Schema(description = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
     @Column(name = "datacenter_sign")
     @JSONField(name = "DatacenterSign")
     var datacenterSign: Int? = null
 
     /** 数据中心至物理世界 0不需要脚本, 1为需要脚本 */
-    @ApiModelProperty(value = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
+    @Schema(description = "数据中心至物理世界 0不需要脚本, 1为需要脚本")
     @Column(name = "dataplatform_sign")
     @JSONField(name = "DataplatformSign")
     var dataplatformSign: Int? = null
 
     /** 下一级内容 */
-    @ApiModelProperty(value = "下一级内容")
+    @Schema(description = "下一级内容")
     @JSONField(name = "Content")
     var content = ArrayList<DictDatacenterProjectcustom>()
 

+ 14 - 15
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictProjectCustomDatacenterNew.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,80 +12,80 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "数据中心字典类型对应项目自定义转换")
+@Schema(description = "数据中心字典类型对应项目自定义转换")
 @Table(name = "dictcustom.dict_project_custom_datacenter")
 open class DictProjectCustomDatacenterNew : RBaseInfo() {
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 数据中心数据类型 */
-    @ApiModelProperty(value = "数据中心数据类型")
+    @Schema(description = "数据中心数据类型")
     @Column(name = "dc_category")
     @JSONField(name = "DcCategory")
     var dcCategory: String? = null
 
     /** 项目自定义数据类型 */
-    @ApiModelProperty(value = "项目自定义数据类型")
+    @Schema(description = "项目自定义数据类型")
     @Id
     @Column(name = "custom_category")
     @JSONField(name = "CustomCategory")
     var customCategory: String? = null
 
     /** 类型1为专业 2为系统 3为设备 4为部件 */
-    @ApiModelProperty(value = "数据中心数据类型")
+    @Schema(description = "数据中心数据类型")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: Int? = null
 
     /** 数据中心类型名称 */
-    @ApiModelProperty(value = "数据中心类型名称")
+    @Schema(description = "数据中心类型名称")
     @Column(name = "dc_category_name")
     @JSONField(name = "DcCategoryName")
     var dcCategoryName: String? = null
 
     /** 项目自定义类型名称 */
-    @ApiModelProperty(value = "项目自定义类型名称")
+    @Schema(description = "项目自定义类型名称")
     @Column(name = "custom_category_name")
     @JSONField(name = "CustomCategoryName")
     var customCategoryName: String? = null
 
     /** 数据中心向物理世界转化脚本信息 */
-    @ApiModelProperty(value = "数据中心向物理世界转化脚本信息")
+    @Schema(description = "数据中心向物理世界转化脚本信息")
     @Column(name = "switch_rule")
     @JSONField(name = "SwitchRule")
     var switchRule: String? = null
 
     /** 物理世界向数据中心转换脚本 */
-    @ApiModelProperty(value = "物理世界向数据中心转换脚本")
+    @Schema(description = "物理世界向数据中心转换脚本")
     @Column(name = "switch_rule_dataplatform")
     @JSONField(name = "SwitchRuleDataplatform")
     var switchRuleDataplatform: String? = null
 
     /** 备注信息 */
-    @ApiModelProperty(value = "备注信息")
+    @Schema(description = "备注信息")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 自定义父类指针 */
-    @ApiModelProperty(value = "自定义父类指针")
+    @Schema(description = "自定义父类指针")
     @Column(name = "parent_id_custom")
     @JSONField(name = "ParentIdCustom")
     var parentIdCustom: String? = null
 
     /** 数据中心父指针 */
-    @ApiModelProperty(value = "数据中心父指针")
+    @Schema(description = "数据中心父指针")
     @Column(name = "parent_id_dc")
     @JSONField(name = "ParentIdDc")
     var parentIdDc: String? = null
 
     /** 设备族 */
-    @ApiModelProperty(value = "设备族")
+    @Schema(description = "设备族")
     @Column(name = "family")
     @JSONField(name = "Family")
     var family: String? = null

+ 4 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictdatacenter/DictSchemeProject.kt

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,19 +12,19 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "自定义字典和项目的关系")
+@Schema(description = "自定义字典和项目的关系")
 @Table(name = "dictcustom.dict_scheme_project")
 class DictSchemeProject : RBaseInfo(){
 
     /** 方案ID */
-    @ApiModelProperty(value = "方案ID")
+    @Schema(description = "方案ID")
     @Id
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: String? = null
 
     /** 项目ID */
-    @ApiModelProperty(value = "项目ID")
+    @Schema(description = "项目ID")
     @Id
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,67 +12,67 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "自定义字典 未转换成功的对象")
+@Schema(description = "自定义字典 未转换成功的对象")
 @Table(name = "dictcustom.dict_type_conversion_dataplatform_log")
 class DictTypeConversionDatallatformLog : RBaseInfo(){
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 本地编码 */
-    @ApiModelProperty(value = "本地编码")
+    @Schema(description = "本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalId")
     var localId: String? = null
 
     /** 本地名称 */
-    @ApiModelProperty(value = "本地名称")
+    @Schema(description = "本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 类型编码 */
-    @ApiModelProperty(value = "类型编码")
+    @Schema(description = "类型编码")
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "category_name")
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 对象类型 1设备 2部件 */
-    @ApiModelProperty(value = "对象类型 1设备 2部件")
+    @Schema(description = "对象类型 1设备 2部件")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: Int? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.dictdatacenter
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,67 +12,67 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "自定义字典 未转换成功的对象")
+@Schema(description = "自定义字典 未转换成功的对象")
 @Table(name = "dictcustom.dict_type_conversion_datacenter_log")
 class DictTypeConversionLog : RBaseInfo(){
 
     /** ID */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 本地编码 */
-    @ApiModelProperty(value = "本地编码")
+    @Schema(description = "本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalId")
     var localId: String? = null
 
     /** 本地名称 */
-    @ApiModelProperty(value = "本地名称")
+    @Schema(description = "本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 类型编码 */
-    @ApiModelProperty(value = "类型编码")
+    @Schema(description = "类型编码")
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 类型名称 */
-    @ApiModelProperty(value = "类型名称")
+    @Schema(description = "类型名称")
     @Column(name = "category_name")
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 对象类型 1设备 2部件 */
-    @ApiModelProperty(value = "对象类型 1设备 2部件")
+    @Schema(description = "对象类型 1设备 2部件")
     @Column(name = "type")
     @JSONField(name = "Type")
     var type: Int? = null

+ 16 - 17
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefClass.kt

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,70 +12,70 @@ import javax.persistence.Table
  * @author  wx
  * @date  2020/9/19 16:37
  */
-@ApiModel(description = "平台字典对象类型")
+@Schema(description = "平台字典对象类型")
 @Table(name = "dict.def_class")
 class DefClass : SBaseEntity(){
 
     /** 全局id */
-    @ApiModelProperty(value = "全局 id")
+    @Schema(description = "全局 id")
     @Id
     @Column(name = "id")
     var  id: String? = null
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "code")
     var  code: String? = null
 
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     var name: String? = null
 
-    @ApiModelProperty(value = "别编码")
+    @Schema(description = "别编码")
     @Column(name = "alias_code")
     var aliasCode: String? = null
 
-    @ApiModelProperty(value = "别编名")
+    @Schema(description = "别编名")
     @Column(name = "alias_name")
     var aliasName: String? = null
 
-    @ApiModelProperty(value = "分类:common平台级, group集团级, project项目级")
+    @Schema(description = "分类:common平台级, group集团级, project项目级")
     @Id
     @Column(name = "type")
     var type: String? = null
 
-    @ApiModelProperty(value = "集团id, 默认为 '0' ")
+    @Schema(description = "集团id, 默认为 '0' ")
     @Id
     @Column(name = "group_code")
     var groupCode: String? = ""
 
-    @ApiModelProperty(value = "项目id, 默认为 '0' ")
+    @Schema(description = "项目id, 默认为 '0' ")
     @Id
     @Column(name = "project_id")
     var projectId: String? = ""
 
-    @ApiModelProperty(value = "上级类型编码")
+    @Schema(description = "上级类型编码")
     @Column(name = "parent_code")
     var parentCode: String? = null
 
-    @ApiModelProperty(value = "专业编码")
+    @Schema(description = "专业编码")
     @Column(name = "major_code")
     var majorCode: String? = null
 
-    @ApiModelProperty(value = "系统编码")
+    @Schema(description = "系统编码")
     @Column(name = "system_code")
     var systemCode: String? = null
 
-    @ApiModelProperty(value = "部件所属的设备类型")
+    @Schema(description = "部件所属的设备类型")
     @Column(name = "equipment_code")
     var equipmentCode: String? = null
 
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "obj_type")
     var objType: String? = null
 
-    @ApiModelProperty(value = "子列表")
+    @Schema(description = "子列表")
     var children:ArrayList<DefClass>? = null
 
 } // Class DefClass

+ 44 - 44
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt

@@ -1,7 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,194 +13,194 @@ import javax.persistence.Table
  * @author wx <zhangweixin@sagacloud.cn>
  * @date  2020/9/19 17:41
  */
-@ApiModel(description = "平台对象信息点")
+@Schema(description = "平台对象信息点")
 @Table(name = "dict.def_funcid")
 open class DefFuncId: Serializable {
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @Schema(description = "全局id")
     @Id
     @Column(name = "id")
     var id: String? = null
 
     /** 类型编码 */
-    @ApiModelProperty(value = "类型编码")
+    @Schema(description = "类型编码")
     @Id
     @Column(name = "class_code")
     var classCode: String? = null
 
     /** 动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL */
-    @ApiModelProperty(value = "动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL")
+    @Schema(description = "动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL")
     @Column(name = "category")
     var category: String? = null
 
     /** 信息点编码 */
-    @ApiModelProperty(value = "信息点编码")
+    @Schema(description = "信息点编码")
     @Id
     @Column(name = "code")
     var code: String? = null
 
     /** 信息点名称 */
-    @ApiModelProperty(value = "信息点名称")
+    @Schema(description = "信息点名称")
     @Column(name = "name")
     var name: String? = null
 
     /** 分类:commo平台级, group集团级, project项目级 */
-    @ApiModelProperty(value = "分类:commo平台级, group集团级, project项目级")
+    @Schema(description = "分类:commo平台级, group集团级, project项目级")
     @Id
     @Column(name = "type")
     var type: String? = null
 
     /** 集团id, 默认为"0" */
-    @ApiModelProperty(value = "集团id, 默认为'0'")
+    @Schema(description = "集团id, 默认为'0'")
     @Id
     @Column(name = "group_code")
     var groupCode: String? = null
 
     /** 项目id, 默认为"0" */
-    @ApiModelProperty(value = "项目id, 默认为'0'")
+    @Schema(description = "项目id, 默认为'0'")
     @Id
     @Column(name = "project_id")
     var projectId: String? = null
 
     /** 数据类型 */
-    @ApiModelProperty(value = "数据类型")
+    @Schema(description = "数据类型")
     @Column(name = "data_type")
     var dataType: String? = null
 
     /** 数据格式 */
-    @ApiModelProperty(value = "数据格式")
+    @Schema(description = "数据格式")
     @Column(name = "formater")
     var formater: String? = null
 
     /** 数据格式 */
-    @ApiModelProperty(value = "数据格式")
+    @Schema(description = "数据格式")
     @Column(name = "data_source")
     var dataSource: ArrayList<Any?>? = null
 
     /** 输入方式 */
-    @ApiModelProperty(value = "输入方式")
+    @Schema(description = "输入方式")
     @Column(name = "input_mode")
     var inputMode: String? = null
 
     /** 一级标签 */
-    @ApiModelProperty(value = "一级标签")
+    @Schema(description = "一级标签")
     @Column(name = "first_tag")
     var firstTag: String? = null
 
     /** 一级名称 */
-    @ApiModelProperty(value = "一级名称")
+    @Schema(description = "一级名称")
     @Column(name = "first_name")
     var firstName: String? = null
 
     /** 二级标签 */
-    @ApiModelProperty(value = "二级标签")
+    @Schema(description = "二级标签")
     @Column(name = "second_tag")
     var secondTag: String? = null
 
     /** 二级名称 */
-    @ApiModelProperty(value = "二级名称")
+    @Schema(description = "二级名称")
     @Column(name = "second_name")
     var secondName: String? = null
 
     /** 序列 */
-    @ApiModelProperty(value = "序列")
+    @Schema(description = "序列")
     @Column(name = "idx")
     var idx: Int? = null
 
     /** 优先级,重要程度 */
-    @ApiModelProperty(value = "优先级,重要程度")
+    @Schema(description = "优先级,重要程度")
     @Column(name = "priority")
     var priority: String? = null
 
     /** 单位 */
-    @ApiModelProperty(value = "单位")
+    @Schema(description = "单位")
     @Column(name = "unit")
     var unit: String? = null
 
     /** 备注 */
-    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
     @Column(name = "note")
     var note: String? = null
 
     /** 输入类型 */
-    @ApiModelProperty(value = "输入类型")
+    @Schema(description = "输入类型")
     @Column(name = "orig_data_type")
     var origDataType: String? = null
 
     /** 旧信息点编码 */
-    @ApiModelProperty(value = "旧信息点编码")
+    @Schema(description = "旧信息点编码")
     @Column(name = "orig_code")
     var origCode: String? = null
 
     /** 别编码 */
-    @ApiModelProperty(value = "别编码")
+    @Schema(description = "别编码")
     @Column(name = "alias_code")
     var aliasCode: String? = null
 
     /** 别名称 */
-    @ApiModelProperty(value = "别名称")
+    @Schema(description = "别名称")
     @Column(name = "alias_name")
     var aliasName: String? = null
 
     /** 是否分类标签 */
-    @ApiModelProperty(value = "是否分类标签")
+    @Schema(description = "是否分类标签")
     @Column(name = "can_sub")
     var canSub: Boolean? = null
 
     /** 是否复数 */
-    @ApiModelProperty(value = "是否复数")
+    @Schema(description = "是否复数")
     @Column(name = "is_multiple")
     var isMultiple: Boolean? = null
 
     /** 是否区间 */
-    @ApiModelProperty(value = "是否区间")
+    @Schema(description = "是否区间")
     @Column(name = "is_region")
     var isRegion: Boolean? = null
 
     /** 子分类标记 */
-    @ApiModelProperty(value = "子分类标记")
+    @Schema(description = "子分类标记")
     @Column(name = "sub_flag")
     var subFlag: Boolean? = null
 
     /** 是否只读, 如果是则不允许对该信息点做变更 */
-    @ApiModelProperty(value = "是否只读, 如果是则不允许对该信息点做变更")
+    @Schema(description = "是否只读, 如果是则不允许对该信息点做变更")
     @Column(name = "readonly")
     var readonly: Boolean? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     var sort: Int? = null
 
     /** 是否显示 */
-    @ApiModelProperty(value = "是否显示")
+    @Schema(description = "是否显示")
     @Column(name = "visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
-    @ApiModelProperty(value = "是否编辑")
+    @Schema(description = "是否编辑")
     @Column(name = "editable")
     var editable: Boolean? = null
 
     /** 禁止操作 */
-    @ApiModelProperty(value = "禁止操作")
+    @Schema(description = "禁止操作")
     @Column(name = "un_disabled")
     var unDisabled: Boolean? = null
 
     /** 路径 */
-    @ApiModelProperty(value = "路径")
+    @Schema(description = "路径")
     var path: String? = null
         get() {
             return if (firstName == "基本信息"|| firstName.isNullOrEmpty()){
                 code
             }else{
-                if (secondTag.isNullOrEmpty()){
-                    "$firstTag.$code"
-                }else{
-                    "$firstTag.$secondTag.$code"
-                }
+                "infos.$code"
+//                if (secondTag.isNullOrEmpty()){
+//                    "$firstTag.$code"
+//                }else{
+//                    "$firstTag.$secondTag.$code"
+//                }
             }
         }
-
-} // Class DefFuncid
+}

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

@@ -1,6 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
+
+import io.swagger.v3.oas.annotations.tags.Tag
 import javax.persistence.Table
 
 /**
@@ -9,6 +10,6 @@ import javax.persistence.Table
  * @author wx <zhangweixin@sagacloud.com>
  * @date  2020/10/14 22:19
  */
-@ApiModel(description = "平台对象信息点")
+@Tag(name = "平台对象信息点")
 @Table(name = "dict.def_funcid_project")
 class DefFuncIdProject : DefFuncId()

+ 3 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdScheme.kt

@@ -1,7 +1,6 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -12,11 +11,11 @@ import javax.persistence.Table
  * @author wx <zhangweixin@sagacloud.com>
  * @date  2020/10/14 22:19
  */
-@ApiModel(description = "平台对象信息点")
+@Schema(description = "平台对象信息点")
 @Table(name = "dict.def_funcid_scheme")
 class DefFuncIdScheme : DefFuncId(){
 
-    @ApiModelProperty(value = "方案 id")
+    @Schema(description = "方案 id")
     @Id
     @Column(name = "scheme_id")
     var schemeId: Int? = null

+ 10 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictMajor.kt

@@ -1,7 +1,6 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,48 +12,48 @@ import javax.persistence.Table
  * @author wx  <zhangweixin@sagacloud.com>
  * @date  2020/9/20 16:03
  */
-@ApiModel(description = "专业")
+@Schema(description = "专业")
 @Table(name = "dict.def_major")
 class DictMajor: Serializable {
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @Schema(description = "全局id")
     @Column(name = "id")
     var id: String? = null
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "code")
     var code: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     var name: String? = null
 
     /** 说明 */
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "note")
     var note: String? = null
 
     /** 别编码 */
-    @ApiModelProperty(value = "别编码")
+    @Schema(description = "别编码")
     @Column(name = "alias_code")
     var aliasCode: String? = null
 
     /** 别名称 */
-    @ApiModelProperty(value = "别名称")
+    @Schema(description = "别名称")
     @Column(name = "alias_name")
     var aliasName: String? = null
 
     /** 平台类型 */
-    @ApiModelProperty(value = "平台类型")
+    @Schema(description = "平台类型")
     @Column(name = "type")
     var type: String? = null
 
     /** 集团id */
-    @ApiModelProperty(value = "集团id")
+    @Schema(description = "集团id")
     @Column(name = "group_code")
     var groupCode: String? = null
 

+ 8 - 9
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictProject.kt

@@ -1,7 +1,6 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -12,38 +11,38 @@ import javax.persistence.Table
  * @author  wx
  * @date  2020/9/17 9:46
  */
-@ApiModel(description = "字典 项目信息")
+@Schema(description = "字典 项目信息")
 @Table(name = "dict.project")
 class DictProject {
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Id
     @Column(name = "id")
     var  id: String? = null
 
     /** 项目名称 */
-    @ApiModelProperty(value = "项目名称")
+    @Schema(description = "项目名称")
     @Column(name = "name")
     var name: String? = null
 
     /** 集团id */
-    @ApiModelProperty(value = "集团id")
+    @Schema(description = "集团id")
     @Column(name = "group_code")
     var groupCode: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "status")
     var status: Int? = null
 
     /** 创建者 */
-    @ApiModelProperty(value = "创建者")
+    @Schema(description = "创建者")
     @Column(name = "create_user")
     var createUser: String? = null
 
     /** 更新者 */
-    @ApiModelProperty(value = "更新者")
+    @Schema(description = "更新者")
     @Column(name = "update_user")
     var updateUser: String? = null
 

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -14,28 +13,28 @@ import javax.persistence.Table
  * @author  wx
  * @date  2020/9/20 16:50
  */
-@ApiModel(description = "方案")
+@Schema(description = "方案")
 @Table(name = "dict.scheme")
 class DictScheme: Serializable {
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @Schema(description = "全局id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: Int? = null
 
-    @ApiModelProperty(value = "方案名")
+    @Schema(description = "方案名")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
-    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
-    @ApiModelProperty(value = "集团id")
+    @Schema(description = "集团id")
     @Column(name = "group_id")
     @JSONField(name = "GroupId")
     var groupId: String? = null

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -14,25 +13,25 @@ import javax.persistence.Table
  * @author  wx
  * @date  2020/9/20 20:58
  */
-@ApiModel(description = "字典 方案和项目关系")
+@Schema(description = "字典 方案和项目关系")
 @Table(name = "dict.scheme_project")
 class DictSchemeAndProject: Serializable {
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @Schema(description = "全局id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var  id: Int? = null
 
     /** 方案id */
-    @ApiModelProperty(value = "方案id")
+    @Schema(description = "方案id")
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId: Int? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null

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

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

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

@@ -1,8 +1,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,28 +12,28 @@ import javax.persistence.Table
  * @author  wx
  * @date  2020/9/20 17:19
  */
-@ApiModel(description = "方案")
+@Schema(description = "方案")
 @Table(name = "dict.scheme_funcid")
 class DictSchemeCategotyInfo: Serializable {
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @Schema(description = "全局id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id :Int? =  0
 
-    @ApiModelProperty(value = "方案id")
+    @Schema(description = "方案id")
     @Column(name = "scheme_id")
     @JSONField(name = "SchemeId")
     var schemeId :Int? =  0
 
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "class_code")
     @JSONField(name = "ClassCode")
     var classCode: String? = null
 
-    @ApiModelProperty(value = "信息编码")
+    @Schema(description = "信息编码")
     @Column(name = "info_code")
     @JSONField(name = "InfoCode")
     var infoCode: String? = null

+ 9 - 10
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/Group.kt

@@ -1,7 +1,6 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -13,43 +12,43 @@ import javax.persistence.Table
  * @author  wx <zhangweixin@sagacloud.com>
  * @date  2020/9/16 22:13
  */
-@ApiModel(description = "集团实体类")
+@Schema(description = "集团实体类")
 @Table(name = "dict.group")
 class Group : Serializable {
 
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     @Column(name = "id")
     var id: String? = null
 
     /** 编码 */
-    @ApiModelProperty(value = "编码")
+    @Schema(description = "编码")
     @Id
     @Column(name = "code")
     var  code: String? = null
 
     /** 集团名称 */
-    @ApiModelProperty(value = "集团名称")
+    @Schema(description = "集团名称")
     @Column(name = "name")
     var name: String? = null
 
     /** 标记 */
-    @ApiModelProperty(value = "标记")
+    @Schema(description = "标记")
     @Column(name = "status")
     var status: Int? = null
 
     /** 创建者 */
-    @ApiModelProperty(value = "创建者")
+    @Schema(description = "创建者")
     @Column(name = "create_user")
     var createUser: String? = null
 
     /** 更新者 */
-    @ApiModelProperty(value = "更新者")
+    @Schema(description = "更新者")
     @Column(name = "update_user")
     var updateUser: String? = null
 
     /** 说明 */
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "remark")
     var remark: String? = null
 

+ 10 - 11
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/GraphicType.kt

@@ -3,8 +3,7 @@ package com.persagy.server.datacenter.models.entities.graphtype
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -14,12 +13,12 @@ import javax.persistence.Table
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "图类型实体类")
+@Schema(description = "图类型实体类")
 @Table(name = "graphtype.graphic_type")
 open class GraphicType : RBaseInfo() {
 
     /** 图类型id */
-    @ApiModelProperty(value = "图类型id")
+    @Schema(description = "图类型id")
     @Id
     @Column(name = "id")
     @JSONField(name = "GraphTypeId")
@@ -27,42 +26,42 @@ open class GraphicType : RBaseInfo() {
 
 
     /** 图类型名称 */
-    @ApiModelProperty(value = "图类型名称")
+    @Schema(description = "图类型名称")
     @Column(name = "name")
     @JSONField(name = "GraphTypeName")
     var graphTypeName: String? = null
 
     /** 图类型编码 */
-    @ApiModelProperty(value = "图类型编码")
+    @Schema(description = "图类型编码")
     @Column(name = "code")
     @JSONField(name = "GraphTypeCode")
     var graphTypeCode: String? = null
 
     /** 说明 */
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 父id */
-    @ApiModelProperty(value = "父id")
+    @Schema(description = "父id")
     @Column(name = "parent_id")
     @JSONField(name = "ParentId")
     var parentId: String? = null
 
     /** 排序 */
-    @ApiModelProperty(value = "排序")
+    @Schema(description = "排序")
     @Column(name = "sort")
     var sort: Int? = null
 
     /** 级联-图类型   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @ApiModelProperty(value = "级联-图类型")
+    @Schema(description = "级联-图类型")
     @SCascade(table="graphtype.graphic_type", idColumn="parent_id", childIdColumn="id")
     @JSONField(name = "ChildGraphicTypeList")
     var childGraphicTypeList: ArrayList<GraphicType>? = null
 
     /** 级联-状态信息 */
-    @ApiModelProperty(value = "级联-状态信息")
+    @Schema(description = "级联-状态信息")
 //    @SCascade(table="graphtype.relation_type_project", idColumn="graphic_id", childIdColumn="id")
     @JSONField(name = "RelationTypeProjectList")
     var relationTypeProjectList: ArrayList<RelationTypeProject>? = null

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

@@ -4,119 +4,118 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
 
-@ApiModel(description = "门")
+@Schema(description = "门")
 @Table(name = "graphtype.door")
 @JsonIgnoreProperties(ignoreUnknown = true)
 class MDoor : SBaseEntity() {
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     @JsonProperty("Name")
     var name: String? = null
 
     /** 模型所属楼层的id, 是uuid */
-    @ApiModelProperty(value = "模型所属楼层的id, 是uuid")
+    @Schema(description = "模型所属楼层的id, 是uuid")
     @Column(name = "model_floor_id")
     @JsonProperty("ModelFloorId")
     @JSONField(name = "ModelFloorId")
     var modelFloorId: String? = null
 
     /** 定位点 */
-    @ApiModelProperty(value = "定位点")
+    @Schema(description = "定位点")
     @Column(name = "location")
     @JSONField(name = "Location")
     @JsonProperty("Location")
     var location: MLocation? = null
 
     /** 轮廓线 */
-    @ApiModelProperty(value = "轮廓线")
+    @Schema(description = "轮廓线")
     @Column(name = "outline")
     @JSONField(name = "OutLine")
     @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 面方向 */
-    @ApiModelProperty(value = "面方向")
+    @Schema(description = "面方向")
     @Column(name = "face_direction")
     @JSONField(name = "FaceDirection")
     @JsonProperty("FaceDirection")
     var faceDirection : MPoint? = null
 
     /** Hand方向 */
-    @ApiModelProperty(value = "Hand方向")
+    @Schema(description = "Hand方向")
     @Column(name = "hand_direction")
     @JSONField(name = "HandDirection")
     @JsonProperty("HandDirection")
     var handDirection : MPoint? = null
 
     /** 类型中文名称 */
-    @ApiModelProperty(value = "类型中文名称")
+    @Schema(description = "类型中文名称")
     @Column(name = "family_name")
     @JSONField(name = "FamilyName")
     @JsonProperty("FamilyName")
     var familyName: String? = null
 
     /** 族符号 */
-    @ApiModelProperty(value = "族符号")
+    @Schema(description = "族符号")
     @Column(name = "family_symbol")
     @JSONField(name = "FamilySymbol")
     @JsonProperty("FamilySymbol")
     var familySymbol: String? = null
 
     @JSONField(name = "Thick")
-    @ApiModelProperty(value = "厚度")
+    @Schema(description = "厚度")
     @Column(name = "thick")
     @JsonProperty("Thick")
     var thick : Double? = null
 
     /** 所属墙 */
-    @ApiModelProperty(value = "所属墙")
+    @Schema(description = "所属墙")
     @JSONField(name = "WallId")
     @Column(name = "wall_id")
     var wallId: String? = null
 
     /** 拥有者的RevitId */
-    @ApiModelProperty(value = "拥有者的RevitId")
+    @Schema(description = "拥有者的RevitId")
     @Column(name = "owner")
     @JSONField(name = "Owner")
     @JsonProperty("Owner")
     var owner: String? = null
 
     /** 模型id */
-    @ApiModelProperty(value = "模型id")
+    @Schema(description = "模型id")
     @Column(name = "id", updatable = false)
     @JSONField(name = "Id")
     @Id
     var id: String? = null
 
     /** 模型id(外键) */
-    @ApiModelProperty(value = "模型id(外键)")
+    @Schema(description = "模型id(外键)")
     @Column(name = "model_id")
     @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @JSONField(name = "ElementType")
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JsonProperty("ElementType")
     var elementType : String? = null
 
-    @ApiModelProperty(value = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
+    @Schema(description = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
     @Column(name = "revit_id")
     @JSONField(name = "RevitId")
     @JsonProperty("RevitId")
     var revitId : String? = null
 
     /** 对应Revit模型id */
-    @ApiModelProperty(value = "对应Revit模型id")
+    @Schema(description = "对应Revit模型id")
     @Column(name = "source_id")
     @JSONField(name = "SourceId")
     @JsonProperty("SourceId")

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

@@ -4,72 +4,71 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
 
-@ApiModel(description = "虚拟墙")
+@Schema(description = "虚拟墙")
 @Table(name = "graphtype.virtual_wall")
 @JsonIgnoreProperties(ignoreUnknown = true)
 class MVirtualWall : SBaseEntity(){
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     @JsonProperty("Name")
     var name: String? = null
 
     /** 墙路径 */
-    @ApiModelProperty(value = "墙路径")
+    @Schema(description = "墙路径")
     @Column(name = "location")
     @JSONField(name = "Location")
     @JsonProperty("Location")
     var location : MLocation? = null
 
     /** 模型所属楼层的id, 是uuid */
-    @ApiModelProperty(value = "模型所属楼层的id, 是uuid")
+    @Schema(description = "模型所属楼层的id, 是uuid")
     @Column(name = "model_floor_id")
     @JsonProperty("ModelFloorId")
     @JSONField(name = "ModelFloorId")
     var modelFloorId: String? = null
 
     /** 墙轮廓 */
-    @ApiModelProperty(value = "墙轮廓")
+    @Schema(description = "墙轮廓")
     @Column(name = "outline")
     @JSONField(name = "OutLine")
     @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 模型id */
-    @ApiModelProperty(value = "模型id")
+    @Schema(description = "模型id")
     @Column(name = "id", updatable = false)
     @Id
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 模型id(外键) */
-    @ApiModelProperty(value = "模型id(外键)")
+    @Schema(description = "模型id(外键)")
     @Column(name = "model_id")
     @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @JSONField(name = "ElementType")
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JsonProperty("ElementType")
     var elementType : String? = null
 
-    @ApiModelProperty(value = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
+    @Schema(description = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
     @Column(name = "revit_id")
     @JSONField(name = "RevitId")
     @JsonProperty("RevitId")
     var revitId : String? = null
 
     /** 对应Revit模型id */
-    @ApiModelProperty(value = "对应Revit模型id")
+    @Schema(description = "对应Revit模型id")
     @Column(name = "source_id")
     @JSONField(name = "SourceId")
     @JsonProperty("SourceId")

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

@@ -4,111 +4,110 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.persagy.service.models.SBaseEntity
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
 
-@ApiModel(description = "窗")
+@Schema(description = "窗")
 @Table(name = "graphtype.window")
 @JsonIgnoreProperties(ignoreUnknown = true)
 class MWindow : SBaseEntity(){
 
     /** 模型id */
-    @ApiModelProperty(value = "模型id")
+    @Schema(description = "模型id")
     @Column(name = "id", updatable = false)
     @Id
     var id: String? = null
 
     /** 模型所属楼层的id, 是uuid */
-    @ApiModelProperty(value = "模型所属楼层的id, 是uuid")
+    @Schema(description = "模型所属楼层的id, 是uuid")
     @Column(name = "model_floor_id")
     @JsonProperty("ModelFloorId")
     @JSONField(name = "ModelFloorId")
     var modelFloorId: String? = null
 
     /** 模型id(外键) */
-    @ApiModelProperty(value = "模型id(外键)")
+    @Schema(description = "模型id(外键)")
     @Column(name = "model_id")
     @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @JSONField(name = "ElementType")
-    @ApiModelProperty(value = "类型")
+    @Schema(description = "类型")
     @Column(name = "type")
     @JsonProperty("ElementType")
     var elementType : String? = null
 
-    @ApiModelProperty(value = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
+    @Schema(description = "revit模型中的id, 自增序列, 仅在解析模型内部对象关系时使用")
     @Column(name = "revit_id")
     @JSONField(name = "RevitId")
     @JsonProperty("RevitId")
     var revitId : String? = null
 
     /** 对应Revit模型id */
-    @ApiModelProperty(value = "对应Revit模型id")
+    @Schema(description = "对应Revit模型id")
     @Column(name = "source_id")
     @JSONField(name = "SourceId")
     @JsonProperty("SourceId")
     var sourceId: String? = null
 
     /** 所属墙 */
-    @ApiModelProperty(value = "所属墙")
+    @Schema(description = "所属墙")
     @Column(name = "wall_id")
     @JSONField(name = "WallId")
     var wallId: String? = null
 
     /** 拥有者的RevitId */
-    @ApiModelProperty(value = "拥有者的RevitId")
+    @Schema(description = "拥有者的RevitId")
     @Column(name = "owner")
     @JSONField(name = "Owner")
     @JsonProperty("Owner")
     var owner: String? = null
 
     /** 名称 */
-    @ApiModelProperty(value = "名称")
+    @Schema(description = "名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     @JsonProperty("Name")
     var name: String? = null
 
     /** 宽度 */
-    @ApiModelProperty(value = "宽度")
+    @Schema(description = "宽度")
     @Column(name = "width")
     @JSONField(name = "Width")
     var width: Double? = null
 
     /** 定位点 */
-    @ApiModelProperty(value = "定位点")
+    @Schema(description = "定位点")
     @Column(name = "location")
     @JSONField(name = "Location")
     @JsonProperty("Location")
     var location: MLocation? = null
 
     /** 轮廓线 */
-    @ApiModelProperty(value = "轮廓线")
+    @Schema(description = "轮廓线")
     @Column(name = "outline")
     @JSONField(name = "OutLine")
     @JsonProperty("OutLine")
     var outline: ArrayList<ArrayList<MPoint>>? = null
 
     /** 类型中文名称 */
-    @ApiModelProperty(value = "类型中文名称")
+    @Schema(description = "类型中文名称")
     @Column(name = "family_name")
     @JSONField(name = "FamilyName")
     @JsonProperty("FamilyName")
     var familyName: String? = null
 
     /** 族符号 */
-    @ApiModelProperty(value = "族符号")
+    @Schema(description = "族符号")
     @Column(name = "family_symbol")
     @JSONField(name = "FamilySymbol")
     @JsonProperty("FamilySymbol")
     var familySymbol: String? = null
 
     @JSONField(name = "Thick")
-    @ApiModelProperty(value = "厚度")
+    @Schema(description = "厚度")
     @Column(name = "thick")
     @JsonProperty("Thick")
     var thick : Double? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,145 +12,145 @@ import javax.persistence.Table
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "关系类型实体类")
+@Schema(description = "关系类型实体类")
 @Table(name = "graphtype.relation_type")
 open class RelationType : RBaseInfo() {
 
     /** 关系类型id */
-    @ApiModelProperty(value = "关系类型id")
+    @Schema(description = "关系类型id")
     @Id
     @Column(name = "id")
     @JSONField(name = "RelationTypeId")
     var relationTypeId: String? = null
 
     /** 关系类型名称 */
-    @ApiModelProperty(value = "关系类型名称")
+    @Schema(description = "关系类型名称")
     @Column(name = "name")
     @JSONField(name = "RelationTypeName")
     var relationTypeName: String? = null
 
     /** 关系类型编码 */
-    @ApiModelProperty(value = "关系类型编码")
+    @Schema(description = "关系类型编码")
     @Column(name = "code")
     @JSONField(name = "RelationTypeCode")
     var relationTypeCode: String? = null
 
     /** 图类型编码 */
-    @ApiModelProperty(value = "图类型编码")
+    @Schema(description = "图类型编码")
     @Column(name = "graphic_id")
     @JSONField(name = "GraphicId")
     var graphicId: String? = null
 
     /** 说明 */
-    @ApiModelProperty(value = "说明")
+    @Schema(description = "说明")
     @Column(name = "note")
     @JSONField(name = "Note")
     var note: String? = null
 
     /** 连接对象 */
-    @ApiModelProperty(value = "连接对象")
+    @Schema(description = "连接对象")
     @Column(name = "conne_object")
     @JSONField(name = "ConneObject")
     var conneObject: String? = null
 
     /** 是否需要配置源末端 */
-    @ApiModelProperty(value = "是否需要配置源末端")
+    @Schema(description = "是否需要配置源末端")
     @Column(name = "is_source")
     @JSONField(name = "IsSource")
     var isSource: Boolean? = null
 
     /** 是否自动计算类型 */
-    @ApiModelProperty(value = "是否自动计算类型")
+    @Schema(description = "是否自动计算类型")
     @Column(name = "is_automatic")
     @JSONField(name = "IsAutomatic")
     var isAutomatic: Boolean? = null
 
     /** 手动计算类型 1 禁用  2提示引导 3手动维护 */
-    @ApiModelProperty(value = "手动计算类型 1 禁用  2提示引导 3手动维护")
+    @Schema(description = "手动计算类型 1 禁用  2提示引导 3手动维护")
     @Column(name = "manual")
     @JSONField(name = "Manual")
     var manual: Int? = null
 
     /** 提示信息 */
-    @ApiModelProperty(value = "提示信息")
+    @Schema(description = "提示信息")
     @Column(name = "prompting")
     @JSONField(name = "Prompting")
     var prompting: String? = null
 
     /** 关系表名 */
-    @ApiModelProperty(value = "关系表名")
+    @Schema(description = "关系表名")
     @Column(name = "table_name")
     @JSONField(name = "TableName")
     var tableName: String? = null
 
     /** 关系是否双向 */
-    @ApiModelProperty(value = "关系是否双向")
+    @Schema(description = "关系是否双向")
     @Column(name = "is_thorough")
     @JSONField(name = "IsThorough")
     var isThorough: Boolean? = null
 
     /** 关系类型,数据中心用。 */
-    @ApiModelProperty(value = "关系类型,数据中心用。")
+    @Schema(description = "关系类型,数据中心用。")
     @Column(name = "relation_type")
     @JSONField(name = "RelationType")
     var relationType: String? = null
 
     /** 业务空间类型 */
-    @ApiModelProperty(value = "业务空间类型")
+    @Schema(description = "业务空间类型")
     @Column(name = "zone_type")
     @JSONField(name = "ZoneType")
     var zoneType: String? = null
 
     /** 手动计算查询函数 */
-    @ApiModelProperty(value = "手动计算查询函数")
+    @Schema(description = "手动计算查询函数")
     @Column(name = "manual_query")
     @JSONField(name = "ManualQuery")
     var manualQuery: String? = null
 
     /** 手动计算主对象类型 */
-    @ApiModelProperty(value = "手动计算主对象类型")
+    @Schema(description = "手动计算主对象类型")
     @Column(name = "main_type")
     @JSONField(name = "MainType")
     var mainType: String? = null
 
     /** 手动计算从对象类型 */
-    @ApiModelProperty(value = "手动计算从对象类型")
+    @Schema(description = "手动计算从对象类型")
     @Column(name = "from_type")
     @JSONField(name = "FromType")
     var fromType: String? = null
 
     /** 手动计算添加关系 */
-    @ApiModelProperty(value = "手动计算添加关系")
+    @Schema(description = "手动计算添加关系")
     @Column(name = "add_rel")
     @JSONField(name = "AddRel")
     var addRel: String? = null
 
     /** 手动计算删除关系 */
-    @ApiModelProperty(value = "手动计算删除关系")
+    @Schema(description = "手动计算删除关系")
     @Column(name = "del_rel")
     @JSONField(name = "DelRel")
     var delRel: String? = null
 
     /** 手动计算关系类型 */
-    @ApiModelProperty(value = "手动计算关系类型")
+    @Schema(description = "手动计算关系类型")
     @Column(name = "rel_manual_type")
     @JSONField(name = "RelManualType")
     var relManualType: String? = null
 
     /** 主对象类型 */
-    @ApiModelProperty(value = "主对象类型")
+    @Schema(description = "主对象类型")
     @Column(name = "main_object")
     @JSONField(name = "MainObject")
     var mainObject: String? = null
 
     /** 从对象类型 */
-    @ApiModelProperty(value = "从对象类型")
+    @Schema(description = "从对象类型")
     @Column(name = "from_object")
     @JSONField(name = "FromObject")
     var fromObject: String? = null
 
     /** 机电系统类型 */
-    @ApiModelProperty(value = "机电系统类型")
+    @Schema(description = "机电系统类型")
     @Column(name = "mep_system_type")
     @JSONField(name = "MepSystemType")
     var mepSystemType: ArrayList<String>? = null

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

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

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,90 +12,90 @@ import javax.persistence.Table
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "源末端实体类")
+@Schema(description = "源末端实体类")
 @Table(name = "revit_calc.connected_block")
 open class ConnectedBlock : RBaseInfo() {
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: Long? = null
 
     /** id1 */
-    @ApiModelProperty(value = "id1")
+    @Schema(description = "id1")
     @Column(name = "id1")
     @JSONField(name = "Id1")
     var id1: String? = null
 
     /** type1 */
-    @ApiModelProperty(value = "type1")
+    @Schema(description = "type1")
     @Column(name = "type1")
     @JSONField(name = "Type1")
     var type1: String? = null
 
     /** model_id1 */
-    @ApiModelProperty(value = "model_id1")
+    @Schema(description = "model_id1")
     @Column(name = "model_id1")
     @JSONField(name = "ModelId1")
     var modelId1: String? = null
 
     /** id2 */
-    @ApiModelProperty(value = "id2")
+    @Schema(description = "id2")
     @Column(name = "id2")
     @JSONField(name = "Id2")
     var id2: String? = null
 
     /** type2 */
-    @ApiModelProperty(value = "type2")
+    @Schema(description = "type2")
     @Column(name = "type2")
     @JSONField(name = "Type2")
     var type2: String? = null
 
     /** model_id2 */
-    @ApiModelProperty(value = "model_id2")
+    @Schema(description = "model_id2")
     @Column(name = "model_id2")
     @JSONField(name = "ModelId2")
     var modelId2: String? = null
 
     /** direction */
-    @ApiModelProperty(value = "direction, 1表示从id1流向id2, -1 表示从id2流向id1, 0表示不确定流向")
+    @Schema(description = "direction, 1表示从id1流向id2, -1 表示从id2流向id1, 0表示不确定流向")
     @Column(name = "direction")
     @JSONField(name = "Direction")
     var direction: Int? = null
 
     /** block_id */
-    @ApiModelProperty(value = "block_id")
+    @Schema(description = "block_id")
     @Column(name = "block_id")
     @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** project_id */
-    @ApiModelProperty(value = "project_id")
+    @Schema(description = "project_id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** depth */
-    @ApiModelProperty(value = "depth")
+    @Schema(description = "depth")
     @Column(name = "depth")
     @JSONField(name = "Depth")
     var depth: String? = null
 
     /** mep_system_type */
-    @ApiModelProperty(value = "mep_system_type")
+    @Schema(description = "mep_system_type")
     @Column(name = "mep_system_type")
     @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** domain */
-    @ApiModelProperty(value = "domain")
+    @Schema(description = "domain")
     @Column(name = "domain")
     @JSONField(name = "Domain")
     var domain: String? = null
 
     /** building_id */
-    @ApiModelProperty(value = "building_id")
+    @Schema(description = "building_id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null

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

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

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

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

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import kotlin.collections.ArrayList
 
@@ -12,17 +11,17 @@ import kotlin.collections.ArrayList
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "源末端")
+@Schema(description = "源末端")
 open class ConnectedBlockResponse : RBaseInfo() {
 
     /** block_id */
-    @ApiModelProperty(value = "block_id")
+    @Schema(description = "block_id")
     @Column(name = "block_id")
     @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** 根据块分组列表 */
-    @ApiModelProperty(value = "根据块分组列表")
+    @Schema(description = "根据块分组列表")
     @Column(name = "items")
     @JSONField(name = "Items")
     var items: ArrayList<ConnectedBlockItem>? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,61 +12,61 @@ import javax.persistence.Table
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "连接块的源实体类")
+@Schema(description = "连接块的源实体类")
 @Table(name = "revit_calc.connected_block_source")
 open class ConnectedBlockSource : RBaseInfo() {
 
     /** id */
-    @ApiModelProperty(value = "id")
+    @Schema(description = "id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: Long? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 分块id */
-    @ApiModelProperty(value = "分块id")
+    @Schema(description = "分块id")
     @Column(name = "block_id")
     @JSONField(name = "BlockId")
     var blockId: String? = null
 
     /** 被指定的源的id */
-    @ApiModelProperty(value = "被指定的源的id")
+    @Schema(description = "被指定的源的id")
     @Column(name = "source_id")
     @JSONField(name = "SourceId")
     var sourceId: String? = null
 
     /** 被指定的源的类型 */
-    @ApiModelProperty(value = "被指定的源的类型")
+    @Schema(description = "被指定的源的类型")
     @Column(name = "source_type")
     @JSONField(name = "SourceType")
     var sourceType: String? = null
 
     /** 系统类型所属域 */
-    @ApiModelProperty(value = "系统类型所属域")
+    @Schema(description = "系统类型所属域")
     @Column(name = "domain")
     @JSONField(name = "Domain")
     var domain: String? = null
 
     /** 系统类型名称 */
-    @ApiModelProperty(value = "系统类型名称")
+    @Schema(description = "系统类型名称")
     @Column(name = "mep_system_type")
     @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** true是源, false是末端 */
-    @ApiModelProperty(value = "true是源, false是末端")
+    @Schema(description = "true是源, false是末端")
     @Column(name = "is_source")
     @JSONField(name = "IsSource")
     var isSource: Boolean? = null

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

@@ -2,45 +2,43 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
-import kotlin.collections.ArrayList
 
 /**
  * 连接块的源
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "连接块的源请求类")
+@Schema(description = "连接块的源请求类")
 open class ConnectedBlockSourceRequest : RBaseInfo() {
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 系统类型所属域 */
-    @ApiModelProperty(value = "系统类型所属域")
+    @Schema(description = "系统类型所属域")
     @Column(name = "domain")
     @JSONField(name = "Domain")
     var domain: String? = null
 
     /** 系统类型名称 */
-    @ApiModelProperty(value = "系统类型名称")
+    @Schema(description = "系统类型名称")
     @Column(name = "mep_system_type")
     @JSONField(name = "MepSystemType")
     var mepSystemType: String? = null
 
     /** 源末端列表 */
-    @ApiModelProperty(value = "源末端列表")
+    @Schema(description = "源末端列表")
     @JSONField(name = "SourceList")
     var sourceList: ArrayList<ConnectedBlockSource>? = null
 

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

@@ -2,24 +2,23 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 
 /**
  * 连接块的源
  *
  * @author  邓婷婷
  */
-@ApiModel(description = "数据中心设备id 和 模型中设备uuid 的映射")
+@Schema(description = "数据中心设备id 和 模型中设备uuid 的映射")
 open class EquipIdUUIDMap : RBaseInfo() {
 
     /** 数据中心设备id */
-    @ApiModelProperty(value = "数据中心设备id")
+    @Schema(description = "数据中心设备id")
     @JSONField(name = "equipId")
     var equipId: String? = null
 
     /** 模型中设备uuid */
-    @ApiModelProperty(value = "模型中设备uuid")
+    @Schema(description = "模型中设备uuid")
     @JSONField(name = "revitUUID")
     var revitUUID: String? = null
 

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.util.*
 import javax.persistence.Column
 import javax.persistence.Table
@@ -14,37 +13,37 @@ import javax.persistence.Table
  *
  * @author jxing
  */
-@ApiModel(description = "机电管网源设备类型")
+@Schema(description = "机电管网源设备类型")
 @Table(name = "revit_calc.mep_source_type")
 @JsonIgnoreProperties(ignoreUnknown = true)
 class MepSourceTypeEntity {
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JsonProperty("ProjectId")
     var projectId: String? = null
 
     /** 计算卡片名称 */
-    @ApiModelProperty(value = "计算卡片名称")
+    @Schema(description = "计算卡片名称")
     @Column(name = "calc_name")
     @JsonProperty("CalcName")
     var calcName: String? = null
 
     /** 源类型 */
-    @ApiModelProperty(value = "源设备类型")
+    @Schema(description = "源设备类型")
     @Column(name = "source_type")
     @JsonProperty("SourceType")
     var sourceType: String? = null
 
     /** 前台使用源设备类型 */
-    @ApiModelProperty(value = "前台使用源设备类型")
+    @Schema(description = "前台使用源设备类型")
     @Column(name = "front_type")
     @JsonProperty("FrontType")
     var frontType: String? = null
 
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @Column(name = "create_time")
     @JsonProperty("CreateTime")
     var createTime: Date? = null

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

@@ -1,7 +1,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.block
 
 import com.alibaba.fastjson.annotation.JSONField
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
 /**
@@ -11,19 +11,19 @@ import java.io.Serializable
  */
 class RelationAddRequest : Serializable {
 
-    @ApiModelProperty(value = "需要计算的类型")
+    @Schema(description = "需要计算的类型")
     @JSONField(name = "RelType")
     var relType: String? = null
 
-    @ApiModelProperty(value = "编码类型,CADID图纸编码(cadId),设备名称(name),设备ID(id),本地编码(localId),本地名称(localName)")
+    @Schema(description = "编码类型,CADID图纸编码(cadId),设备名称(name),设备ID(id),本地编码(localId),本地名称(localName)")
     @JSONField(name = "Type")
     var type: String? = null
 
-    @ApiModelProperty(value = "主对象内容")
+    @Schema(description = "主对象内容")
     @JSONField(name = "MainContent")
     var mainContent: String? = null
 
-    @ApiModelProperty(value = "从对象内容")
+    @Schema(description = "从对象内容")
     @JSONField(name = "FromContent")
     var fromContent: ArrayList<String>? = null
 

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

@@ -20,8 +20,7 @@
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -31,85 +30,85 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "建筑信息实体类")
+@Schema(description = "建筑信息实体类")
 @Table(name = "building")
 open class RelBuilding : BaseInfo() {
 
     /** 建筑体ID */
-    @ApiModelProperty(value = "建筑体ID")
+    @Schema(description = "建筑体ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 建筑体名称 */
-    @ApiModelProperty(value = "建筑体名称")
+    @Schema(description = "建筑体名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 建筑本地编码 */
-    @ApiModelProperty(value = "建筑本地编码")
+    @Schema(description = "建筑本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 建筑本地名称 */
-    @ApiModelProperty(value = "建筑本地名称")
+    @Schema(description = "建筑本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectID")
     var projectId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 建筑信息 */
-    @ApiModelProperty(value = "建筑信息")
+    @Schema(description = "建筑信息")
     @Column(name = "building_info")
     @JSONField(name = "BuildingInfo")
     var buildingInfo: HashMap<String,Any?>? = null
 
     /** 工作历 */
-    @ApiModelProperty(value = "工作历")
+    @Schema(description = "工作历")
     @Column(name = "schedule")
     @JSONField(name = "Schedule")
     var schedule: HashMap<String,Any?>? = null
 
     /** 人员信息 */
-    @ApiModelProperty(value = "人员信息")
+    @Schema(description = "人员信息")
     @Column(name = "people_info")
     @JSONField(name = "PeopleInfo")
     var peopleInfo: HashMap<String,Any?>? = null
 
     /** 能耗信息 */
-    @ApiModelProperty(value = "能耗信息")
+    @Schema(description = "能耗信息")
     @Column(name = "consumption_info")
     @JSONField(name = "ConsumptionInfo")
     var consumptionInfo: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String,Any?>? = null
 
     /** 建筑文档 */
-    @ApiModelProperty(value = "建筑文档")
+    @Schema(description = "建筑文档")
     @Column(name = "building_doc")
     @JSONField(name = "BuildingDoc")
     var buildingDoc: HashMap<String,Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "Building"

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

@@ -24,8 +24,7 @@ import RelBuilding
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -35,12 +34,12 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "设备信息实体类")
+@Schema(description = "设备信息实体类")
 @Table(name = "equipment")
 open class RelEquipmentBuilding : BaseInfo() {
 
     /** 设备id */
-    @ApiModelProperty(value = "设备id",required = true)
+    @Schema(description = "设备id",required = true)
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
@@ -48,79 +47,79 @@ open class RelEquipmentBuilding : BaseInfo() {
     var id: String? = null
 
     /** 设备名称 */
-    @ApiModelProperty(value = "设备名称",required = true)
+    @Schema(description = "设备名称",required = true)
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 设备本地编码 */
-    @ApiModelProperty(value = "设备本地编码")
+    @Schema(description = "设备本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 设备本地名称 */
-    @ApiModelProperty(value = "设备本地名称")
+    @Schema(description = "设备本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 设备类型code */
-    @ApiModelProperty(value = "设备类型code")
+    @Schema(description = "设备类型code")
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备所在建筑id */
-    @ApiModelProperty(value = "设备所在建筑id")
+    @Schema(description = "设备所在建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备所在楼层id */
-    @ApiModelProperty(value = "设备所在楼层id")
+    @Schema(description = "设备所在楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
 //    //    /** 设备关联的资产id */
-//    @ApiModelProperty(value = "设备关联的资产id")
+//    @Schema(description = "设备关联的资产id")
 //    @Column(name = "property_id",insertable = false,updatable = false )
 //    @JSONField(name = "PropertyId")
 //    var propertyId: String? = null
 
     /** Revit族 */
-    @ApiModelProperty(value = "Revit族 ")
+    @Schema(description = "Revit族 ")
     @Column(name = "family_name")
     @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
-    @ApiModelProperty(value = "Revit族类型 ")
+    @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
     @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备服务的建筑 */
-    @ApiModelProperty(value = "级联-设备服务的建筑")
+    @Schema(description = "级联-设备服务的建筑")
     @SCascade(table="relationship.r_eq2bd", idColumn="id1", childIdColumn="id2", filter = "type = 'eq2bd_for'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelBuilding>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,12 +33,12 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "设备信息实体类")
+@Schema(description = "设备信息实体类")
 @Table(name = "equipment")
 open class RelEquipmentFloor : BaseInfo() {
 
     /** 设备id */
-    @ApiModelProperty(value = "设备id",required = true)
+    @Schema(description = "设备id",required = true)
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
@@ -47,79 +46,79 @@ open class RelEquipmentFloor : BaseInfo() {
     var id: String? = null
 
     /** 设备名称 */
-    @ApiModelProperty(value = "设备名称",required = true)
+    @Schema(description = "设备名称",required = true)
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 设备本地编码 */
-    @ApiModelProperty(value = "设备本地编码")
+    @Schema(description = "设备本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 设备本地名称 */
-    @ApiModelProperty(value = "设备本地名称")
+    @Schema(description = "设备本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 设备类型code */
-    @ApiModelProperty(value = "设备类型code")
+    @Schema(description = "设备类型code")
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备所在建筑id */
-    @ApiModelProperty(value = "设备所在建筑id")
+    @Schema(description = "设备所在建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备所在楼层id */
-    @ApiModelProperty(value = "设备所在楼层id")
+    @Schema(description = "设备所在楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
 //    //    /** 设备关联的资产id */
-//    @ApiModelProperty(value = "设备关联的资产id")
+//    @Schema(description = "设备关联的资产id")
 //    @Column(name = "property_id",insertable = false,updatable = false )
 //    @JSONField(name = "PropertyId")
 //    var propertyId: String? = null
 
     /** Revit族 */
-    @ApiModelProperty(value = "Revit族 ")
+    @Schema(description = "Revit族 ")
     @Column(name = "family_name")
     @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
-    @ApiModelProperty(value = "Revit族类型 ")
+    @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
     @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备服务的竖井 */
-    @ApiModelProperty(value = "级联-设备服务的竖井")
+    @Schema(description = "级联-设备服务的竖井")
     @SCascade(table="r_eq_for_fl", idColumn="equip_id", childIdColumn="floor_id")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelFloor>? = null

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

@@ -24,8 +24,7 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.objects.Shaft
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -35,13 +34,13 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "设备信息实体类")
+@Schema(description = "设备信息实体类")
 @Table(name = "equipment")
 open class RelEquipmentShaft : BaseInfo() {
 
 
     /** 设备id */
-    @ApiModelProperty(value = "设备id",required = true)
+    @Schema(description = "设备id",required = true)
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
@@ -49,79 +48,79 @@ open class RelEquipmentShaft : BaseInfo() {
     var id: String? = null
 
     /** 设备名称 */
-    @ApiModelProperty(value = "设备名称",required = true)
+    @Schema(description = "设备名称",required = true)
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 设备本地编码 */
-    @ApiModelProperty(value = "设备本地编码")
+    @Schema(description = "设备本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 设备本地名称 */
-    @ApiModelProperty(value = "设备本地名称")
+    @Schema(description = "设备本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 设备类型code */
-    @ApiModelProperty(value = "设备类型code")
+    @Schema(description = "设备类型code")
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 设备所在建筑id */
-    @ApiModelProperty(value = "设备所在建筑id")
+    @Schema(description = "设备所在建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备所在楼层id */
-    @ApiModelProperty(value = "设备所在楼层id")
+    @Schema(description = "设备所在楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
 //    //    /** 设备关联的资产id */
-//    @ApiModelProperty(value = "设备关联的资产id")
+//    @Schema(description = "设备关联的资产id")
 //    @Column(name = "property_id",insertable = false,updatable = false )
 //    @JSONField(name = "PropertyId")
 //    var propertyId: String? = null
 
     /** Revit族 */
-    @ApiModelProperty(value = "Revit族 ")
+    @Schema(description = "Revit族 ")
     @Column(name = "family_name")
     @JSONField(name = "BIMFamilyName")
     var familyName: String? = null
 
     /** Revit族类型 */
-    @ApiModelProperty(value = "Revit族类型 ")
+    @Schema(description = "Revit族类型 ")
     @Column(name = "family_symbol")
     @JSONField(name = "BIMFamilySymbol")
     var familySymbol: String? = null
 
     /** 级联-设备服务的竖井 */
-    @ApiModelProperty(value = "级联-设备服务的竖井")
+    @Schema(description = "级联-设备服务的竖井")
     @SCascade(table="r_eq_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<Shaft>? = null

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

@@ -22,8 +22,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -33,127 +32,127 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "楼层信息实体类")
+@Schema(description = "楼层信息实体类")
 @Table(name = "floor")
 open class RelFloor : BaseInfo() {
 
     /** 楼层ID */
-    @ApiModelProperty(value = "楼层ID")
+    @Schema(description = "楼层ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 楼层名称 */
-    @ApiModelProperty(value = "楼层名称")
+    @Schema(description = "楼层名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 楼层本地编码 */
-    @ApiModelProperty(value = "楼层本地编码")
+    @Schema(description = "楼层本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 楼层本地名称 */
-    @ApiModelProperty(value = "楼层本地名称")
+    @Schema(description = "楼层本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 樓層二維碼圖片 */
-    @ApiModelProperty(value = "樓層二維碼圖片")
+    @Schema(description = "樓層二維碼圖片")
     @Column(name = "qr_code")
     @JSONField(name = "FloorQRCode")
     var qr_code: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectID")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingID")
     var buildingId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 楼层顺序码 */
-    @ApiModelProperty(value = "楼层顺序码")
+    @Schema(description = "楼层顺序码")
     @Column(name = "sequence_id")
     @JSONField(name = "FloorSequenceID")
     var sequenceId: Int? = null
 
     /** 结构信息 */
-    @ApiModelProperty(value = "结构信息")
+    @Schema(description = "结构信息")
     @Column(name = "structure_info")
     @JSONField(name = "StructureInfo")
     var structureInfo: HashMap<String,Any?>? = null
 
     /** 人员信息 */
-    @ApiModelProperty(value = "结构信息")
+    @Schema(description = "结构信息")
     @Column(name = "people_info")
     @JSONField(name = "PeopleInfo")
     var peopleInfo: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String,Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "Floor"
 
     /** 工作历信息 */
-    @ApiModelProperty(value = "工作历信息")
+    @Schema(description = "工作历信息")
     @Column(name = "work_calendar")
     @JSONField(name = "WorkCalendar")
     var workCalendar: HashMap<String,Any?>? = null
 
 //    /** 建筑   table  对应关系表   idColumn 对应 本类的关系id    childIdColumn 级联对象的关系id */
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="floor", idColumn="id", childIdColumn="building_id")
 //    @JSONField(name = "Building")
 //    var building: Building? = null
 //
 //    /** 项目 */
-//    @ApiModelProperty(value = "级联-项目")
+//    @Schema(description = "级联-项目")
 //    @SCascade(table="floor", idColumn="id", childIdColumn="project_id")
 //    @JSONField(name = "Project")
 //    var project: Project? = null
 //
 //    /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
-//    @ApiModelProperty(value = "级联-贯通关系")
+//    @Schema(description = "级联-贯通关系")
 //    @SCascade(table="r_fl_through_fl", idColumn="floor_id", childIdColumn="floor_other_id", self = true)
 //    @JSONField(name = "FloorThroughList")
 //    var floorThroughList: ArrayList<RelFloor>? = null
 
 //    /** 项目 */
-//    @ApiModelProperty(value = "级联-项目")
+//    @Schema(description = "级联-项目")
 //    @SCascade(table="floor", idColumn="id", childIdColumn="project_id")
 //    @JSONField(name = "Equipment")
 //    var Equipment: ArrayList<Equipment>? = null
 
 //    /** 模型文件id */
-//    @ApiModelProperty(value = "模型文件id")
+//    @Schema(description = "模型文件id")
 //    @Column(name = "model_id")
 //    @JSONField(name = "ModelId")
 //    var modelId: String? = null
 //
 //    /** 轮廓线 */
-//    @ApiModelProperty(value = "轮廓线")
+//    @Schema(description = "轮廓线")
 //    @Column(name = "outline")
 //    @JSONField(name = "Outline")
 //    var outline: ArrayList<PointPosition>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,174 +33,174 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统信息实体类")
+@Schema(description = "系统信息实体类")
 @Table(name = "general_system")
 open class RelGeneralSystem : BaseInfo() {
 
     /** 系统ID */
-    @ApiModelProperty(value = "系统ID")
+    @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
-    @ApiModelProperty(value = "系统名称")
+    @Schema(description = "系统名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 系统本地编码 */
-    @ApiModelProperty(value = "系统本地编码")
+    @Schema(description = "系统本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 系统本地名称 */
-    @ApiModelProperty(value = "系统本地名称")
+    @Schema(description = "系统本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 系统分类 */
-    @ApiModelProperty(value = "系统分类",required = true)
+    @Schema(description = "系统分类",required = true)
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
-    @ApiModelProperty(value = "设定参数")
+    @Schema(description = "设定参数")
     @Column(name = "setting_param")
     @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
-    @ApiModelProperty(value = "技术参数")
+    @Schema(description = "技术参数")
     @Column(name = "tech_param")
     @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
-    @ApiModelProperty(value = "运行参数")
+    @Schema(description = "运行参数")
     @Column(name = "run_param")
     @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
-    @ApiModelProperty(value = "运行状态")
+    @Schema(description = "运行状态")
     @Column(name = "running_state")
     @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
-    @ApiModelProperty(value = "专业名称")
+    @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
     @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
     @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
-    @ApiModelProperty(value = "反馈参数")
+    @Schema(description = "反馈参数")
     @Column(name = "feedback_param")
     @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
 //    /** 级联-系统分类名 */
-//    @ApiModelProperty(value = "级联-系统分类名")
+//    @Schema(description = "级联-系统分类名")
 //    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
 //    @JSONField(name = "CategoryNames")
 //    var categoryNames: GeneralSystemCategory? = null
 //
 //    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @ApiModelProperty(value = "级联-设备或部件")
+//    @Schema(description = "级联-设备或部件")
 //    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
 //    @JSONField(name = "Equipment")
 //    var equipmentList: ArrayList<Equipment>? = null
 //
 //    /** 级联-竖井*/
-//    @ApiModelProperty(value = "级联-竖井")
+//    @Schema(description = "级联-竖井")
 //    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
 //    @JSONField(name = "Shaft")
 //    var shaftList: ArrayList<Shaft>? = null
 //
 //    /** 级联-业务空间*/
-//    @ApiModelProperty(value = "级联-业务空间")
+//    @Schema(description = "级联-业务空间")
 //    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
 //    @JSONField(name = "ZoneSpaceBaseTable")
 //    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
 //
 //    /** 级联-楼层*/
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorList: ArrayList<Floor>? = null
 //
 //    /** 级联-建筑*/
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 建筑楼层 */
-//    @ApiModelProperty(value = "建筑楼层")
+//    @Schema(description = "建筑楼层")
 //    @JSONField(name = "BuildingFloorInfoList")
 //    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
     /** 级联-系统服务的业务空间 */
-    @ApiModelProperty(value = "级联-系统服务的业务空间")
+    @Schema(description = "级联-系统服务的业务空间")
     @SCascade(table="relationship.r_sy2sp", idColumn="sy_id", childIdColumn="sp_id",filter = "type = 'sy2sp_for'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null

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

@@ -24,8 +24,7 @@ import RelBuilding
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -35,174 +34,174 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统信息实体类")
+@Schema(description = "系统信息实体类")
 @Table(name = "general_system")
 open class RelGeneralSystemBuilding : BaseInfo() {
 
     /** 系统ID */
-    @ApiModelProperty(value = "系统ID")
+    @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
-    @ApiModelProperty(value = "系统名称")
+    @Schema(description = "系统名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 系统本地编码 */
-    @ApiModelProperty(value = "系统本地编码")
+    @Schema(description = "系统本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 系统本地名称 */
-    @ApiModelProperty(value = "系统本地名称")
+    @Schema(description = "系统本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 系统分类 */
-    @ApiModelProperty(value = "系统分类",required = true)
+    @Schema(description = "系统分类",required = true)
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
-    @ApiModelProperty(value = "设定参数")
+    @Schema(description = "设定参数")
     @Column(name = "setting_param")
     @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
-    @ApiModelProperty(value = "技术参数")
+    @Schema(description = "技术参数")
     @Column(name = "tech_param")
     @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
-    @ApiModelProperty(value = "运行参数")
+    @Schema(description = "运行参数")
     @Column(name = "run_param")
     @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
-    @ApiModelProperty(value = "运行状态")
+    @Schema(description = "运行状态")
     @Column(name = "running_state")
     @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
-    @ApiModelProperty(value = "专业名称")
+    @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
     @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
     @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
-    @ApiModelProperty(value = "反馈参数")
+    @Schema(description = "反馈参数")
     @Column(name = "feedback_param")
     @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
 //    /** 级联-系统分类名 */
-//    @ApiModelProperty(value = "级联-系统分类名")
+//    @Schema(description = "级联-系统分类名")
 //    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
 //    @JSONField(name = "CategoryNames")
 //    var categoryNames: GeneralSystemCategory? = null
 //
 //    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @ApiModelProperty(value = "级联-设备或部件")
+//    @Schema(description = "级联-设备或部件")
 //    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
 //    @JSONField(name = "Equipment")
 //    var equipmentList: ArrayList<Equipment>? = null
 //
 //    /** 级联-竖井*/
-//    @ApiModelProperty(value = "级联-竖井")
+//    @Schema(description = "级联-竖井")
 //    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
 //    @JSONField(name = "Shaft")
 //    var shaftList: ArrayList<Shaft>? = null
 //
 //    /** 级联-业务空间*/
-//    @ApiModelProperty(value = "级联-业务空间")
+//    @Schema(description = "级联-业务空间")
 //    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
 //    @JSONField(name = "ZoneSpaceBaseTable")
 //    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
 //
 //    /** 级联-楼层*/
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorList: ArrayList<Floor>? = null
 //
 //    /** 级联-建筑*/
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 建筑楼层 */
-//    @ApiModelProperty(value = "建筑楼层")
+//    @Schema(description = "建筑楼层")
 //    @JSONField(name = "BuildingFloorInfoList")
 //    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
     /** 级联-系统服务于建筑 */
-    @ApiModelProperty(value = "级联-系统服务于建筑")
+    @Schema(description = "级联-系统服务于建筑")
     @SCascade(table="r_sy_for_bd", idColumn="sys_id", childIdColumn="buildingId")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelBuilding>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,174 +33,174 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统信息实体类")
+@Schema(description = "系统信息实体类")
 @Table(name = "general_system")
 open class RelGeneralSystemFloor : BaseInfo() {
 
     /** 系统ID */
-    @ApiModelProperty(value = "系统ID")
+    @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
-    @ApiModelProperty(value = "系统名称")
+    @Schema(description = "系统名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 系统本地编码 */
-    @ApiModelProperty(value = "系统本地编码")
+    @Schema(description = "系统本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 系统本地名称 */
-    @ApiModelProperty(value = "系统本地名称")
+    @Schema(description = "系统本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 系统分类 */
-    @ApiModelProperty(value = "系统分类",required = true)
+    @Schema(description = "系统分类",required = true)
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
-    @ApiModelProperty(value = "设定参数")
+    @Schema(description = "设定参数")
     @Column(name = "setting_param")
     @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
-    @ApiModelProperty(value = "技术参数")
+    @Schema(description = "技术参数")
     @Column(name = "tech_param")
     @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
-    @ApiModelProperty(value = "运行参数")
+    @Schema(description = "运行参数")
     @Column(name = "run_param")
     @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
-    @ApiModelProperty(value = "运行状态")
+    @Schema(description = "运行状态")
     @Column(name = "running_state")
     @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
-    @ApiModelProperty(value = "专业名称")
+    @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
     @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
     @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
-    @ApiModelProperty(value = "反馈参数")
+    @Schema(description = "反馈参数")
     @Column(name = "feedback_param")
     @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
 //    /** 级联-系统分类名 */
-//    @ApiModelProperty(value = "级联-系统分类名")
+//    @Schema(description = "级联-系统分类名")
 //    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
 //    @JSONField(name = "CategoryNames")
 //    var categoryNames: GeneralSystemCategory? = null
 //
 //    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @ApiModelProperty(value = "级联-设备或部件")
+//    @Schema(description = "级联-设备或部件")
 //    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
 //    @JSONField(name = "Equipment")
 //    var equipmentList: ArrayList<Equipment>? = null
 //
 //    /** 级联-竖井*/
-//    @ApiModelProperty(value = "级联-竖井")
+//    @Schema(description = "级联-竖井")
 //    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
 //    @JSONField(name = "Shaft")
 //    var shaftList: ArrayList<Shaft>? = null
 //
 //    /** 级联-业务空间*/
-//    @ApiModelProperty(value = "级联-业务空间")
+//    @Schema(description = "级联-业务空间")
 //    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
 //    @JSONField(name = "ZoneSpaceBaseTable")
 //    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
 //
 //    /** 级联-楼层*/
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorList: ArrayList<Floor>? = null
 //
 //    /** 级联-建筑*/
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 建筑楼层 */
-//    @ApiModelProperty(value = "建筑楼层")
+//    @Schema(description = "建筑楼层")
 //    @JSONField(name = "BuildingFloorInfoList")
 //    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
     /** 级联-系统服务于竖井 */
-    @ApiModelProperty(value = "级联-系统服务于竖井")
+    @Schema(description = "级联-系统服务于竖井")
     @SCascade(table="r_sy_for_fl", idColumn="sys_id", childIdColumn="floor_id")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelFloor>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,174 +33,174 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@ApiModel(description = "系统信息实体类")
+@Schema(description = "系统信息实体类")
 @Table(name = "general_system")
 open class RelGeneralSystemShaft : BaseInfo() {
 
     /** 系统ID */
-    @ApiModelProperty(value = "系统ID")
+    @Schema(description = "系统ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 系统名称 */
-    @ApiModelProperty(value = "系统名称")
+    @Schema(description = "系统名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 系统本地编码 */
-    @ApiModelProperty(value = "系统本地编码")
+    @Schema(description = "系统本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 系统本地名称 */
-    @ApiModelProperty(value = "系统本地名称")
+    @Schema(description = "系统本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 系统分类 */
-    @ApiModelProperty(value = "系统分类",required = true)
+    @Schema(description = "系统分类",required = true)
     @Column(name = "category")
     @JSONField(name = "Category")
     var category: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id",required = true)
+    @Schema(description = "项目id",required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 设定参数 */
-    @ApiModelProperty(value = "设定参数")
+    @Schema(description = "设定参数")
     @Column(name = "setting_param")
     @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
-    @ApiModelProperty(value = "技术参数")
+    @Schema(description = "技术参数")
     @Column(name = "tech_param")
     @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
-    @ApiModelProperty(value = "运行参数")
+    @Schema(description = "运行参数")
     @Column(name = "run_param")
     @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
-    @ApiModelProperty(value = "自定义")
+    @Schema(description = "自定义")
     @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
-    @ApiModelProperty(value = "运行状态")
+    @Schema(description = "运行状态")
     @Column(name = "running_state")
     @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
-    @ApiModelProperty(value = "对象类型")
+    @Schema(description = "对象类型")
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
-    @ApiModelProperty(value = "专业名称")
+    @Schema(description = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
     @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
     @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
-    @ApiModelProperty(value = "设备数量")
+    @Schema(description = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
     @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
 //    /** 反馈参数 */
-//    @ApiModelProperty(value = "反馈参数")
+//    @Schema(description = "反馈参数")
 //    @Column(name = "feedback_param")
 //    @JSONField(name = "FeedbackParam")
 //    var feedbackParam: HashMap<String,Any?>? = null
 
 //    /** 级联-系统分类名 */
-//    @ApiModelProperty(value = "级联-系统分类名")
+//    @Schema(description = "级联-系统分类名")
 //    @SCascade(table="general_system", idColumn="id", childIdColumn="category")
 //    @JSONField(name = "CategoryNames")
 //    var categoryNames: GeneralSystemCategory? = null
 //
 //    /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-//    @ApiModelProperty(value = "级联-设备或部件")
+//    @Schema(description = "级联-设备或部件")
 //    @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
 //    @JSONField(name = "Equipment")
 //    var equipmentList: ArrayList<Equipment>? = null
 //
 //    /** 级联-竖井*/
-//    @ApiModelProperty(value = "级联-竖井")
+//    @Schema(description = "级联-竖井")
 //    @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
 //    @JSONField(name = "Shaft")
 //    var shaftList: ArrayList<Shaft>? = null
 //
 //    /** 级联-业务空间*/
-//    @ApiModelProperty(value = "级联-业务空间")
+//    @Schema(description = "级联-业务空间")
 //    @SCascade(table="r_sy_in_sp_base", idColumn="sys_id", childIdColumn="space_id")
 //    @JSONField(name = "ZoneSpaceBaseTable")
 //    var zoneSpaceBaseTableList: ArrayList<ZoneSpaceBaseTable>? = null
 //
 //    /** 级联-楼层*/
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorList: ArrayList<Floor>? = null
 //
 //    /** 级联-建筑*/
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 建筑楼层 */
-//    @ApiModelProperty(value = "建筑楼层")
+//    @Schema(description = "建筑楼层")
 //    @JSONField(name = "BuildingFloorInfoList")
 //    var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
     /** 级联-系统服务于竖井 */
-    @ApiModelProperty(value = "级联-系统服务于竖井")
+    @Schema(description = "级联-系统服务于竖井")
     @SCascade(table="r_sy_for_sh", idColumn="sys_id", childIdColumn="shaft_id")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelShaft>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,85 +33,85 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "资产信息实体类")
+@Schema(description = "资产信息实体类")
 @Table(name = "property")
 open class RelProperty : BaseInfo() {
 
     /** 资产id */
-    @ApiModelProperty(value = "资产id", required = true)
+    @Schema(description = "资产id", required = true)
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 资产名称 */
-    @ApiModelProperty(value = "资产名称", required = true)
+    @Schema(description = "资产名称", required = true)
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 资产本地编码 */
-    @ApiModelProperty(value = "资产本地编码")
+    @Schema(description = "资产本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 资产本地名称 */
-    @ApiModelProperty(value = "资产本地名称")
+    @Schema(description = "资产本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id", required = true)
+    @Schema(description = "项目id", required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 资产类型code */
-    @ApiModelProperty(value = "资产类型code")
+    @Schema(description = "资产类型code")
     @Column(name = "family")
     @JSONField(name = "Family")
     var family: String? = null
 
     /** 资产所在建筑id */
-    @ApiModelProperty(value = "资产所在建筑id")
+    @Schema(description = "资产所在建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 资产所在楼层id */
-    @ApiModelProperty(value = "资产所在楼层id")
+    @Schema(description = "资产所在楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 资产关联设备id */
-    @ApiModelProperty(value = "关联的设备或部件")
+    @Schema(description = "关联的设备或部件")
     @Column(name = "equip_id")
     @JSONField(name = "EquipmentId")
     var equipId: String? = null
 
     /** 级联-资产所在的空间的 */
-    @ApiModelProperty(value = "级联-设备所在的空间的")
+    @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_pe2sp", idColumn="eq_id", childIdColumn="sp_id",filter = "type = 'pe2sp'")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 
 //    /** 级联-资产所在的竖井 */
-//    @ApiModelProperty(value = "级联-资产所在的竖井")
+//    @Schema(description = "级联-资产所在的竖井")
 //    @SCascade(table="r_pe_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
 //    @JSONField(name = "Shaft")
 //    var shaft: ArrayList<Shaft>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -34,85 +33,85 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "资产信息实体类")
+@Schema(description = "资产信息实体类")
 @Table(name = "property")
 open class RelPropertyShaft : BaseInfo() {
 
     /** 资产id */
-    @ApiModelProperty(value = "资产id", required = true)
+    @Schema(description = "资产id", required = true)
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 资产名称 */
-    @ApiModelProperty(value = "资产名称", required = true)
+    @Schema(description = "资产名称", required = true)
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 资产本地编码 */
-    @ApiModelProperty(value = "资产本地编码")
+    @Schema(description = "资产本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 资产本地名称 */
-    @ApiModelProperty(value = "资产本地名称")
+    @Schema(description = "资产本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
-    @ApiModelProperty(value = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
     @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id", required = true)
+    @Schema(description = "项目id", required = true)
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 资产类型code */
-    @ApiModelProperty(value = "资产类型code")
+    @Schema(description = "资产类型code")
     @Column(name = "family")
     @JSONField(name = "Family")
     var family: String? = null
 
     /** 资产所在建筑id */
-    @ApiModelProperty(value = "资产所在建筑id")
+    @Schema(description = "资产所在建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 资产所在楼层id */
-    @ApiModelProperty(value = "资产所在楼层id")
+    @Schema(description = "资产所在楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 资产关联设备id */
-    @ApiModelProperty(value = "关联的设备或部件")
+    @Schema(description = "关联的设备或部件")
     @Column(name = "equip_id")
     @JSONField(name = "EquipmentId")
     var equipId: String? = null
 
 //    /** 级联-资产所在的空间的 */
-//    @ApiModelProperty(value = "级联-设备所在的空间的")
+//    @Schema(description = "级联-设备所在的空间的")
 //    @SCascade(table="r_pe_in_sp_base", idColumn="equip_id", childIdColumn="space_id")
 //    @JSONField(name = "ObjectInfo")
 //    var objectInfo: ArrayList<RelZoneSpace>? = null
 
     /** 级联-资产所在的竖井 */
-    @ApiModelProperty(value = "级联-资产所在的竖井")
+    @Schema(description = "级联-资产所在的竖井")
     @SCascade(table="r_pe_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelShaft>? = null

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

@@ -2,8 +2,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Id
 import javax.persistence.Table
@@ -13,60 +12,60 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "竖井信息实体类")
+@Schema(description = "竖井信息实体类")
 @Table(name = "v_shaft")
 class RelShaft : BaseInfo() {
 
     /** 竖井id */
-    @ApiModelProperty(value = "竖井id")
+    @Schema(description = "竖井id")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 竖井名称 */
-    @ApiModelProperty(value = "竖井名称")
+    @Schema(description = "竖井名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 竖井本地编码 */
-    @ApiModelProperty(value = "竖井本地编码")
+    @Schema(description = "竖井本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 竖井本地名称 */
-    @ApiModelProperty(value = "竖井本地名称")
+    @Schema(description = "竖井本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 竖井类型 */
-    @ApiModelProperty(value = "竖井类型")
+    @Schema(description = "竖井类型")
     @Column(name = "shaftfunctype")
     @JSONField(name = "ShaftFuncType")
     var shaftFuncType: String? = null
 
 //    /** 建筑id集合 */
-//    @ApiModelProperty(value = "建筑id集合")
+//    @Schema(description = "建筑id集合")
 //    @JSONField(name = "BuildingList")
 //    var buildingList:List<String>? = null
 //
 //    /** 楼层id集合 */
-//    @ApiModelProperty(value = "楼层id集合")
+//    @Schema(description = "楼层id集合")
 //    @JSONField(name = "FloorList")
 //    var floorList:List<String>? = null
 

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

@@ -22,8 +22,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -34,86 +33,86 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "空间实体类")
+@Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
 open class RelZoneSpace: Serializable, BaseInfo() {
 
     /** 空间ID */
-    @ApiModelProperty(value = "空间ID")
+    @Schema(description = "空间ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 空间名称 */
-    @ApiModelProperty(value = "空间名称")
+    @Schema(description = "空间名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 空间本地编码 */
-    @ApiModelProperty(value = "空间本地编码")
+    @Schema(description = "空间本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 空间本地名称 */
-    @ApiModelProperty(value = "空间本地名称")
+    @Schema(description = "空间本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
 //    /** 级联-建筑 */
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
 //    @JSONField(name = "Building")
 //    var building: Building? = null
 //
 //
 //    /** 级联-楼层  */
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
 //    @JSONField(name = "Floor")
 //    var floor: Floor? = null
 //
 //    /** 级联-空间类型  */
-//    @ApiModelProperty(value = "级联-空间类型")
+//    @Schema(description = "级联-空间类型")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
 //    @JSONField(name = "DClassDef")
 //    var zoneName: DClassDef? = null
 //
 //    /** 级联-建筑 */
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 级联-楼层  */
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorlList: ArrayList<Floor>? = null

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

@@ -23,8 +23,7 @@ package com.persagy.server.datacenter.models.entities.graphtype.rel
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Id
@@ -35,92 +34,92 @@ import javax.persistence.Table
  *
  * @author  张维新
  */
-@ApiModel(description = "空间实体类")
+@Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
 open class RelZoneSpaceAirConvection: Serializable, BaseInfo() {
 
     /** 空间ID */
-    @ApiModelProperty(value = "空间ID")
+    @Schema(description = "空间ID")
     @Id
     @Column(name = "id")
     @JSONField(name = "Id")
     var id: String? = null
 
     /** 空间名称 */
-    @ApiModelProperty(value = "空间名称")
+    @Schema(description = "空间名称")
     @Column(name = "name")
     @JSONField(name = "Name")
     var name: String? = null
 
     /** 空间本地编码 */
-    @ApiModelProperty(value = "空间本地编码")
+    @Schema(description = "空间本地编码")
     @Column(name = "local_id")
     @JSONField(name = "LocalID")
     var localId: String? = null
 
     /** 空间本地名称 */
-    @ApiModelProperty(value = "空间本地名称")
+    @Schema(description = "空间本地名称")
     @Column(name = "local_name")
     @JSONField(name = "LocalName")
     var localName: String? = null
 
     /** 项目id */
-    @ApiModelProperty(value = "项目id")
+    @Schema(description = "项目id")
     @Column(name = "project_id")
     @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
-    @ApiModelProperty(value = "建筑id")
+    @Schema(description = "建筑id")
     @Column(name = "building_id")
     @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
-    @ApiModelProperty(value = "楼层id")
+    @Schema(description = "楼层id")
     @Column(name = "floor_id")
     @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** BIM模型中编码 */
-    @ApiModelProperty(value = "BIM模型中编码")
+    @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     @JSONField(name = "BIMID")
     var bimId: String? = null
 
 //    /** 级联-建筑 */
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
 //    @JSONField(name = "Building")
 //    var building: Building? = null
 //
 //
 //    /** 级联-楼层  */
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
 //    @JSONField(name = "Floor")
 //    var floor: Floor? = null
 //
 //    /** 级联-空间类型  */
-//    @ApiModelProperty(value = "级联-空间类型")
+//    @Schema(description = "级联-空间类型")
 //    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
 //    @JSONField(name = "DClassDef")
 //    var zoneName: DClassDef? = null
 //
 //    /** 级联-建筑 */
-//    @ApiModelProperty(value = "级联-建筑")
+//    @Schema(description = "级联-建筑")
 //    @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
 //    @JSONField(name = "BuildingList")
 //    var buildingList: ArrayList<Building>? = null
 //
 //    /** 级联-楼层  */
-//    @ApiModelProperty(value = "级联-楼层")
+//    @Schema(description = "级联-楼层")
 //    @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
 //    @JSONField(name = "FloorList")
 //    var floorlList: ArrayList<Floor>? = null
 
     /** 级联-资产所在的空间的 */
-    @ApiModelProperty(value = "级联-设备所在的空间的")
+    @Schema(description = "级联-设备所在的空间的")
     @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = true,filter = "type = 'sp2sp_ConvectionNetwork_1'" )
     @JSONField(name = "ObjectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null

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


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