浏览代码

********************WX************************
数据同步调整

zhangweixin 4 年之前
父节点
当前提交
80081f3d62
共有 100 个文件被更改,包括 78 次插入204 次删除
  1. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefClass.kt
  2. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt
  3. 4 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  4. 12 30
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/GeneralSystem.kt
  5. 6 65
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt
  6. 19 22
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt
  7. 29 63
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  8. 0 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpinBd.kt
  9. 0 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/RSpinFl.kt
  10. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/SpaceSQueryResponse.kt
  11. 0 0
      datacenter/build.gradle
  12. 0 0
      datacenter/src/main/kotlin/com/persagy/server/DataCenterApp.kt
  13. 0 0
      datacenter/src/main/kotlin/com/persagy/server/Swagger2Config.kt
  14. 0 0
      datacenter/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  15. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/dict/DictControllers.kt
  16. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt
  17. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt
  18. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt
  19. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  20. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt
  21. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ISpaceController.kt
  22. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt
  23. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt
  24. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt
  25. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt
  26. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt
  27. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt
  28. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt
  29. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForFlController.kt
  30. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForShController.kt
  31. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForSpConreoller.kt
  32. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqInShController.kt
  33. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt
  34. 1 1
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RFlThroughFlController.kt
  35. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt
  36. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RShaftThroughShaftController.kt
  37. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt
  38. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt
  39. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpatialConnectionConreoller.kt
  40. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt
  41. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt
  42. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt
  43. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForShController.kt
  44. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt
  45. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt
  46. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt
  47. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt
  48. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt
  49. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt
  50. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RUpDateEquipAndSapceController.kt
  51. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt
  52. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt
  53. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt
  54. 0 0
      datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt
  55. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt
  56. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/ICalcSpaceMapper.kt
  57. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/ICalcSpecialMapper.kt
  58. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCalcMapper.kt
  59. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountMapper.kt
  60. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountProvider.kt
  61. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt
  62. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt
  63. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/MepSystemMapper.kt
  64. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/RelationProvider.kt
  65. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/RelationalProcessingMapper.kt
  66. 0 0
      datacenter/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt
  67. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt
  68. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt
  69. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt
  70. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/ShaftBuildingService.kt
  71. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/ShaftFloorService.kt
  72. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt
  73. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt
  74. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/base/RService.kt
  75. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/base/Service.kt
  76. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt
  77. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DClassDefService.kt
  78. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt
  79. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictAirConditionerService.kt
  80. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingDirectService.kt
  81. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingFunctionalService.kt
  82. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingStructureTypeService.kt
  83. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictClimateService.kt
  84. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictDevelopService.kt
  85. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictFloorTypeService.kt
  86. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictGreenBuildLevService.kt
  87. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictHeatingTypeService.kt
  88. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictInsulateTypeService.kt
  89. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictProvincialCityCodeService.kt
  90. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictSpaceFunctionalTypesService.kt
  91. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt
  92. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DictWindService.kt
  93. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/DitcWeatherService.kt
  94. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/EquipFamilyService.kt
  95. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt
  96. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt
  97. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt
  98. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/graphtype/BaseDataService.kt
  99. 0 0
      datacenter/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt
  100. 0 0
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockSourceService.kt

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

@@ -41,6 +41,7 @@ class DefClass : SBaseEntity(){
     var aliasName: String? = null
 
     @ApiModelProperty(value = "分类:common平台级, group集团级, project项目级")
+    @Id
     @Column(name = "type")
     var type: String? = null
 
@@ -50,6 +51,7 @@ class DefClass : SBaseEntity(){
     var groupCode: String? = ""
 
     @ApiModelProperty(value = "项目id, 默认为 '0' ")
+    @Id
     @Column(name = "project_id")
     var projectId: String? = ""
 

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

@@ -59,6 +59,7 @@ open class DefFuncId: Serializable {
 
     /** 项目id, 默认为"0" */
     @ApiModelProperty(value = "项目id, 默认为'0'")
+    @Id
     @Column(name = "project_id")
     var projectId: String? = null
 

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

@@ -20,7 +20,6 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
@@ -127,13 +126,12 @@ open class Equipment : BaseInfo() {
 
     /** 设备类型code */
     @ApiModelProperty(value = "设备类型code")
-    @Column(name = "category")
-    var category: String? = null
+    @Column(name = "class_code")
+    var classCode: String? = null
 
     /** 设备所在建筑id */
     @ApiModelProperty(value = "设备所在建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 设备所在楼层id */
@@ -345,8 +343,8 @@ open class Equipment : BaseInfo() {
 //    @Column(name = "scheme_id")
     var schemeId: String? = null
     get() {
-        if (!category.isNullOrEmpty()){
-            return SchemeUtils.setScheme(category!!)
+        if (!classCode.isNullOrEmpty()){
+            return SchemeUtils.setScheme(classCode!!)
         }
         return null
     }

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

@@ -20,7 +20,6 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
 import com.persagy.server.datacenter.models.entities.assistant.GeneralSystemCategory
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
@@ -44,162 +43,145 @@ open class GeneralSystem : BaseInfo() {
     @ApiModelProperty(value = "系统ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "SysID")
     var id: String? = null
 
     /** 系统名称 */
     @ApiModelProperty(value = "系统名称")
     @Column(name = "name")
-    @JSONField(name = "SysName")
     var name: String? = null
 
     /** 系统本地编码 */
     @ApiModelProperty(value = "系统本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "SysLocalID")
     var localId: String? = null
 
     /** 系统本地名称 */
     @ApiModelProperty(value = "系统本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "SysLocalName")
     var localName: String? = null
 
     /** 设计图纸中编码 */
     @ApiModelProperty(value = "设计图纸中编码")
     @Column(name = "cad_id")
-    @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
     @ApiModelProperty(value = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 系统分类 */
     @ApiModelProperty(value = "系统分类",required = true)
-    @Column(name = "category")
-    @JSONField(name = "Category")
-    var category: String? = null
+    @Column(name = "class_code")
+    var classCode: String? = null
 
     /** 项目id */
     @ApiModelProperty(value = "项目id",required = true)
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @ApiModelProperty(value = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @ApiModelProperty(value = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
+    /** 二维码图片 */
+    @ApiModelProperty(value = "二维码图片")
+    @Column(name = "qr_code_pic")
+    var qRCodePic: String? = null
+
+    /** 二维码内容 */
+    @ApiModelProperty(value = "二维码内容")
+    @Column(name = "default_qr_code")
+    var defaultQRCode: String? = null
+
     /** 设定参数 */
     @ApiModelProperty(value = "设定参数")
     @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
     var settingParam: HashMap<String,Any?>? = null
 
     /** 技术参数 */
     @ApiModelProperty(value = "技术参数")
     @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
     var techParam: HashMap<String,Any?>? = null
 
     /** 运行参数 */
     @ApiModelProperty(value = "运行参数")
     @Column(name = "run_param")
-    @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? = null
 
     /** 自定义 */
     @ApiModelProperty(value = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 运行状态 */
     @ApiModelProperty(value = "运行状态")
     @Column(name = "running_state")
-    @JSONField(name = "RunningState")
     var runningState: HashMap<String, Any?>? = null
 
     /** 对象类型 */
     @ApiModelProperty(value = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "GeneralSystem"
 
     /** 专业名称 */
     @ApiModelProperty(value = "专业名称")
     @Column(name = "major_name",insertable = false,updatable = false)
-    @JSONField(name = "MajorName")
     var majorName: String? = null
 
     /** 设备数量 */
     @ApiModelProperty(value = "设备数量")
     @Column(name = "count",insertable = false,updatable = false)
-    @JSONField(name = "Count")
     var count: Long? = 0
 
     /** 设备数量 */
     @ApiModelProperty(value = "设备数量")
     @Column(name = "category_name",insertable = false,updatable = false)
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 反馈参数 */
     @ApiModelProperty(value = "反馈参数")
     @Column(name = "feedback_param")
-    @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
     /** 级联-系统分类名 */
     @ApiModelProperty(value = "级联-系统分类名")
     @SCascade(table="general_system", idColumn="id", childIdColumn="category")
-    @JSONField(name = "CategoryNames")
     var categoryNames: GeneralSystemCategory? = null
 
     /** 级联-设备或部件   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
     @ApiModelProperty(value = "级联-设备或部件")
     @SCascade(table="r_sy_eq", idColumn="sys_id", childIdColumn="equip_id")
-    @JSONField(name = "Equipment")
     var equipmentList: ArrayList<Equipment>? = null
 
     /** 级联-竖井*/
     @ApiModelProperty(value = "级联-竖井")
     @SCascade(table="r_sy_in_sh", idColumn="sys_id", childIdColumn="shaft_id")
-    @JSONField(name = "Shaft")
     var shaftList: ArrayList<Shaft>? = null
 
     /** 级联-业务空间*/
     @ApiModelProperty(value = "级联-业务空间")
     @SCascade(table="relationship.r_sy2sp", idColumn="sy_id", childIdColumn="sp_id",filter = "type = 'sy2sp'")
-    @JSONField(name = "ZoneSpaceBaseTable")
     var zoneSpaceBaseTableList: ArrayList<ZoneSpace>? = null
 
     /** 级联-楼层*/
     @ApiModelProperty(value = "级联-楼层")
     @SCascade(table="r_sy_in_fl", idColumn="sys_id", childIdColumn="floor_id")
-    @JSONField(name = "FloorList")
     var floorList: ArrayList<Floor>? = null
 
     /** 级联-建筑*/
     @ApiModelProperty(value = "级联-建筑")
     @SCascade(table="r_sy_in_bd", idColumn="sys_id", childIdColumn="building_id")
-    @JSONField(name = "BuildingList")
     var buildingList: ArrayList<Building>? = null
 
     /** 建筑楼层 */
     @ApiModelProperty(value = "建筑楼层")
-    @JSONField(name = "BuildingFloorInfoList")
     var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
 } // Class GeneralSystem

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

@@ -24,6 +24,7 @@ package com.persagy.server.datacenter.models.entities.objects
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.annotations.ApiModel
@@ -45,49 +46,41 @@ open class Property : BaseInfo(),Comparator<Property> {
     @ApiModelProperty(value = "资产id", required = true)
     @Id
     @Column(name = "id")
-    @JSONField(name = "EquipID")
     var id: String? = null
 
     /** 资产名称 */
     @ApiModelProperty(value = "资产名称", required = true)
     @Column(name = "name")
-    @JSONField(name = "EquipName")
     var name: String? = null
 
     /** 资产本地编码 */
     @ApiModelProperty(value = "资产本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "EquipLocalID")
     var localId: String? = null
 
     /** 资产本地名称 */
     @ApiModelProperty(value = "资产本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "EquipLocalName")
     var localName: String? = null
 
     /** 资产二维码照片 */
     @ApiModelProperty(value = "资产二维码照片")
     @Column(name = "qr_code")
-    @JSONField(name = "EquipQRCode")
     var qrCode: String? = null
 
     /** 设计图纸中编码 */
     @ApiModelProperty(value = "设计图纸中编码")
     @Column(name = "cad_id")
-    @JSONField(name = "CADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */
     @ApiModelProperty(value = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** BIM模型中坐标 */
     @ApiModelProperty(value = "BIM模型中坐标")
     @Column(name = "bim_location")
-    @JSONField(name = "BIMLocation")
     var bimLocation: String? = null
 
 
@@ -118,276 +111,230 @@ open class Property : BaseInfo(),Comparator<Property> {
     /** 项目id */
     @ApiModelProperty(value = "项目id", required = true)
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 资产类型code */
     @ApiModelProperty(value = "资产类型code")
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 资产所在建筑id */
     @ApiModelProperty(value = "资产所在建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 资产所在楼层id */
     @ApiModelProperty(value = "资产所在楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 资产关联设备id */
     @ApiModelProperty(value = "关联的设备或部件")
     @Column(name = "equip_id")
-    @JSONField(name = "EquipmentId")
     var equipId: String? = null
 
     /** 品牌型号id */
     @ApiModelProperty(value = "品牌型号id")
     @Column(name = "dp_manufacturer_id")
-    @JSONField(name = "DPManufacturerID")
     var dpManufacturerID: String? = null
 
     /** 供应商信息id */
     @ApiModelProperty(value = "供应商信息id")
     @Column(name = "dp_supplier_id")
-    @JSONField(name = "DPSupplierID")
     var dpSupplierID: String? = null
 
     /** 维修商信息id */
     @ApiModelProperty(value = "维修商信息id")
     @Column(name = "dp_maintainer_id")
-    @JSONField(name = "DPMaintainerID")
     var dpMaintainerID: String? = null
 
     /** 保险公司信息id */
     @ApiModelProperty(value = "保险公司信息id")
     @Column(name = "dp_insurer_id")
-    @JSONField(name = "DPInsurerID")
     var dpInsurerID: String? = null
 
     /** 设备型号id */
     @ApiModelProperty(value = "设备型号id")
     @Column(name = "dp_specification_id")
-    @JSONField(name = "DPSpecificationID")
     var dpSpecificationID: String? = null
 
     /** 品牌id */
     @ApiModelProperty(value = "品牌id")
     @Column(name = "dp_brand_id")
-    @JSONField(name = "DPBrandID")
     var dpBrandID: String? = null
 
     /** 设备序号 */
     @ApiModelProperty(value = "设备序号 ")
     @Column(name = "equip_serial")
-    @JSONField(name = "EquipSerial")
     var equipSerial: String? = null
 
     /** 任务状态 待验证1、已验证0、未找到-1  */
     @ApiModelProperty(value = "任务状态-待验证1、已验证0、未找到-1")
     @Column(name = "task_state")
-    @JSONField(name = "TaskState")
     var taskState: Int? = null
 
     /** 台账参数 */
     @ApiModelProperty(value = "台账参数")
     @Column(name = "ledger_param")
-    @JSONField(name = "LedgerParam")
     var ledgerParam: HashMap<String, Any?>? = null
 
     /** 通讯参数 */
     @ApiModelProperty(value = "通讯参数")
     @Column(name = "comm_param")
-    @JSONField(name = "CommParam")
     var commParam: HashMap<String, Any?>? = null
 
     /** 技术参数 */
     @ApiModelProperty(value = "技术参数")
     @Column(name = "tech_param")
-    @JSONField(name = "TechParam")
     var techParam: HashMap<String, Any?>? = null
 
     /** 运行参数 */
     @ApiModelProperty(value = "运行参数")
     @Column(name = "run_param")
-    @JSONField(name = "RunParam")
     var runParam: HashMap<String, Any?>? = null
 
     /** 设定参数 */
     @ApiModelProperty(value = "设定参数")
     @Column(name = "setting_param")
-    @JSONField(name = "SettingParam")
     var settingParam: HashMap<String, Any?>? = null
 
     /** 报警信息 */
     @ApiModelProperty(value = "报警信息")
     @Column(name = "alram")
-    @JSONField(name = "Alram")
     var alram: HashMap<String, Any?>? = null
 
     /** 自定义 */
     @ApiModelProperty(value = "自定义")
     @Column(name = "custom_param")
-    @JSONField(name = "CustomParam")
     var customParam: HashMap<String, Any?>? = null
 
     /** 设备部件标志位,1设备,2部件 */
     @ApiModelProperty(value = "1设备,2部件")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** 温度传感器 */
     @ApiModelProperty(value = "温度传感器")
     @Column(name = "temp_sensor")
-    @JSONField(name = "TempSensor")
     var tempSensor: HashMap<String,Any?>? = null
 
     /** 技术参数-通用 */
     @ApiModelProperty(value = "技术参数-通用")
     @Column(name = "tech_param_general")
-    @JSONField(name = "TechParamGeneral")
     var techParamGeneral: HashMap<String,Any?>? = null
 
     /** 运行参数-通用 */
     @ApiModelProperty(value = "运行参数-通用")
     @Column(name = "run_param_general")
-    @JSONField(name = "RunParamGeneral")
     var runParamGeneral: HashMap<String,Any?>? = null
 
     /** 速度传感器 */
     @ApiModelProperty(value = "速度传感器")
     @Column(name = "speed_sensor")
-    @JSONField(name = "SpeedSensor")
     var speedSensor: HashMap<String,Any?>? = null
 
     /** 声音传感器 */
     @ApiModelProperty(value = "声音传感器")
     @Column(name = "sound_sensor")
-    @JSONField(name = "SoundSensor")
     var soundSensor: HashMap<String,Any?>? = null
 
     /** 湿度传感器 */
     @ApiModelProperty(value = "湿度传感器")
     @Column(name = "humidity_sensor")
-    @JSONField(name = "HumiditySensor")
     var humiditySensor: HashMap<String,Any?>? = null
 
     /** 压力传感器 */
     @ApiModelProperty(value = "压力传感器")
     @Column(name = "press_transd")
-    @JSONField(name = "PressTransd")
     var pressTransd: HashMap<String,Any?>? = null
 
     /** 热量传感器 */
     @ApiModelProperty(value = "热量传感器")
     @Column(name = "heat_sensor")
-    @JSONField(name = "HeatSensor")
     var heatSensor: HashMap<String,Any?>? = null
 
     /** 流量传感器 */
     @ApiModelProperty(value = "流量传感器")
     @Column(name = "flow_sensor")
-    @JSONField(name = "FlowSensor")
     var flowSensor: HashMap<String,Any?>? = null
 
     /** 电度传感器 */
     @ApiModelProperty(value = "电度传感器")
     @Column(name = "electricity_sensor")
-    @JSONField(name = "ElectricitySensor")
     var electricitySensor: HashMap<String,Any?>? = null
 
     /** 位移传感器 */
     @ApiModelProperty(value = "位移传感器")
     @Column(name = "displ_sensor")
-    @JSONField(name = "DisplSensor")
     var displSensor: HashMap<String,Any?>? = null
 
     /** 浓度传感器 */
     @ApiModelProperty(value = "浓度传感器")
     @Column(name = "concent_sensor")
-    @JSONField(name = "ConcentSensor")
     var concentSensor: HashMap<String,Any?>? = null
 
     /** 图像传感器 */
     @ApiModelProperty(value = "图像传感器")
     @Column(name = "image_sensor")
-    @JSONField(name = "ImageSensor")
     var imageSensor: HashMap<String,Any?>? = null
 
     /** 对象类型 */
     @ApiModelProperty(value = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Property"
 
     /** 反馈参数 */
     @ApiModelProperty(value = "反馈参数")
     @Column(name = "feedback_param")
-    @JSONField(name = "FeedbackParam")
     var feedbackParam: HashMap<String,Any?>? = null
 
     /** 人流量传感器 */
     @ApiModelProperty(value = "人流量传感器")
     @Column(name = "man_flow_sensor")
-    @JSONField(name = "ManFlowSensor")
     var manFlowSensor: HashMap<String,Any?>? = null
 
     /** 位置信息 */
     @ApiModelProperty(value = "位置信息")
     @Column(name = "position")
-    @JSONField(name = "Position")
     var position: String? = null
 
     /** 贴码状态 */
     @ApiModelProperty(value = "贴码状态")
     @Column(name = "code_type")
-    @JSONField(name = "CodeType")
     var codeType: Int? = null
 
     /** 选择状态 */
     @ApiModelProperty(value = "选择状态")
     @Column(name = "checked")
-    @JSONField(name = "Checked")
     var checked: Boolean? = null
 
     /** 空间id */
     @ApiModelProperty(value = "空间id")
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 备注 */
     @ApiModelProperty(value = "备注")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: Boolean? = null
 
     /** 点位id */
     @ApiModelProperty(value = "点位id")
     @Column(name = "point_id")
-    @JSONField(name = "PointId")
     var pointId: String? = null
 
     /** 区分是哪里创建的资产 app  ,web */
     @ApiModelProperty(value = "区分是哪里创建的资产 app  ,web")
     @Column(name = "source")
-    @JSONField(name = "Source")
     var source: String? = null
 
     /** 模型文件id */
     @ApiModelProperty(value = "模型文件id")
     @Column(name = "model_id")
-    @JSONField(name = "ModelId")
     var modelId: String? = null
 
     @ApiModelProperty(value = "方案id")
 //    @Column(name = "scheme_id")
-    @JSONField(name = "SchemeId")
     var schemeId: String? = null
         get() {
             if (!family.isNullOrEmpty()){
@@ -399,25 +346,21 @@ open class Property : BaseInfo(),Comparator<Property> {
     /** 设备 */
     @ApiModelProperty(value = "级联-设备")
     @SCascade(table="property", idColumn="id", childIdColumn="equip_id")
-    @JSONField(name = "Equipment")
     var equipment: Equipment? = null
 
     /** 建筑   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
     @ApiModelProperty(value = "级联-建筑")
     @SCascade(table="property", idColumn="id", childIdColumn="building_id")
-    @JSONField(name = "Building")
     var building: Building? = null
 
     /** 级联-楼层   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
     @ApiModelProperty(value = "级联-楼层")
     @SCascade(table="property", idColumn="id", childIdColumn="floor_id")
-    @JSONField(name = "Floor")
     var floor: Floor? = null
 
     /** 级联-项目 */
     @ApiModelProperty(value = "级联-项目")
     @SCascade(table="property", idColumn="id", childIdColumn="project_id")
-    @JSONField(name = "Project")
     var project: Project? = null
 
 //    /** 级联-资产设备族 */
@@ -426,21 +369,19 @@ open class Property : BaseInfo(),Comparator<Property> {
 //    @JSONField(name = "EquipFamilyList")
 //    var equipFamilyList: ArrayList<EquipFamilyCategory>? = null
 
-//    /** 级联-资产设备族名称 */
-//    @ApiModelProperty(value = "级联-资产设备族名称")
-//    @SCascade(table="property", idColumn="id", childIdColumn="family")
-//    @JSONField(name = "FamilyName")
-//    var familyName: Family? = null
+    /** 级联-资产设备族名称 */
+    @ApiModelProperty(value = "级联-资产设备族名称")
+    @SCascade(table="property", idColumn="id", childIdColumn="family")
+    @JSONField(name = "FamilyName")
+    var familyName: Family? = null
 
     /** 级联-资产所在的空间的 */
     @ApiModelProperty(value = "级联-设备所在的空间的")
     @SCascade(table="r_pe_in_sp_base", idColumn="equip_id", childIdColumn="space_id")
-    @JSONField(name = "ZoneSpaceBaseIn")
     var zoneSpaceInBase: ArrayList<ZoneSpace>? = null
 
     /** 距离*/
     @ApiModelProperty(value = "距离")
-    @JSONField(name = "Distance")
     var distance: Double? = null
 
     override fun compare(o1: Property?, o2: Property?): Int {

+ 19 - 22
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.objects
 
-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
@@ -22,83 +21,81 @@ class Shaft : BaseInfo() {
     @ApiModelProperty(value = "竖井id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "ShaftID")
     var id: String? = null
 
     /** 竖井名称 */
     @ApiModelProperty(value = "竖井名称")
     @Column(name = "name")
-    @JSONField(name = "ShaftName")
     var name: String? = null
 
     /** 竖井本地编码 */
     @ApiModelProperty(value = "竖井本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "ShaftLocalID")
     var localId: String? = null
 
     /** 竖井本地名称 */
     @ApiModelProperty(value = "竖井本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "ShaftLocalName")
     var localName: String? = null
 
     /** BIM模型中编码 */
     @ApiModelProperty(value = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
+    /** 设计图纸中编码 */
+    @ApiModelProperty(value = "设计图纸中编码")
+    @Column(name = "cad_id")
+    var cadId: String? = null
+
+    /** 二维码图片 */
+    @ApiModelProperty(value = "二维码图片")
+    @Column(name = "qr_code_pic")
+    var qRCodePic: String? = null
+
+    /** 二维码内容 */
+    @ApiModelProperty(value = "二维码内容")
+    @Column(name = "default_qr_code")
+    var defaultQRCode: String? = null
+
     /** 项目id */
     @ApiModelProperty(value = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 结构信息 */
     @ApiModelProperty(value = "结构信息")
     @Column(name = "structure_info")
-    @JSONField(name = "StructureInfo")
     var structureInfo: HashMap<String, Any?>? = null
 
-//    /** 建筑id集合 */
-//    @ApiModelProperty(value = "建筑id集合")
-//    @JSONField(name = "BuildingList")
-//    var buildingList:List<String>? = null
-//
-//    /** 楼层id集合 */
-//    @ApiModelProperty(value = "楼层id集合")
-//    @JSONField(name = "FloorList")
-//    var floorList:List<String>? = null
+    /** 设定参数 */
+    @ApiModelProperty(value = "设定参数")
+    @Column(name = "setting_param")
+    var settingParam: HashMap<String, Any?>? = null
 
     /** 对象类型 */
     @ApiModelProperty(value = "对象类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     override var objectType: String? = "Shaft"
 
     /** 级联-竖井内的设备 */
     @ApiModelProperty(value = "级联-竖井内的设备")
     @SCascade(table="r_eq_in_sh", idColumn="shaft_id", childIdColumn="equip_id")
-    @JSONField(name = "EquipmentList")
     var equipmentList: ArrayList<Equipment>? = null
 
     /** 级联-竖井内的系统 */
     @ApiModelProperty(value = "级联-竖井内的系统")
     @SCascade(table="r_sy_in_sh", idColumn="shaft_id", childIdColumn="sys_id")
-    @JSONField(name = "SystemList")
     var systemList: ArrayList<GeneralSystem>? = null
 
     /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
     @ApiModelProperty(value = "级联-贯通关系")
     @SCascade(table="r_sh_through_sh", idColumn="shaft_id", childIdColumn="shaft_other_id", self = true)
-    @JSONField(name = "ShaftThroughList")
     var shaftThroughList: ArrayList<Shaft>? = null
 
     /** 竖井内的业务空间  self = true  同样的对象查询时 id可以互相调换查询   */
     @ApiModelProperty(value = "级联-竖井内的业务空间")
     @SCascade(table="relationship.r_sh2sp", idColumn="sh_id", childIdColumn="sp_id", self = false,filter = "type = 'sh2sp'")
-    @JSONField(name = "SpaceList")
     var spaceList: ArrayList<ZoneSpace>? = null
 
 

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

@@ -46,50 +46,42 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     @ApiModelProperty(value = "空间ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "RoomID")
     var id: String? = null
 
     /** 空间名称 */
     @ApiModelProperty(value = "空间名称")
     @Column(name = "name")
-    @JSONField(name = "RoomName")
     var name: String? = null
 
     /** 空间本地编码 */
     @ApiModelProperty(value = "空间本地编码")
     @Column(name = "local_id")
-    @JSONField(name = "RoomLocalID")
     var localId: String? = null
 
     /** 空间本地名称 */
     @ApiModelProperty(value = "空间本地名称")
     @Column(name = "local_name")
-    @JSONField(name = "RoomLocalName")
     var localName: String? = null
 
     /** 项目id */
     @ApiModelProperty(value = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 建筑id */
     @ApiModelProperty(value = "建筑id")
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 楼层id */
     @ApiModelProperty(value = "楼层id")
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 空间二维码图片 */
     @ApiModelProperty(value = "空间二维码图片")
-    @Column(name = "qr_code")
-    @JSONField(name = "RoomQRCode")
-    var qrCode: String? = null
+    @Column(name = "qr_code_pic")
+    var qRCodePic: String? = null
 
     /** 平台二维码 */
     @ApiModelProperty(value = "平台二维码")
@@ -100,242 +92,218 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     /** BIM模型中编码 */
     @ApiModelProperty(value = "BIM模型中编码")
     @Column(name = "bim_id")
-    @JSONField(name = "BIMID")
     var bimId: String? = null
 
     /** 轮廓线 */
     @ApiModelProperty(value = "轮廓线")
     @Column(name = "outline")
-    @JSONField(name = "Outline")
     var outline: ArrayList<ArrayList<ArrayList<PointPosition>>>? = null
 
     /** 轮廓线2 */
     @ApiModelProperty(value = "轮廓线2")
     @Column(name = "outline2")
-    @JSONField(name = "Outline2")
     var outline2: ArrayList<ArrayList<ArrayList<PointPosition>>>? = null
 
     /** 图片  */
     @ApiModelProperty(value = "图片 ")
     @Column(name = "pic")
-    @JSONField(name = "Pic")
     var pic: ArrayList<TaskPic>? =null
 
+    /** 空间常驻人数  */
+    @ApiModelProperty(value = "空间常驻人数 ")
+    @Column(name = "permanent_people_num")
+    var permanentPeopleNum: Int? =null
+
+
     /** 空间是否受影响  */
     @ApiModelProperty(value = "空间是否受影响 1受影响 0不受影响 ")
     @Column(name = "state")
-    @JSONField(name = "State")
     var state: Int? =null
 
     /** BIM模型中坐标 */
     @ApiModelProperty(value = "BIM模型中坐标")
     @Column(name = "bim_location")
-    @JSONField(name = "BIMLocation")
     var bimLocation: String? = null
 
     /** 进深 */
     @ApiModelProperty(value = "进深")
     @Column(name = "depth")
-    @JSONField(name = "Depth")
     var depth: Double? = null
 
     /** 面宽 */
     @ApiModelProperty(value = "面宽")
     @Column(name = "width")
-    @JSONField(name = "Width")
     var width: Double? = null
 
     /** 建筑面积 */
     @ApiModelProperty(value = "建筑面积")
     @Column(name = "build_area")
-    @JSONField(name = "BuildArea")
     var buildArea: Double? = null
 
     /** 使用面积 */
     @ApiModelProperty(value = "使用面积")
     @Column(name = "net_area")
-    @JSONField(name = "NetArea")
     var netArea: Double? =null
 
     /** 高度 */
     @ApiModelProperty(value = "高度")
     @Column(name = "height")
-    @JSONField(name = "Height")
     var height: Double? = null
 
     /** 备注文字 */
     @ApiModelProperty(value = "备注文字")
     @Column(name = "intro")
-    @JSONField(name = "Intro")
     var intro: String? =null
 
     /** 设计供冷功率*/
     @ApiModelProperty(value = "设计供冷功率 ")
     @Column(name = "rated_coolingp")
-    @JSONField(name = "RatedCoolingP")
     var ratedCoolingP: Double? =null
 
     /** 设计供热功率 */
     @ApiModelProperty(value = "设计供热功率 ")
     @Column(name = "rated_heatingp")
-    @JSONField(name = "RatedHeatingP")
     var ratedHeatingP: Double? =null
 
-    /** 设计供热功率 */
-    @ApiModelProperty(value = "设计供热功率 ")
+    /** 空调形式 */
+    @ApiModelProperty(value = "空调形式 ")
     @Column(name = "ac_type")
-    @JSONField(name = "ACType")
     var acType: String? =null
 
     /** 空间朝向 */
     @ApiModelProperty(value = "空间朝向")
     @Column(name = "zone_orientation")
-    @JSONField(name = "ZoneOrientation")
     var zoneOrientation: String? = null
 
     /** 空间功能区类型 */
     @ApiModelProperty(value = "空间功能区类型")
     @Column(name = "func_type")
-    @JSONField(name = "RoomFuncType")
-    var funcType: String? = null
+    var roomFuncType: String? = null
 
     /** 运行参数  */
     @ApiModelProperty(value = "运行参数 ")
-    @Column(name = "run_param")
     @JSONField(name = "RunParam")
     var runParam: HashMap<String,Any?>? =null
 
     /** 自定义 */
     @ApiModelProperty(value = "自定义")
-    @Column(name = "custom_param")
     @JSONField(name = "CustomParam")
     var customParam: java.util.HashMap<String, Any?>? = null
 
-    /** 图片  */
-//    @ApiModelProperty(value = "图片 ")
-//    @Column(name = "pic")
-//    @JSONField(name = "Pic")
-//    var pic: ArrayList<AttPic>? =null
-
     /** 空间序号  */
     @ApiModelProperty(value = "空间序号 ")
     @Column(name = "room_serial")
-    @JSONField(name = "RoomSerial")
     var roomSerial: Double? =null
 
     /** 项目空间功能区类型  */
     @ApiModelProperty(value = "项目空间功能区类型 ")
     @Column(name = "proj_room_func_type")
-    @JSONField(name = "ProjRoomFuncType")
     var projRoomFuncType: String? =null
 
     /** 设计照明功率 */
     @ApiModelProperty(value = "设计照明功率")
     @Column(name = "rated_lightp")
-    @JSONField(name = "RatedLightP")
     var ratedLightP: String? = null
 
     /** 内外区类型 */
     @ApiModelProperty(value = "内外区类型")
     @Column(name = "zone_type")
-    @JSONField(name = "ZoneType")
     var zoneType: String? = null
 
     /** 租赁业态类型 */
     @ApiModelProperty(value = "租赁业态类型")
     @Column(name = "tenant_type")
-    @JSONField(name = "TenantType")
     var tenantType: String? = null
 
     /** 所属租户 */
     @ApiModelProperty(value = "所属租户")
     @Column(name = "tenant")
-    @JSONField(name = "Tenant")
     var tenant: String? = null
 
     /** 动态信息 */
     @ApiModelProperty(value = "动态信息")
     @Column(name = "dynamic_infor")
-    @JSONField(name = "DynamicInfor")
-    var dynamicInfor: java.util.HashMap<String, Any?>? = null
+    var dynamicInfor: HashMap<String, Any?>? = null
 
     /** 配电容量 */
     @ApiModelProperty(value = "配电容量")
     @Column(name = "elec_cap")
-    @JSONField(name = "ElecCap")
     var elecCap: Double? =null
 
     /** 污染等级 */
     @ApiModelProperty(value = "污染等级")
     @Column(name = "pollution_degree")
-    @JSONField(name = "PollutionDegree")
     var pollutionDegree: String? =null
 
     /** 租户信息 */
     @ApiModelProperty(value = "租户信息")
     @Column(name = "tenant_info")
-    @JSONField(name = "TenantInfo")
     var tenantInfo: HashMap<String,Any?>? =null
 
     /** 环境参数 */
     @ApiModelProperty(value = "环境参数")
     @Column(name = "env_param")
-    @JSONField(name = "EnvParam")
     var envParam: HashMap<String,Any?>? =null
 
     /** 人员信息 */
     @ApiModelProperty(value = "人员信息")
     @Column(name = "people_info")
-    @JSONField(name = "PeopleInfo")
     var peopleInfo: HashMap<String,Any?>? =null
 
     /** 能耗信息 */
     @ApiModelProperty(value = "能耗信息")
     @Column(name = "consumption_info")
-    @JSONField(name = "ConsumptionInfo")
     var consumptionInfo: HashMap<String,Any?>? =null
 
+    /** 工作历信息 */
+    @ApiModelProperty(value = "工作历信息")
+    @Column(name = "work_calendar")
+    var workCalendar: HashMap<String,Any?>? =null
+
+    /** 反馈参数 */
+    @ApiModelProperty(value = "反馈参数")
+    @Column(name = "feedback_param")
+    var feedbackParam: HashMap<String,Any?>? =null
+
+    /** 静态参数 */
+    @ApiModelProperty(value = "静态参数")
+    @Column(name = "static_param")
+    var staticParam: HashMap<String,Any?>? =null
+
     /** 对象类型 */
     @ApiModelProperty(value = "对象类型")
-    @Column(name = "object_type")
-    @JSONField(name ="ObjectType")
-     var objectType: String? = null
+    @Column(name = "class_code")
+     var classCode: String? = null
 
     /** 级联-设备 */
     @ApiModelProperty(value = "级联-设备")
     @SCascade(table="relationship.r_eq2sp", idColumn="sp_id", childIdColumn="eq_id",filter = "type = 'eq2sp_in'")
-    @JSONField(name = "Equipment")
     var equipment: ArrayList<Equipment>? = null
 
     /** 级联-元空间 */
     @ApiModelProperty(value = "级联-元空间")
     @SCascade(table="relationship.r_sp2si", idColumn="sp_id", childIdColumn="si_id")
-    @JSONField(name = "ZoneIspace")
     var zoneIspace: ArrayList<ZoneIspace>? = null
 
     /** 级联-系统 */
     @ApiModelProperty(value = "级联-系统")
     @SCascade(table="relationship.r_sy2sp", idColumn="sp_id", childIdColumn="sy_id",filter = "type = 'sy2sp'")
-    @JSONField(name = "GeneralSystem")
     var generalSystem: ArrayList<GeneralSystem>? = null
 
     /** 级联-服务于空间的设备 */
     @ApiModelProperty(value = "级联-服务于空间的设备")
     @SCascade(table="relationship.r_eq2sp", idColumn="sp_id", childIdColumn="eq_id",filter = "type = 'eq2sp_for'")
-    @JSONField(name = "EquipmentFor")
     var equipmentFor: ArrayList<Equipment>? = null
 
     /** 级联-建筑 */
     @ApiModelProperty(value = "级联-建筑")
     @SCascade(table="zone_space_base", idColumn="id", childIdColumn="building_id")
-    @JSONField(name = "Building")
     var building: Building? = null
 
 
     /** 级联-楼层  */
     @ApiModelProperty(value = "级联-楼层")
     @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
-    @JSONField(name = "Floor")
     var floor: Floor? = null
 
 //    /** 级联-空间类型  */
@@ -347,13 +315,11 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     /** 级联-建筑 */
     @ApiModelProperty(value = "级联-建筑")
     @SCascade(table="r_sp_in_bd", idColumn="space_id", childIdColumn="building_id")
-    @JSONField(name = "BuildingList")
     var buildingList: ArrayList<Building>? = null
 
     /** 级联-楼层  */
     @ApiModelProperty(value = "级联-楼层")
     @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
-    @JSONField(name = "FloorList")
     var floorlList: ArrayList<Floor>? = null
 
 } // Class ZoneAirConditioning

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

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
@@ -21,32 +20,27 @@ class RSpinBd : SBaseEntity() {
     @ApiModelProperty(value = "建筑id")
     @Id
     @Column(name = "building_id")
-    @JSONField(name = "BuildingId")
     var buildingId: String? = null
 
     /** 空间id */
     @ApiModelProperty(value = "空间id")
     @Id
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 空间类型 */
     @ApiModelProperty(value = "空间类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     var objectType: String? = null
 
     /** 项目id */
     @ApiModelProperty(value = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 标记 1为手动  2为自动 */
     @ApiModelProperty(value = "标记 1为手动  2为自动")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = 1
 
 } // Class RSpinBd

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

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
@@ -21,37 +20,31 @@ class RSpinFl : SBaseEntity() {
     @ApiModelProperty(value = "楼层id")
     @Id
     @Column(name = "floor_id")
-    @JSONField(name = "FloorId")
     var floorId: String? = null
 
     /** 空间id */
     @ApiModelProperty(value = "空间id")
     @Id
     @Column(name = "space_id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 空间类型 */
     @ApiModelProperty(value = "空间类型")
     @Column(name = "object_type")
-    @JSONField(name = "ObjectType")
     var objectType: String? = null
 
     /** 项目id */
     @ApiModelProperty(value = "项目id")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 标记 1为手动  2为自动 */
     @ApiModelProperty(value = "标记 1为手动  2为自动")
     @Column(name = "sign")
-    @JSONField(name = "Sign")
     var sign: Int? = 1
 
     /** 建筑id */
     @ApiModelProperty(value = "建筑id")
-    @JSONField(name = "BuildingId")
     @Column(name = "building_id")
     var buildingId: String? = null
 

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/SpaceSQueryResponse.kt

@@ -1,10 +1,10 @@
 package com.persagy.server.datacenter.models.response
 
-import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
+import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.ApiModelProperty
 
-class SpaceSQueryResponse: SQueryResponse<ZoneSpace>() {
+class SpaceSQueryResponse: SQueryResponse<ZoneIspace>() {
 
     /** 楼层id */
     @ApiModelProperty(value = "楼层id")

data-center/build.gradle → datacenter/build.gradle


data-center/src/main/kotlin/com/persagy/server/DataCenterApp.kt → datacenter/src/main/kotlin/com/persagy/server/DataCenterApp.kt


data-center/src/main/kotlin/com/persagy/server/Swagger2Config.kt → datacenter/src/main/kotlin/com/persagy/server/Swagger2Config.kt


data-center/src/main/kotlin/com/persagy/server/WebMvcConfg.kt → datacenter/src/main/kotlin/com/persagy/server/WebMvcConfg.kt


data-center/src/main/kotlin/com/persagy/server/controllers/dict/DictControllers.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/dict/DictControllers.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt


+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt

@@ -20,10 +20,10 @@
 
 package com.persagy.server.controllers.objects
 
-import com.persagy.server.datacenter.models.entities.objects.Equipment
-import com.persagy.server.services.objects.EquipmentService
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
+import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.services.objects.EquipmentService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest

data-center/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/ISpaceController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ISpaceController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForFlController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForFlController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForShController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForShController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForSpConreoller.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqForSpConreoller.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInShController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqInShController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt


+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RFlThroughFlController.kt

@@ -1,10 +1,10 @@
 package com.persagy.server.controllers.rel
 
+import com.persagy.base.extensions.toJson
 import com.persagy.server.datacenter.models.entities.rel.RFlThroughFl
 import com.persagy.server.datacenter.models.entities.rel.RFloorOtherThroughFloorList
 import com.persagy.server.datacenter.models.entities.rel.RFloorThroughFloorOtherList
 import com.persagy.server.services.rel.RFlThroughFlService
-import com.persagy.base.extensions.toJson
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
 import io.swagger.annotations.Api

data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShaftThroughShaftController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RShaftThroughShaftController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpatialConnectionConreoller.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSpatialConnectionConreoller.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForShController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForShController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/rel/RUpDateEquipAndSapceController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/rel/RUpDateEquipAndSapceController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt


data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt → datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt


data-center/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/ICalcSpaceMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/ICalcSpaceMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/ICalcSpecialMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/ICalcSpecialMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/IRelationCalcMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCalcMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/IRelationCountMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/IRelationCountProvider.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationCountProvider.kt


data-center/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/MepSystemMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/MepSystemMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/RelationProvider.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/RelationProvider.kt


data-center/src/main/kotlin/com/persagy/server/mappers/RelationalProcessingMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/RelationalProcessingMapper.kt


data-center/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt → datacenter/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftBuildingService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/ShaftBuildingService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftFloorService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/ShaftFloorService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt


data-center/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt → datacenter/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt


data-center/src/main/kotlin/com/persagy/server/services/base/RService.kt → datacenter/src/main/kotlin/com/persagy/server/services/base/RService.kt


data-center/src/main/kotlin/com/persagy/server/services/base/Service.kt → datacenter/src/main/kotlin/com/persagy/server/services/base/Service.kt


data-center/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt → datacenter/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DClassDefService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DClassDefService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictAirConditionerService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictAirConditionerService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingDirectService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingDirectService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingFunctionalService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingFunctionalService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingStructureTypeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictBuildingStructureTypeService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictClimateService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictClimateService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictDevelopService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictDevelopService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictFloorTypeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictFloorTypeService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictGreenBuildLevService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictGreenBuildLevService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictHeatingTypeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictHeatingTypeService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictInsulateTypeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictInsulateTypeService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictProvincialCityCodeService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictProvincialCityCodeService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceFunctionalTypesService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictSpaceFunctionalTypesService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DictWindService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DictWindService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/DitcWeatherService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/DitcWeatherService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/EquipFamilyService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/EquipFamilyService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt


data-center/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt → datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt


data-center/src/main/kotlin/com/persagy/server/services/graphtype/BaseDataService.kt → datacenter/src/main/kotlin/com/persagy/server/services/graphtype/BaseDataService.kt


data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt → datacenter/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt


+ 0 - 0
data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockSourceService.kt


部分文件因为文件数量过多而无法显示