Bladeren bron

**************************************万达adm**********************************************
首次提交

zhangweixin 4 jaren geleden
bovenliggende
commit
edf6e6f22d
100 gewijzigde bestanden met toevoegingen van 48 en 16 verwijderingen
  1. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/a.java
  2. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/mappers/SchemeMapper.kt
  3. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/AttPic.kt
  4. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/BIMLocation.kt
  5. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/BuildingFloorInfo.kt
  6. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/DictSpaceProject.kt
  7. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/EquipmentProSy.kt
  8. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/GeneralSystemCategory.kt
  9. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ModelKey.kt
  10. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ObjInfos.kt
  11. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/PointD.kt
  12. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/PointImage.kt
  13. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/PointPosition.kt
  14. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ShaftFuncType.kt
  15. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ShaftWithCount.kt
  16. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/TaskPic.kt
  17. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ViewEquipSystem.kt
  18. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/base/BaseInfo.kt
  19. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/base/RBaseInfo.kt
  20. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DataCenterPropertyDefScheme.kt
  21. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictBatchProcessing.kt
  22. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictBuildingStructureType.kt
  23. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictDustproof.kt
  24. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictFloorType.kt
  25. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictSQueryRequest.kt
  26. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictSpaceFunctionalTypes.kt
  27. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictWind.kt
  28. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/EquipCategory.kt
  29. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/EquipFamily.kt
  30. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/EquipFamilyCategory.kt
  31. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/Family.kt
  32. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/GeneralSystemCategory.kt
  33. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/SpaceInfoDic.kt
  34. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictdatacenter/DictCustomScheme.kt
  35. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictdatacenter/DictProjectCustomDatacenterNew.kt
  36. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictdatacenter/DictSchemeProject.kt
  37. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefClass.kt
  38. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DefFuncId.kt
  39. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DefFuncIdProject.kt
  40. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DefFuncIdScheme.kt
  41. 4 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictMajor.kt
  42. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DictProject.kt
  43. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DictScheme.kt
  44. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DictSchemeAndProject.kt
  45. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DictSchemeCategoty.kt
  46. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/DictSchemeCategotyInfo.kt
  47. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dictnew/Group.kt
  48. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/GraphicType.kt
  49. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/MDoor.kt
  50. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/MLocation.kt
  51. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/MPoint.kt
  52. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/MVirtualWall.kt
  53. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/MWindow.kt
  54. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/RelationType.kt
  55. 6 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/RelationTypeProject.kt
  56. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlock.kt
  57. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlockFamilyItem.kt
  58. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlockItem.kt
  59. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlockResponse.kt
  60. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlockSource.kt
  61. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/ConnectedBlockSourceRequest.kt
  62. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/EquipIdUUIDMap.kt
  63. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/MepSourceTypeEntity.kt
  64. 5 7
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/block/RelationAddRequest.kt
  65. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/EquipmentBase.kt
  66. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelBuilding.kt
  67. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelEquipmentBuilding.kt
  68. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelEquipmentFloor.kt
  69. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelEquipmentShaft.kt
  70. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelFloor.kt
  71. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelGeneralSystem.kt
  72. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelGeneralSystemBuilding.kt
  73. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelGeneralSystemFloor.kt
  74. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelGeneralSystemShaft.kt
  75. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelProperty.kt
  76. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelPropertyShaft.kt
  77. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/RelShaft.kt
  78. 2 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpace.kt
  79. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirConvection.kt
  80. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirMixing.kt
  81. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceAirUnidirectional.kt
  82. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt
  83. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoors.kt
  84. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceDoorsWind.kt
  85. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightConnection.kt
  86. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceLightTrans.kt
  87. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceNotDoorsWind.kt
  88. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceOrdinary.kt
  89. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceWind.kt
  90. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireClose.kt
  91. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpacefireOpen.kt
  92. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/SpaceBaseZone.kt
  93. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt
  94. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt
  95. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt
  96. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpOther.kt
  97. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt
  98. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Eq.kt
  99. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt
  100. 0 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentVv2Eq.kt

data-core/src/main/kotlin/com/persagy/server/datacenter/dao/a.java → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/a.java


data-core/src/main/kotlin/com/persagy/server/datacenter/dao/mappers/SchemeMapper.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/dao/mappers/SchemeMapper.kt


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


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


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


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


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/EquipmentProSy.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/EquipmentProSy.kt


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


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ModelKey.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/ModelKey.kt


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


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointD.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/assistant/PointD.kt


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


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


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


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


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


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


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


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


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


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


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


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


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


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictSQueryRequest.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/dict/DictSQueryRequest.kt


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


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


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


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


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


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


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


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


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


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


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


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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.dictnew
+package com.persagy.server.datacenter.datacenter.models.entities.dictnew
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

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


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


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


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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.dictnew
+package com.persagy.server.datacenter.datacenter.models.entities.dictnew
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
@@ -83,4 +83,7 @@ class DictMajor: Serializable {
     @Column(name = "group_code")
     var groupCode: String? = null
 
+    @Schema(description = "子列表")
+    var children:ArrayList<DefClass>? = null
+
 } // class DictMajor

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


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


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


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


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


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


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


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


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


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


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


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


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


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

@@ -174,6 +174,12 @@ open class RelationTypeProject : RBaseInfo() {
     @Column(name = "from_object")
     var fromObject: String? = null
 
+    /** 图类型 */
+    @Schema(description = "图类型")
+    @Column(name = "graphic_type")
+    var graphicType: String? = null
+
+
     /** 机电系统类型 */
     @Schema(description = "机电系统类型")
     @Column(name = "mep_system_type")

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


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


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


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


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


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


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


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


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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.graphtype.block
+package com.persagy.server.datacenter.datacenter.models.entities.graphtype.block
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
@@ -49,10 +49,8 @@ class RelationAddRequest : Serializable {
     @Schema(description = "从对象内容")
     var fromContent: ArrayList<String>? = null
 
-//    /** 图类型编码 */
-//    @Schema(description = "图类型编码")
-//    @Column(name = "graphic_type")
-//    var graphicType: String? = null
+    /** 图类型编码 */
+    @Schema(description = "图类型编码")
+    var graphicType: String? = null
 
-
-} // Class RelationAddRequest
+}

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


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


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


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


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


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


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

@@ -26,6 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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


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


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


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

@@ -26,6 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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


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


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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.graphtype.rel
+package com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel
 
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table
@@ -36,7 +36,4 @@ import javax.persistence.Table
  */
 @Schema(description = "空间实体类")
 @Table(name = "zone_space_base")
-open class RelZoneSpace: SpaceBaseZone() {
-
-
-}
+open class RelZoneSpace: SpaceBaseZone()

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -27,6 +27,8 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
 import com.alibaba.fastjson.annotation.JSONField
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel
 
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.SpaceBaseZone
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

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

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.graphtype.rel
+package com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel
 
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import io.swagger.v3.oas.annotations.media.Schema

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationOne.kt


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentEq2SpControlEquipNetwork.kt


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

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.entities.graphtype.rel.control
 
 import com.persagy.server.datacenter.models.entities.graphtype.rel.EquipmentBase
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
+import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSensorNetworkOne.kt


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


data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt → data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/control/RelEquipmentSs2Sy.kt


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


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