Selaa lähdekoodia

********************WX************************
整合数据中心 数据同步 蜡笔森林 扫楼项目

zhangweixin 4 vuotta sitten
vanhempi
commit
304655f1cb
100 muutettua tiedostoa jossa 3509 lisäystä ja 451 poistoa
  1. 1 1
      build.gradle
  2. 17 8
      data-center/build.gradle
  3. 1 1
      data-center/src/main/kotlin/com/persagy/server/DataCenterApp.kt
  4. 1 1
      data-center/src/main/kotlin/com/persagy/server/Swagger2Config.kt
  5. 1 1
      data-center/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  6. 0 5
      data-center/src/main/kotlin/com/persagy/server/controllers/a.java
  7. 14 14
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt
  8. 12 12
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt
  9. 12 12
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt
  10. 10 10
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  11. 12 12
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt
  12. 7 7
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ISpaceController.kt
  13. 12 12
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt
  14. 5 5
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt
  15. 11 11
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt
  16. 13 13
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt
  17. 11 11
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt
  18. 10 10
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt
  19. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt
  20. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForFlController.kt
  21. 84 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForShController.kt
  22. 71 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForSpConreoller.kt
  23. 97 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInShController.kt
  24. 71 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt
  25. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RFlThroughFlController.kt
  26. 145 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt
  27. 95 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShaftThroughShaftController.kt
  28. 53 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt
  29. 98 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt
  30. 66 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpatialConnectionConreoller.kt
  31. 109 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt
  32. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt
  33. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt
  34. 83 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForShController.kt
  35. 84 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt
  36. 97 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt
  37. 97 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt
  38. 112 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt
  39. 98 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt
  40. 84 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt
  41. 33 0
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RUpDateEquipAndSapceController.kt
  42. 76 0
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt
  43. 75 0
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt
  44. 59 0
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt
  45. 294 0
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt
  46. 0 4
      data-center/src/main/kotlin/com/persagy/server/services/a.java
  47. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt
  48. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt
  49. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt
  50. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftBuildingService.kt
  51. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftFloorService.kt
  52. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt
  53. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt
  54. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/base/RService.kt
  55. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/base/Service.kt
  56. 9 9
      data-center/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt
  57. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/dict/DClassDefService.kt
  58. 9 9
      data-center/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt
  59. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictAirConditionerService.kt
  60. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingDirectService.kt
  61. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingFunctionalService.kt
  62. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingStructureTypeService.kt
  63. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictClimateService.kt
  64. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictDevelopService.kt
  65. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictFloorTypeService.kt
  66. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictGreenBuildLevService.kt
  67. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictHeatingTypeService.kt
  68. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictInsulateTypeService.kt
  69. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictProvincialCityCodeService.kt
  70. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceFunctionalTypesService.kt
  71. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt
  72. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictWindService.kt
  73. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/dict/DitcWeatherService.kt
  74. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/dict/EquipFamilyService.kt
  75. 11 11
      data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt
  76. 12 12
      data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt
  77. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/BaseDataService.kt
  78. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt
  79. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockSourceService.kt
  80. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt
  81. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeService.kt
  82. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt
  83. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/objects/BuildingService.kt
  84. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt
  85. 11 11
      data-center/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt
  86. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt
  87. 12 13
      data-center/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt
  88. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt
  89. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/objects/ProjectService.kt
  90. 7 8
      data-center/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt
  91. 12 12
      data-center/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt
  92. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/objects/SpaceService.kt
  93. 7 9
      data-center/src/main/kotlin/com/persagy/server/services/objects/TenantService.kt
  94. 13 13
      data-center/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt
  95. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/rel/REq2SpService.kt
  96. 35 32
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt
  97. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForFlService.kt
  98. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForShService.kt
  99. 563 0
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt
  100. 0 0
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqInShService.kt

+ 1 - 1
build.gradle

@@ -19,7 +19,7 @@
  */
 
 
-group 'cn.sagacloud.server'
+group 'com.persagy.server'
 version '2.0.0'
 
 buildscript {

+ 17 - 8
data-center/build.gradle

@@ -78,21 +78,30 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
+//    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
+//    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
+//    compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
+//    compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
+//    compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
+//    compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
+
+
+    compile group: "com.persagy", name: "persagy-kotlin-base", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-database", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-mybatis", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-postgresql", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION
+    compile group: "com.persagy", name: "persagy-service-mybatis", version: PERSAGY_SERVICE_VERSION
+
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Excel操作
     // https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml
     compile group: 'org.apache.poi', name: 'poi-ooxml', version: POI_VERSION
     // kafka
-//    compile group: 'com.sybotan',   name: 'sybotan-service-kafka',       version: SYBOTAN_SERVICE_VERSION
+//    compile group: 'com.persagy',   name: 'sybotan-service-kafka',       version: SYBOTAN_SERVICE_VERSION
     //文档
-    compile group: 'cn.sagacloud',   name: 'saga-service-postgresql', version: SAGA_SERVICE_VERSION
+    compile group: 'com.persagy',   name: 'persagy-service-postgresql', version: PERSAGY_SERVICE_VERSION
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/DataCenterApp.kt

@@ -20,7 +20,7 @@
 
 package com.persagy.server
 
-import com.sybotan.service.json.SJsonHttpMessageConverter
+import com.persagy.service.json.SJsonHttpMessageConverter
 import org.mybatis.spring.annotation.MapperScan
 import org.slf4j.LoggerFactory
 import org.springframework.boot.SpringApplication

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/Swagger2Config.kt

@@ -193,7 +193,7 @@ open class Swagger2Config {
                 .apiInfo(apiInfos("关系-API", "关系操作", version))
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.persagy.server"))
-                .paths(PathSelectors.ant("/relation/**"))
+                .paths(PathSelectors.ant("/rel/**"))
                 .build()
                 .groupName("3. 关系-API")
                 .pathMapping("/")

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/WebMvcConfg.kt

@@ -20,7 +20,7 @@
 
 package com.persagy.server
 
-import com.sybotan.service.interceptors.SPageInterceptor
+import com.persagy.service.interceptors.SPageInterceptor
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter

+ 0 - 5
data-center/src/main/kotlin/com/persagy/server/controllers/a.java

@@ -1,5 +0,0 @@
-package com.persagy.server.controllers;
-
-public class a {
-
-}

+ 14 - 14
data-center/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt

@@ -23,19 +23,19 @@ package com.persagy.server.controllers.objects
 import com.persagy.server.datacenter.models.entities.dictdatacenter.DictDatacenterProjectcustom
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.services.objects.BuildingService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -51,7 +51,7 @@ import javax.script.ScriptEngineManager
  *
  * @author 张维新
  */
-@Api(tags = ["AB、建筑"],position = 2)
+@Api(tags = ["002、建筑"],position = 2)
 @RestController
 @RequestMapping("/object/building")
 open class BuildingController {

+ 12 - 12
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt

@@ -22,17 +22,17 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.services.objects.ComponentService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags = ["AE、部件"])
+@Api(tags = ["005、部件"])
 @RestController
 @RequestMapping("/object/component")
 open class ComponentController {

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

@@ -22,17 +22,17 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.services.objects.EquipmentService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.*
  *
  * @author 张维新
  */
-@Api(tags = ["AD、设备"])
+@Api(tags = ["004、设备"])
 @RestController
 @RequestMapping("/object/equip")
 open class EquipController {

+ 10 - 10
data-center/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt

@@ -22,15 +22,15 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.services.objects.FloorService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags = ["AC、楼层"])
+@Api(tags = ["003、楼层"])
 @RestController
 @RequestMapping("/object/floor")
 open class FloorController {

+ 12 - 12
data-center/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt

@@ -27,17 +27,17 @@ import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSyEq
 import com.persagy.server.datacenter.models.entities.rel.RSyEqList
 import com.persagy.server.services.objects.GeneralSystemService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags= ["AI、系统"])
+@Api(tags= ["009、系统"])
 @RestController
 @RequestMapping("/object/general-system")
 open class GeneralSystemController {

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ISpaceController.kt

@@ -23,12 +23,12 @@ package com.persagy.server.controllers.objects
 import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 import com.persagy.server.services.objects.SpaceService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -42,7 +42,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags = ["AJ、模型空间"])
+@Api(tags = ["010、模型空间"])
 @RestController
 @RequestMapping("/object/ispace")
 open class ISpaceController {

+ 12 - 12
data-center/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt

@@ -23,17 +23,17 @@ package com.persagy.server.controllers.objects
 import com.persagy.server.datacenter.models.entities.assistant.PointImage
 import com.persagy.server.datacenter.models.entities.objects.LocationPoint
 import com.persagy.server.services.objects.LocationPointServices
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 付国宝
  */
-@Api(tags = ["AL、点位标签信息"])
+@Api(tags = ["012、点位标签信息"])
 @RestController
 @RequestMapping("/object/location-point")
 open class LocationPointController {

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt

@@ -22,10 +22,10 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.services.objects.ProjectService
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RestController
  */
 @RestController
 @RequestMapping("/object/project")
-@Api(tags = ["AA、项目"])
+@Api(tags = ["001、项目"])
 //@ApiIgnore
 private open class ProjectController {
     companion object {

+ 11 - 11
data-center/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt

@@ -22,16 +22,16 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.services.objects.PropertyService
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags = ["AK、资产"],position = 1)
+@Api(tags = ["011、资产"],position = 1)
 @RestController
 @RequestMapping("/object/property")
 open class PropertyController {

+ 13 - 13
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt

@@ -1,6 +1,6 @@
 package com.persagy.server.controllers.objects
 
-import cn.sagacloud.server.synchronize.MessageHandler
+import com.persagy.server.synchronize.MessageHandler
 import com.persagy.server.datacenter.models.entities.assistant.ShaftFuncType
 import com.persagy.server.datacenter.models.entities.assistant.ShaftWithCount
 import com.persagy.server.datacenter.models.entities.objects.Shaft
@@ -8,17 +8,17 @@ import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RelationSpaceShaft
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.server.services.objects.ShaftService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*
  *
  * @author 张维新
  */
-@Api(tags = ["AG、竖井"])
+@Api(tags = ["008、竖井"])
 @RestController
 @RequestMapping("/object/shaft")
 class ShaftController {

+ 11 - 11
data-center/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt

@@ -23,16 +23,16 @@ package com.persagy.server.controllers.objects
 import com.persagy.server.datacenter.models.entities.objects.Tenant
 import com.persagy.server.datacenter.models.entities.objects.TenantWithCount
 import com.persagy.server.services.objects.TenantService
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.springframework.web.bind.annotation.PostMapping
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 李井强
  */
-@Api(tags = ["AH、租户"])
+@Api(tags = ["007、租户"])
 @RestController
 @RequestMapping("/object/tenant")
 open class TenantController {

+ 10 - 10
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt

@@ -30,15 +30,15 @@ import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
 import com.persagy.server.services.dict.DictSpaceProjectService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.relation_calc.MepSystemCalcService
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -53,7 +53,7 @@ import org.springframework.web.bind.annotation.RestController
  *
  * @author 张维新
  */
-@Api(tags = ["AF、空间"])
+@Api(tags = ["006、空间"])
 @RestController
 @RequestMapping("/object/zone")
 open class ZoneSpaceController {

+ 83 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForBdController.kt

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.base.extensions.toJson
+import com.persagy.server.datacenter.models.entities.rel.RBdForEqList
+import com.persagy.server.datacenter.models.entities.rel.REq2Bd
+import com.persagy.server.datacenter.models.entities.rel.REqForBdList
+import com.persagy.server.services.rel.REqForBdService
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备服务于建筑
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["036、关系-设备服务于建筑"])
+@RestController
+@RequestMapping("/rel/eq-for-bd")
+class REqForBdController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqForBdController::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备服务于建筑关系
+     *
+     * @param   req2Bd     设备和建筑的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建设备服务于建筑关系", notes = "必填项:EquipId(设备id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody req2Bd: REq2Bd): SCreateResponse<REq2Bd>{
+        logger.debug("build = ${req2Bd.toJson()}")
+        return REqForBdService.create(req2Bd)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rEqForBd      对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备服务于建筑的关系,只针对一个对象", notes = "必填项:EquipId(设备id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody req2Bd: REq2Bd): SBaseResponse {
+        return REqForBdService.deletes(req2Bd)
+    } // Function delete()
+
+    /**
+     * 创建设备服务于建筑关系
+     *
+     * @param   rEqForBd    设备和建筑关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "设备服务于建筑,设备一对多", notes = "必填项:BuildingIdList(建筑id列表)、EquipId(设备id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-bd"])
+    fun createBd(@RequestBody rEqForBd: REqForBdList): SCreateResponse<REq2Bd>{
+        logger.debug("build =${rEqForBd.toJson()}")
+        return REqForBdService.createEq(rEqForBd)
+    } // Function createBd()
+
+    /**
+     * 创建服务于建筑的设备关系
+     *
+     * @param   rEqForBd    设备和建筑关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "服务于建筑的设备,建筑一对多",notes = "必填项:EquipIdList(设备id列表)、BuildingId(建筑id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-sy"])
+    fun createSy(@RequestBody rEqForBd: RBdForEqList): SCreateResponse<REq2Bd>{
+        logger.debug("build =${rEqForBd.toJson()}")
+        return REqForBdService.createsBd(rEqForBd)
+    } // Function createSy()
+
+} // Class RSyForBdController

+ 83 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForFlController.kt

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqForFl
+import com.persagy.server.datacenter.models.entities.rel.REqForFlList
+import com.persagy.server.datacenter.models.entities.rel.RFlForEqList
+import com.persagy.server.services.rel.REqForFlService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备服务于楼层
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["037、关系-设备服务于楼层"])
+@RestController
+@RequestMapping("/rel/eq-for-fl")
+class REqForFlController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqForFlController::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备服务于楼层关系
+     *
+     * @param   rEqForFl     设备和楼层的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建设备服务于楼层关系", notes = "必填项:EquipId(设备id)、FloorId(楼层id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rEqForFl: REqForFl): SCreateResponse<REqForFl> {
+        logger.debug("floor = ${rEqForFl.toJson()}")
+        return REqForFlService.create(rEqForFl)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rEqForFl      对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备服务于楼层的关系,只针对一个对象", notes = "必填项:EquipId(设备id)、FloorId(楼层id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rEqForFl: REqForFl): SBaseResponse {
+        return REqForFlService.deletes(rEqForFl)
+    } // Function delete()
+
+    /**
+     * 创建设备服务于楼层关系
+     *
+     * @param   rEqForFl    设备和楼层关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "设备服务于楼层,设备一对多", notes = "必填项:FloorIdList(楼层id列表)、EquipId(设备id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-fl"])
+    fun createFl(@RequestBody rEqForFl: REqForFlList): SCreateResponse<REqForFl>{
+        logger.debug("floor =${rEqForFl.toJson()}")
+        return REqForFlService.createEq(rEqForFl)
+    } // Function createFl()
+
+    /**
+     * 创建服务于楼层的设备关系
+     *
+     * @param   rEqForFl    设备和楼层关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "服务于楼层的设备,楼层一对多",notes = "必填项:EquipIdList(设备id列表)、FloorId(建筑id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-eq"])
+    fun createEq(@RequestBody rEqForFl: RFlForEqList): SCreateResponse<REqForFl>{
+        logger.debug("floor =${rEqForFl.toJson()}")
+        return REqForFlService.createsFl(rEqForFl)
+    } // Function createSy()
+
+} // Class REqForFlController

+ 84 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForShController.kt

@@ -0,0 +1,84 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqForSh
+import com.persagy.server.datacenter.models.entities.rel.REqForShList
+import com.persagy.server.datacenter.models.entities.rel.RShForEqList
+import com.persagy.server.services.rel.REqForShService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备服务于竖井
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["038、关系-设备服务于竖井"])
+@RestController
+@RequestMapping("/rel/eq-for-sh")
+class REqForShController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqForShController::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备服务于竖井关系
+     *
+     * @param    rEqForSh    设备和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建设备服务于竖井关系", notes = "必填项:EquipId(设备id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rEqForSh: REqForSh): SCreateResponse<REqForSh>{
+        logger.debug("shaft = ${rEqForSh.toJson()}")
+        return REqForShService.create(rEqForSh)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rEqForSh     对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备服务于竖井关系,只针对一个对象", notes = "必填项:EquipId(设备id)、shaftId(竖井id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rEqForSh: REqForSh): SBaseResponse{
+        return REqForShService.deletes(rEqForSh)
+    } // Function delete()
+
+    /**
+     * 创建设备服务于竖井关系
+     *
+     * @param    rEqForSh    设备和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "设备服务于竖井,设备一对多", notes = "必填项:ShaftIdList(竖井id列表)、EquipId(设备id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sh"])
+    fun createSh(@RequestBody rEqForSh: REqForShList): SCreateResponse<REqForSh>{
+        logger.debug("shaft = ${rEqForSh.toJson()}")
+        return REqForShService.createEq(rEqForSh)
+    } // Function createSh()
+
+    /**
+     * 创建服务于竖井的设备关系
+     *
+     * @param    rEqForSh    设备和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "服务于竖井的设备,竖井一对多", notes = "必填项:ShaftId(竖井id)、EquipIdList(设备id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-eq"])
+    fun createEq(@RequestBody rEqForSh: RShForEqList): SCreateResponse<REqForSh>{
+        logger.debug("shaft = ${rEqForSh.toJson()}")
+        return REqForShService.createsSh(rEqForSh)
+    } // Function createEq()
+
+} // Class REqForShController

+ 71 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqForSpConreoller.kt

@@ -0,0 +1,71 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqForSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSpForEqBaseList
+import com.persagy.server.services.rel.REqForSpBaseService
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备服务于业务空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["018、关系-设备服务于业务空间"])
+@RestController
+@RequestMapping("/rel/eq-for-sp-base")
+class REqForSpConreoller {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqForSpConreoller::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备服务于业务空间关系
+     *
+     * @param    rEqForSpBase    设备和业务空间的关系对象
+     * @return                   创建的结果信息
+     */
+    @ApiOperation(value = "创建设备服务于业务空间关系", notes = "必填项:EquipId(设备id)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-list"])
+    fun create(type: String, @RequestBody rEqForSpBase: SCreateRequest<REqForSpBase>): SCreateResponse<REqForSpBase> {
+        logger.debug("space = ${rEqForSpBase.toJson()}")
+        return REqForSpBaseService.create(type,rEqForSpBase)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rEqForSpBaseList    对象 列表
+     * @return                       删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备服务于业务空间关系", notes = "必填项:EquipId(设备id)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/unlink-list"])
+    fun deleteList(type: String, @RequestBody rEqForSpBaseList: ArrayList<REqForSpBase>): SBaseResponse {
+        return REqForSpBaseService.deletes(type,rEqForSpBaseList)
+    } // Function delete()
+
+    /**
+     * 创建服务于业务空间的设备关系
+     *
+     * @param    rEqForSpBase     设备和业务空间的关系对象
+     * @return                    创建的结果信息
+     */
+    @ApiOperation(value = "服务于业务空间的设备,业务空间一对多,累计添加不会覆盖以前记录", notes = "必填项:EquipIdList(设备id列表)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-eq-sp"])
+    fun createEqSp(type: String,@RequestBody rEqForSpBase: RSpForEqBaseList): SCreateResponse<RSpForEqBaseList>{
+        logger.debug("space = ${rEqForSpBase.toJson()}")
+        return REqForSpBaseService.createsSpEq(type,rEqForSpBase)
+    } // Function createEq()
+
+} // Class REqForSpBaseConreoller

+ 97 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInShController.kt

@@ -0,0 +1,97 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqInSh
+import com.persagy.server.datacenter.models.entities.rel.REqInShList
+import com.persagy.server.datacenter.models.entities.rel.RShInEqList
+import com.persagy.server.services.rel.REqInShService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备所在竖井
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["020、关系-设备所在竖井"])
+@RestController
+@RequestMapping("/rel/eq-in-sh")
+class REqInShController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqInShController::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备所在竖井关系
+     *
+     * @param    rEqInSh    设备和竖井的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "创建设备所在竖井关系,累计添加不会覆盖以前记录", notes = "必填项:EquipId(设备id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rEqInSh: REqInSh): SCreateResponse<REqInSh>{
+        logger.debug("shaft = ${rEqInSh.toJson()}")
+        return REqInShService.create(rEqInSh)
+    } //Function create()
+
+    /**
+     * 根据关系删除对象
+     *
+     * @param    rEqInSh     对象
+     * @return               删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备所在竖井关系,只针对一个对象", notes = "必填项:EquipId(设备id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rEqInSh: REqInSh): SBaseResponse{
+        return REqInShService.deletes(rEqInSh)
+    } // Function delete()
+
+    /**
+     * 创建设备所在竖井关系
+     *
+     * @param    rEqInSh     设备和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "设备所在竖井,设备一对多,此方法会覆盖以前的记录", notes = "必填项:EquipId(设备id)、ShaftIdList(竖井id列表),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sh"])
+    fun createSh(@RequestBody rEqInSh: REqInShList): SCreateResponse<REqInSh>{
+        logger.debug("shaft = ${rEqInSh.toJson()}")
+        return REqInShService.createEq(rEqInSh)
+    } // Function createSh()
+
+    /**
+     * 创建所在竖井的设备关系
+     *
+     * @param    rEqInSh      设备和竖井的关系对象
+     * @return                创建的结果信息
+     */
+    @ApiOperation(value = "所在竖井的设备,竖井一对多,此方法会覆盖以前的记录", notes = "必填项:EquipIdList(设备id列表)、ShaftId(竖井id),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-eq"])
+    fun createEq(@RequestBody rEqInSh: RShInEqList): SCreateResponse<REqInSh>{
+        logger.debug("shaft = ${rEqInSh.toJson()}")
+        return  REqInShService.createsSh(rEqInSh)
+    } // Function createEq()
+
+    /**
+     * 创建所在竖井的设备关系
+     *
+     * @param    rEqInSh      设备和竖井的关系对象
+     * @return                创建的结果信息
+     */
+    @ApiOperation(value = "设备所在的竖井,竖井一对多,此方不会覆盖以前的记录,累计添加", notes = "必填项:EquipIdList(设备id列表)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link-eq-sh"])
+    fun createEqSh(@RequestBody rEqInSh: RShInEqList): SCreateResponse<REqInSh>{
+        logger.debug("shaft = ${rEqInSh.toJson()}")
+        return  REqInShService.createsShEq(rEqInSh)
+    } // Function createEq()
+
+} // Class REqInShController

+ 71 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/REqInSpController.kt

@@ -0,0 +1,71 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqInSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSpInEqBaseList
+import com.persagy.server.services.rel.REqInSpBaseService
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设备所在业务空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["017、关系-设备所在业务空间"])
+@RestController
+@RequestMapping("/rel/eq-in-sp-base")
+class REqInSpController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(REqInSpController::class.java)
+    } // Companion object
+
+    /**
+     * 创建设备所在业务空间关系
+     *
+     * @param    rEqInSpBase    设备和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "创建设备所在业务空间关系,累计添加不会覆盖以前记录", notes = "必填项:EquipId(设备id)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-list"])
+    fun create(type: String, @RequestBody rEqInSpBase: SCreateRequest<REqInSpBase>): SCreateResponse<REqInSpBase> {
+        logger.debug("space = ${rEqInSpBase.toJson()}")
+        return REqInSpBaseService.create(type,rEqInSpBase)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rEqInSpBaseList    对象
+     * @return                      删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除设备所在业务空间关系", notes = "必填项:EquipId(设备id)、SpaceId(业务空间id),type为空间类型")
+    @PostMapping(value = ["/unlink-list"])
+    fun delete(type: String, @RequestBody rEqInSpBaseList: ArrayList<REqInSpBase>): SBaseResponse {
+        return REqInSpBaseService.deletes(type,rEqInSpBaseList)
+    } // Function delete()
+
+    /**
+     * 创建所在业务空间的设备关系
+     *
+     * @param    rEqInSpBase     设备和业务空间的关系对象
+     * @return                   创建的结果信息
+     */
+    @ApiOperation(value = "所在业务空间的设备,业务空间一对多,累计添加不会覆盖以前记录", notes = "必填项:EquipIdList(设备id列表)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-eq-sp"])
+    fun createEq(type:String, @RequestBody rEqInSpBase: RSpInEqBaseList): SCreateResponse<RSpInEqBaseList>{
+        logger.debug("space = ${rEqInSpBase.toJson()}")
+        return REqInSpBaseService.createsSpEq(type,rEqInSpBase)
+    } // Function createEq()
+
+} // Class REqInSpController

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

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 楼层的贯通关系
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["021、关系-楼层的贯通"])
+@RestController
+@RequestMapping("/rel/fl-through-fl")
+class RFlThroughFlController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RFlThroughFlController::class.java)
+    } // Companion object
+
+    /**
+     * 创建楼层的贯通关系
+     *
+     * @param   RFlThroughFl    楼层和楼层的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "创建楼层的贯通关系", notes = "必填项:FloorId(楼层id)、FloorOtherId(其他楼层id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rFlThroughFl: RFlThroughFl): SCreateResponse<RFlThroughFl>{
+        logger.debug("build = ${rFlThroughFl.toJson()}")
+        return RFlThroughFlService.create(rFlThroughFl)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rFlThroughFl    对象
+     * @return                  删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除楼层的贯通关系,只针对一个对象", notes = "必填项:FloorId(楼层id)、FloorOtherId(其他楼层id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rFlThroughFl: RFlThroughFl): SBaseResponse {
+        return RFlThroughFlService.deletes(rFlThroughFl)
+    } // Function delete()
+
+    /**
+     * 创建楼层的贯通关系
+     *
+     * @param   rFlThroughFl    楼层和其他楼层列表关系对象r
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "楼层的贯通,楼层一对多", notes = "必填项:FloorId(楼层id)、FloorOtherIdList(其他楼层id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-or"])
+    fun createOr(@RequestBody rFlThroughFl: RFloorThroughFloorOtherList): SCreateResponse<RFlThroughFl>{
+        logger.debug("floor =${rFlThroughFl.toJson()}")
+        return RFlThroughFlService.createFl(rFlThroughFl)
+    } // Function createOr()
+
+    /**
+     * 创建楼层的贯通关系
+     *
+     * @param   rFlThroughFl    其他楼层和楼层列表关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "楼层的贯通,其他楼层一对多",notes = "必填项:FloorIdList(楼层id列表)、FloorOtherId(其他楼层id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-fl"])
+    fun createFl(@RequestBody rFlThroughFl: RFloorOtherThroughFloorList): SCreateResponse<RFlThroughFl>{
+        logger.debug("floor =${rFlThroughFl.toJson()}")
+        return RFlThroughFlService.createsFl(rFlThroughFl)
+    } // Function createFl()
+
+} // Class RFlThroughFlController

+ 145 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt

@@ -0,0 +1,145 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.dict.SpaceInfoDic
+import com.persagy.server.datacenter.models.entities.rel.RShContainSpBase
+import com.persagy.server.datacenter.models.entities.rel.RShContainSpBaseList
+import com.persagy.server.services.rel.RShContainSpBaseService
+import com.persagy.server.services.rel.RSpContainShBaseList
+import com.persagy.base.extensions.toJson
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 竖井下的业务空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["023、关系-竖井下的业务空间"])
+@RestController
+@RequestMapping("/rel/sh-contain-sp-base")
+class RShContainSpBaseController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RShContainSpBaseController::class.java)
+    } // Companion object
+
+    /**
+     * 创建竖井下的业务空间关系
+     *
+     * @param    rShContainSpBase    竖井和业务空间的关系对象
+     * @return                       创建的结果信息
+     */
+    @ApiOperation(value = "创建竖井下的业务空间关系", notes = "必填项:ShaftID(竖井id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rShContainSpBase: SCreateRequest<RShContainSpBase>): SCreateResponse<RShContainSpBase> {
+        logger.debug("space =${rShContainSpBase.toJson()}")
+        return RShContainSpBaseService.create(rShContainSpBase)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rShContainSpBase    对象
+     * @param   type                 空间类型
+     * @return                       删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除竖井下的业务空间关系,只针对一个对象", notes = "必填项:ShaftID(竖井id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(type: String,@RequestBody rShContainSpBase: ArrayList<RShContainSpBase>): SBaseResponse {
+        return RShContainSpBaseService.deletes(type,rShContainSpBase)
+    } // Function delete()
+
+//    /**
+//     * 创建竖井下的业务空间关系
+//     *
+//     * @param   rShContainSpBase     竖井和业务空间的关系对象
+//     * @return                       创建的结果信息
+//     */
+//    @ApiOperation(value = "竖井下的业务空间,竖井一对多", notes = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
+//    @PostMapping(value = ["link-sp"])
+//    fun createSp(@RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBase> {
+//        logger.debug("space =${rShContainSpBase.toJson()}")
+//        return RShContainSpBaseService.createSh(rShContainSpBase)
+//    } // Function createSp()
+//
+//    /**
+//     * 创建竖井下的业务空间关系
+//     *
+//     * @param    rShContainSpBase     竖井和业务空间的关系对象
+//     * @return                        创建的结果信息
+//     */
+//    @ApiOperation(value = "业务空间关联竖井,业务空间一对多", notes = "必填项:SpaceId(业务空间id)、ShaftIDList(竖井id列表),此方法会覆盖以前的记录")
+//    @PostMapping(value = ["/link-sh"])
+//    fun createSh(@RequestBody rShContainSpBase: RSpContainShBaseList): SCreateResponse<RShContainSpBase> {
+//        logger.debug("space =${rShContainSpBase.toJson()}")
+//        return RShContainSpBaseService.createsSp(rShContainSpBase)
+//    } // Function createSh()
+
+
+    /**
+     * 创建竖井下的业务空间关系
+     *
+     * @param   rShContainSpBase     竖井和业务空间的关系对象
+     * @param   type                 空间类型
+     * @return                       创建的结果信息
+     */
+    @ApiOperation(value = "竖井下的业务空间,竖井一对多,此方法不会覆盖以前的记录", notes = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法不会覆盖以前的记录")
+    @PostMapping(value = ["link-shsps"])
+    fun createShSps(type: String?,@RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
+        logger.debug("space =${rShContainSpBase.toJson()}")
+        return RShContainSpBaseService.createShSps(type,rShContainSpBase)
+    } // Function createSp()
+
+    /**
+     * 创建竖井下的业务空间关系
+     *
+     * @param   rSpContainShBase     竖井和业务空间的关系对象
+     * @param   type                 空间类型
+     * @return                       创建的结果信息
+     */
+    @ApiOperation(value = "竖井下的业务空间,空间一对多,此方法不会覆盖以前的记录", notes = "必填项:SpaceId(业务空间id)、ShaftIDList(竖井id列表),此方法不会覆盖以前的记录")
+    @PostMapping(value = ["link-spshs"])
+    fun createSpShs(type: String,@RequestBody rSpContainShBase: RSpContainShBaseList): SCreateResponse<RSpContainShBaseList> {
+        logger.debug("space =${rSpContainShBase.toJson()}")
+        return RShContainSpBaseService.createSpShs(type,rSpContainShBase)
+    } // Function createSp()
+
+    /**
+     * 创建竖井下的业务空间关系
+     *
+     * @param   rShContainSpBase     竖井和业务空间的关系对象
+     * @param   type                 空间类型
+     * @return                       创建的结果信息
+     */
+    @ApiOperation(value = "竖井下的业务空间,竖井一对多,此方法会覆盖以前的记录", notes = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
+    @PostMapping(value = ["link-shsps-replace"])
+    fun createShSpsReplace(Type: String,BuildingId: String,FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
+        logger.debug("space =${rShContainSpBase.toJson()}")
+        return RShContainSpBaseService.createShSpsReplace(Type,BuildingId,FloorId,rShContainSpBase)
+    } // Function createSp()
+
+
+
+    /**
+     * 查询空间类型和名称
+     * @param shaftId 竖井id
+     */
+    @ApiOperation(value = "查询空间类型和名称",notes = "")
+    @PostMapping(value = ["/space-type-query"])
+    fun spaceTypeQuery(shaftId: String): SQueryResponse<SpaceInfoDic> {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return RShContainSpBaseService.spaceTypeQuery(projectId,shaftId)
+    } // Function spaceTypeQuery()
+
+} // Class RShContainSpBaseController

+ 95 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShaftThroughShaftController.kt

@@ -0,0 +1,95 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaft
+import com.persagy.server.datacenter.models.entities.rel.RShaftThroughShaftOtherList
+import com.persagy.server.services.rel.RShaftThroughShaftService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 竖井的贯通关系
+ *
+ * @author 张维新
+ */
+@Api(tags = ["022、关系-竖井的贯通关系"])
+@RestController
+@RequestMapping("/rel/sh-through-sh")
+class RShaftThroughShaftController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RShaftThroughShaftController::class.java)
+    } // Companion object
+
+    /**
+     * 创建竖井的贯通关系
+     *
+     * @param   rFlThroughFl    竖井和竖井的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "创建竖井的贯通关系", notes = "必填项:ShaftId(竖井id)、ShaftOtherId(其他竖井id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rFlThroughFl: RShaftThroughShaft): SCreateResponse<RShaftThroughShaft>{
+        logger.debug("build = ${rFlThroughFl.toJson()}")
+        return RShaftThroughShaftService.create(rFlThroughFl)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rFlThroughFl    对象
+     * @return                  删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除竖井的贯通关系,只针对一个对象", notes = "必填项:ShaftId(竖井id)、ShaftOtherId(其他数据竖井id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rFlThroughFl: RShaftThroughShaft): SBaseResponse {
+        return RShaftThroughShaftService.deletes(rFlThroughFl)
+    } // Function delete()
+
+    /**
+     * 创建竖井的贯通关系
+     *
+     * @param   rFlThroughFl    竖井和其他竖井列表关系对象r
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "竖井的贯通,竖井一对多,此方法会覆盖以前的记录", notes = "必填项:ShaftId(竖井id)、ShaftOtherIdList(其他竖井id列表),此方法会覆盖以前的记录")
+    @PostMapping(value = ["link-or"])
+    fun createOr(@RequestBody rFlThroughFl: RShaftThroughShaftOtherList): SCreateResponse<RShaftThroughShaft>{
+        logger.debug("Shaft =${rFlThroughFl.toJson()}")
+        return RShaftThroughShaftService.createShaft(rFlThroughFl)
+    } // Function createOr()
+
+    /**
+     * 创建竖井的贯通关系
+     *
+     * @param   rFlThroughFl    竖井和其他竖井列表关系对象r
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "竖井的贯通,竖井一对多,此方法不会覆盖以前的记录", notes = "必填项:ShaftId(竖井id)、ShaftOtherIdList(其他竖井id列表)")
+    @PostMapping(value = ["link-shaft"])
+    fun createShaft(@RequestBody rFlThroughFl: RShaftThroughShaftOtherList): SCreateResponse<RShaftThroughShaft>{
+        logger.debug("Shaft =${rFlThroughFl.toJson()}")
+        return RShaftThroughShaftService.createShaftAll(rFlThroughFl)
+    } // Function createOr()
+
+//    /**
+//     * 创建楼层的贯通关系
+//     *
+//     * @param   rFlThroughFl    其他楼层和楼层列表关系对象
+//     * @return                  创建的结果信息
+//     */
+//    @ApiOperation(value = "楼层的贯通,其他楼层一对多",notes = "必填项:FloorIdList(楼层id列表)、FloorOtherId(其他楼层id),测方法会覆盖以前的记录")
+//    @PostMapping(value = ["link-fl"])
+//    fun createFl(@RequestBody rFlThroughFl: RFloorOtherThroughFloorList): SCreateResponse<RFlThroughFl>{
+//        logger.debug("floor =${rFlThroughFl.toJson()}")
+//        return RFlThroughFlService.createsFl(rFlThroughFl)
+//    } // Function createFl()
+
+} // Class RFlThroughFlController

+ 53 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInBdOrFlController.kt

@@ -0,0 +1,53 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RSpinBd
+import com.persagy.server.services.rel.RSpInBdService
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 业务空间所在的建筑楼层
+ *
+ * @author 张维新
+ */
+@Api(tags = ["025、关系-业务空间所在的建筑楼层"])
+@RestController
+@RequestMapping("/rel/sp-in")
+class RSpInBdOrFlController {
+
+    /**
+     * 创建业务空间和建筑的关系
+     */
+    @ApiOperation(value = "创建业务空间和建筑的关系", notes = "")
+    @PostMapping(value = ["/bd-create"])
+    fun spInBdCreate(@RequestBody rSiInSpBase: SCreateRequest<RSpinBd>): SCreateResponse<RSpinBd> {
+        return RSpInBdService.spInBdCreates(rSiInSpBase)
+    } // Function spInBdCreate()
+
+    /**
+     * 删除业务空间和建筑的关系
+     */
+    @ApiOperation(value = "删除业务空间和建筑的关系", notes = "")
+    @PostMapping(value = ["/bd-del"])
+    fun spInBdDeL(@RequestBody rSpinBdList: ArrayList<RSpinBd>): SBaseResponse {
+        return RSpInBdService.spInBdDeLs(rSpinBdList)
+    } // Function spInBdCreate()
+
+    /**
+     * 修改业务空间所在的建筑
+     */
+    @ApiOperation(value = "删除业务空间和建筑的关系", notes = "")
+    @PostMapping(value = ["/bd-update"])
+    fun spInBdUpdate(@RequestBody request: SUpdateRequest<RSpinBd>): SBaseResponse{
+        return RSpInBdService.spInBdUpdates(request)
+    } // Function spInBdUpdate()
+
+} // Class RSpInBdOrFlController

+ 98 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpInSiController.kt

@@ -0,0 +1,98 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RSiInSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSiInSpBaseList
+import com.persagy.server.services.rel.RSpInSiBaseService
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+
+/**
+ * 业务空间内的元空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["035、关系-业务空间内的模型空间"])
+@RestController
+@RequestMapping("/rel/si-in-sp-base")
+class RSpInSiController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSpInSiController::class.java)
+    } // Companion object
+
+    /**
+     * 创建业务空间内的元空间关系
+     *
+     * @param     rSiInSpBase    元空间内的业务空间关系对象
+     * @return                   创建的结果信息
+     */
+    @ApiOperation(value = "创建业务空间内的元空间关系, 累计添加不会覆盖", notes = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-list"])
+    fun create(type: String, @RequestBody rSiInSpBase: SCreateRequest<RSiInSpBase>): SCreateResponse<RSiInSpBase> {
+        logger.debug("space = ${rSiInSpBase.toJson()}")
+        return RSpInSiBaseService.createLists(type,rSiInSpBase)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rSiInSpBase    对象
+     * @return                  删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除业务空间内的元空间关系", notes = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(type: String, @RequestBody rSiInSpBase: ArrayList<RSiInSpBase>): SBaseResponse {
+        return RSpInSiBaseService.deletes(type,rSiInSpBase)
+    } // Function delete()
+
+//    /**
+//     * 创建业务空间内的元空间关系
+//     *
+//     * @param    rSpInSiBase    业务空间和元空间的关系对象
+//     * @return                  创建的结果信息
+//     */
+//    @ApiOperation(value = "元空间关联业务空间,元空间一对多", notes = "必填项:IspaceId(元空间id)、SpaceIdList(业务空间id列表),测方法会覆盖以前的记录")
+//    @PostMapping(value = ["/link-si"])
+//    fun createSi(@RequestBody rSpInSiBase: RSpInSiBaseList): SCreateResponse<RSiInSpBase>{
+//        logger.debug("space = ${rSpInSiBase.toJson()}")
+//        return RSpInSiBaseService.createSp(rSpInSiBase)
+//    } // Function createSi()
+
+    /**
+     * 创建业务空间内的元空间关系
+     *
+     * @param    rSpInSiBase    业务空间和元空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "业务空间内的元空间,业务空间一对多,此方法会覆盖以前的记录", notes = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sp"])
+    fun createSp(type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
+        logger.debug("space = ${rSpInSiBase.toJson()}")
+        return RSpInSiBaseService.createsSp(type,rSpInSiBase)
+    } // Function createSp()
+
+    /**
+     * 创建业务空间内的元空间关系
+     *
+     * @param    rSpInSiBase    业务空间和元空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "业务空间内的元空间,业务空间一对多,累计添加不会覆盖以前记录", notes = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id)")
+    @PostMapping(value = ["/link-si-sp"])
+    fun createSpSi(type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
+        logger.debug("space = ${rSpInSiBase.toJson()}")
+        return RSpInSiBaseService.createsSpSi(type, rSpInSiBase)
+    } // Function createSp()
+
+} // Class RSpInSiBaseController

+ 66 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSpatialConnectionConreoller.kt

@@ -0,0 +1,66 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RSpatialConnection
+import com.persagy.server.services.rel.RSpatialConnectionService
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@Api(tags = ["024、关系-空间关系"])
+@RestController
+@RequestMapping("/rel/sp-rel")
+class RSpatialConnectionConreoller {
+
+    /**
+     * 创建邻接关系
+     */
+    @ApiOperation(value="创建邻接关系", notes="图类型 GraphType:空间邻接关系 SpaceNeighborhood 建筑交通关系 TrafficNetwork  空气流通关系  ConvectionNetwork  光照辐射关系  RadiationNetwork ")
+    @PostMapping(value = ["/space-neighborhood-Create"])
+    fun spaceNeighborhoodCreate(@RequestBody rSiInSpBase: SCreateRequest<RSpatialConnection>): SCreateResponse<RSpatialConnection> {
+        return RSpatialConnectionService.create(rSiInSpBase)
+    } // Function spaceNeighborhood
+
+    /**
+     * 空间关系
+    */
+    @ApiOperation(value="查询空间关系", notes=" 楼层id FloorId   图类型 GraphType:空间邻接关系 SpaceNeighborhood 建筑交通关系 TrafficNetwork  空气流通关系  ConvectionNetwork  光照辐射关系  RadiationNetwork ,边类型RelType  ")
+    @PostMapping(value = ["/space-neighborhood-query"])
+    fun spaceNeighborhoodQuery(@RequestBody request: SQueryRequest): SQueryResponse<RSpatialConnection> {
+        return RSpatialConnectionService.pageQuerys(request)
+    } // Function spaceNeighborhoodQuery
+
+
+    /**
+     * 根据id删除建筑
+     *
+     * @param   idList      id数组
+     * @return              删除的结果信息
+     */
+    @ApiOperation(value = "删除某一个关系", notes = "必填: SpaceIdOne、SpaceIdTwo、GraphType、ZoneType")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<RSpatialConnection>): SBaseResponse {
+        return RSpatialConnectionService.delete(idList)
+    } // Function delete()
+
+    /**
+     * 清除某个楼层下的数据
+     *
+     * @param   idList      id数组
+     * @return              删除的结果信息
+     */
+    @ApiOperation(value = "清除某个楼层下的数据", notes = "必填 graphType、floorId、ZoneType")
+    @PostMapping(value = ["/delete-floor"])
+    fun deleteFloor(@RequestBody idList: RSpatialConnection): SBaseResponse {
+        return RSpatialConnectionService.deleteFloor(idList)
+    } // Function deleteFloor()
+
+
+} // Class RSpatialConnectionConreoller

+ 109 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyEqController.kt

@@ -0,0 +1,109 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REqSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyEq
+import com.persagy.server.datacenter.models.entities.rel.RSyEqList
+import com.persagy.server.services.rel.RSyEqService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ *系统下的设备设施
+ *
+ * @author 张维新
+ */
+@Api(tags = ["019、关系-系统下的设备设施"])
+@RestController
+@RequestMapping("/rel/sy-in-eq")
+class RSyEqController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyEqController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统下的设备关系
+     *
+     * @param   rSyEq           系统和设备的关系对象
+     * @return                  创建结果信息
+     */
+    @ApiOperation(value = "创建系统下的设备关系", notes = "必填项:EquipID(设备id)、SysID(系统id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyEq: RSyEq): SCreateResponse<RSyEq> {
+        logger.debug("equip =${rSyEq.toJson()}")
+        return RSyEqService.create(rSyEq)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rSyEq      对象
+     * @return             删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统和设备的关系,只针对一个对象", notes = "必填项:EquipID(设备id)、SysID(系统id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyEq: RSyEq): SBaseResponse {
+        return RSyEqService.deletes(rSyEq)
+    } // Function delete()
+
+    /**
+     * 创建系统下的设备关系
+     *
+     * @param   rSyEq           系统和设备的关系对象
+     * @return                  创建结果信息
+     */
+    @ApiOperation(value = "系统下的设备,系统一对多,数据覆盖", notes = "必填项:EquipIdList(设备id列表)、SysID(系统id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-eq"])
+    fun createEq(@RequestBody rSyEq: RSyEqList): SCreateResponse<RSyEq> {
+        logger.debug("equip =${rSyEq.toJson()}")
+        return RSyEqService.createSy(rSyEq)
+    } // Function createEq()
+
+    /**
+     * 创建系统下的设备关系
+     *
+     * @param   rSyEq           系统和设备的关系对象
+     * @return                  创建结果信息
+     */
+    @ApiOperation(value = "设备关联系统,设备一对多, 数据覆盖", notes = "必填项:EquipId(设备id)、sysIdList(系统id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyEq: REqSyList): SCreateResponse<RSyEq> {
+        logger.debug("equip =${rSyEq.toJson()}")
+        return RSyEqService.createsEq(rSyEq)
+    } // Function createSy()
+
+    /**
+     * 创建系统下的设备关系
+     *
+     * @param   rSyEq           系统和设备的关系对象
+     * @return                  创建结果信息
+     */
+    @ApiOperation(value = "设备关联系统,系统一对多,数据叠加", notes = "必填项:EquipId(设备id)、sysIdList(系统id列表),此方法会为累计叠加,不会覆盖以前的数据")
+    @PostMapping(value = ["/link-sy-eq"])
+    fun createSyEq(@RequestBody rSyEq: RSyEqList): SCreateResponse<RSyEq> {
+        logger.debug("equip =${rSyEq.toJson()}")
+        return RSyEqService.createSyEq(rSyEq)
+    } // Function createSyEq()
+
+    /**
+     * 根据对象删除系统和设备的关系
+     *
+     * @param   rSyEq           根据对象删除系统和设备的关系
+     * @return                  创建结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统和设备的关系", notes = "必填项:EquipID(设备id)、SysID(系统id)")
+    @PostMapping(value = ["/unlinks-sy-eq"])
+    fun deleteRSyEq(@RequestBody idList: ArrayList<RSyEq>): SBaseResponse {
+        logger.debug("equip =${idList.toJson()}")
+        return RSyEqService.deleteByKeysList(idList)
+    } // Function deleteRSyEq()
+
+} // Class RSyEqController

+ 83 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForBdController.kt

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RBdForSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyForBd
+import com.persagy.server.datacenter.models.entities.rel.RSyForBdList
+import com.persagy.server.services.rel.RSyForBdService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统服务于建筑
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["026、关系-系统服务于建筑"])
+@RestController
+@RequestMapping("/rel/sy-for-bd")
+class RSyForBdController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyForBdController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统服务于建筑关系
+     *
+     * @param   rSyForBd     系统和建筑的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建系统服务于建筑关系", notes = "必填项:SysId(系统id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyForBd: RSyForBd): SCreateResponse<RSyForBd>{
+        logger.debug("build = ${rSyForBd.toJson()}")
+        return RSyForBdService.create(rSyForBd)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rSyForBd      对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统服务于建筑的关系,只针对一个对象", notes = "必填项:SysId(系统id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyForBd: RSyForBd): SBaseResponse {
+        return RSyForBdService.deletes(rSyForBd)
+    } // Function delete()
+
+    /**
+     * 创建系统服务于建筑关系
+     *
+     * @param   rSyForBd    系统和建筑关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统服务于建筑,系统一对多", notes = "必填项:BuildingIdList(建筑id列表)、SysId(系统id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-bd"])
+    fun createBd(@RequestBody rSyForBd: RSyForBdList): SCreateResponse<RSyForBd>{
+        logger.debug("build =${rSyForBd.toJson()}")
+        return RSyForBdService.createSy(rSyForBd)
+    } // Function createBd()
+
+    /**
+     * 创建服务于建筑的系统关系
+     *
+     * @param   rSyForBd    系统和建筑关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "服务于建筑的系统,建筑一对多",notes = "必填项:sysIdList(系统id列表)、BuildingId(建筑id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["link-sy"])
+    fun createSy(@RequestBody rSyForBd: RBdForSyList): SCreateResponse<RSyForBd>{
+        logger.debug("build =${rSyForBd.toJson()}")
+        return RSyForBdService.createsBd(rSyForBd)
+    } // Function createSy()
+
+} // Class RSyForBdController

+ 83 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForFlController.kt

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RFlForSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyForFl
+import com.persagy.server.datacenter.models.entities.rel.RSyForFlList
+import com.persagy.server.services.rel.RSyForFlService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统服务于楼层
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["027、关系-系统服务于楼层"])
+@RestController
+@RequestMapping("/rel/sy-for-fl")
+class RSyForFlController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyForFlController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统服务于楼层关系
+     *
+     * @param   rSyForFl    系统和楼层的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "创建系统服务于楼层关系", notes = "必填项:SysId(系统id)、FloorId(楼层id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyForFl: RSyForFl): SCreateResponse<RSyForFl>{
+        logger.debug("floor = ${rSyForFl.toJson()}")
+        return RSyForFlService.create(rSyForFl)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rSyForFl    对象
+     * @return              删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统服务于楼层的关系,只针对一个对象", notes = "必填项:SysId(系统id)、FloorId(楼层id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyForFl: RSyForFl): SBaseResponse{
+        return RSyForFlService.deletes(rSyForFl)
+    } // Function delete()
+
+    /**
+     * 创建系统服务于楼层关系
+     *
+     * @param    rSyForFl    系统和楼层关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "系统服务于楼层,系统一对多", notes = "必填项:FloorIdList(楼层id列表)、SysId(系统id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-fl"])
+    fun createFl(@RequestBody rSyForFl: RSyForFlList): SCreateResponse<RSyForFl>{
+        logger.debug("floor = ${rSyForFl.toJson()}")
+        return RSyForFlService.createSy(rSyForFl)
+    } // Function createFl()
+
+    /**
+     * 创建服务于楼层的系统
+     *
+     * @param   rSyForFl    系统和楼层关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "服务于楼层的系统,楼层一对多", notes = "必填项:FloorId(楼层id)、sysIdList(系统id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyForFl: RFlForSyList): SCreateResponse<RSyForFl>{
+        logger.debug("floor = ${rSyForFl.toJson()}")
+        return RSyForFlService.createsFl(rSyForFl)
+    } // Function createSy()
+
+} // Class RSyForFlController

+ 83 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForShController.kt

@@ -0,0 +1,83 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RShForSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyForSh
+import com.persagy.server.datacenter.models.entities.rel.RSyForShList
+import com.persagy.server.services.rel.RSyForShService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统服务于竖井
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["028、关系-系统服务于竖井"])
+@RestController
+@RequestMapping("/rel/sy-for-sh")
+class RSyForShController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyForShController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统服务于竖井关系
+     *
+     * @param    rSyForSh    系统和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建系统服务于竖井关系", notes = "必填项:SysId(系统id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyForSh: RSyForSh): SCreateResponse<RSyForSh>{
+        logger.debug("shaft = ${rSyForSh.toJson()}")
+        return RSyForShService.create(rSyForSh)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param    rSyForSh    对象
+     * @return               删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统服务于竖井的关系,只针对一个对象", notes = "必填项:SysId(系统id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyForSh: RSyForSh): SBaseResponse{
+        return RSyForShService.deletes(rSyForSh)
+    } // Function delete()
+
+    /**
+     * 创建系统服务于竖井关系
+     *
+     * @param   rSyForSh    系统和竖井关系的对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统服务于竖井,系统一对多", notes = "必填项:ShaftIdList(竖井id列表)、SysId(系统id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sh"])
+    fun createSh(@RequestBody rSyForSh: RSyForShList): SCreateResponse<RSyForSh>{
+        logger.debug("shaft = ${rSyForSh.toJson()}")
+        return RSyForShService.createSy(rSyForSh)
+    } // Function createSh()
+
+    /**
+     * 创建服务于竖井的系统关系
+     *
+     * @param   rSyForSh     系统和竖井关系的对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "服务于竖井的系统,竖井一对多", notes = "必填项:ShaftId(竖井id)、sysIdList(系统id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyForSh: RShForSyList): SCreateResponse<RSyForSh>{
+        logger.debug("shaft = ${rSyForSh.toJson()}")
+        return RSyForShService.createsSh(rSyForSh)
+    } // Function createSy()
+
+} // Class RSyForShController

+ 84 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyForSpController.kt

@@ -0,0 +1,84 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RSpForSyBaseList
+import com.persagy.server.datacenter.models.entities.rel.RSyForSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSyForSpBaseList
+import com.persagy.server.services.rel.RSyForSpBaseService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统服务于业务空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["029、关系-系统服务于业务空间"])
+@RestController
+@RequestMapping("/rel/sy-for-sp-base")
+class RSyForSpController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyForSpController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统服务于业务空间关系
+     *
+     * @param    rSyForSpBase       系统和业务空间的关系对象
+     * @return                      创建的结果信息
+     */
+    @ApiOperation(value = "创建系统服务于业务空间关系", notes = "必填项:SysID(系统id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyForSpBase: RSyForSpBase): SCreateResponse<RSyForSpBase> {
+        logger.debug("space =${rSyForSpBase.toJson()}")
+        return RSyForSpBaseService.create(rSyForSpBase)
+    } // Function create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rSyForSpBase      对象
+     * @return                    删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统服务于业务空间关系,只针对一个对象", notes = "必填项:SysID(系统id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyForSpBase: RSyForSpBase): SBaseResponse {
+        return RSyForSpBaseService.deletes(rSyForSpBase)
+    } // Function delete()
+
+    /**
+     * 创建系统服务于业务空间关系
+     *
+     * @param   rSyForSpBase   系统和业务空间的关系对象
+     * @return                 创建的结果信息
+     */
+    @ApiOperation(value = "系统服务于业务空间关系,系统一对多", notes = "必填项:SpaceIdList(业务空间id列表)、SysID(系统id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sp"])
+    fun createSp(@RequestBody rSyForSpBase: RSyForSpBaseList): SCreateResponse<RSyForSpBase> {
+        logger.debug("space =${rSyForSpBase.toJson()}")
+        return RSyForSpBaseService.createSy(rSyForSpBase)
+    } // Function createSp()
+
+    /**
+     * 创建服务于业务空间的系统关系
+     *
+     * @param   rSyForSpBase    系统和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "服务于业务空间的系统,业务空间一对多",notes = "必填项:SpaceId(业务空间id)、SysIDList(系统id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyForSpBase: RSpForSyBaseList): SCreateResponse<RSyForSpBase> {
+        logger.debug("space =${rSyForSpBase.toJson()}")
+        return RSyForSpBaseService.createsSp(rSyForSpBase)
+    } // Function createSy()
+
+} // Class RSyForSpController

+ 97 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInBdController.kt

@@ -0,0 +1,97 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RBdInSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyInBd
+import com.persagy.server.datacenter.models.entities.rel.RSyInBdList
+import com.persagy.server.services.rel.RSyInBdService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统所在建筑
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["030、关系-系统所在建筑"])
+@RestController
+@RequestMapping("/rel/sy-in-bd")
+class RSyInBdController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyInBdController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统所在建筑关系
+     *
+     * @param    rSyInBd     系统和建筑的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "创建系统所在建筑关系", notes = "必填项:SysId(系统id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyInBd: RSyInBd): SCreateResponse<RSyInBd> {
+        logger.debug("build = ${rSyInBd.toJson()}")
+        return RSyInBdService.create(rSyInBd)
+    } //Function create()
+
+    /**
+     * 根据对象删除
+     *
+     * @param    rSyInBd      对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统所在建筑关系,只针对一个对象", notes = "必填项:SysId(系统id)、BuildingId(建筑id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyInBd: RSyInBd): SBaseResponse {
+        return RSyInBdService.deletes(rSyInBd)
+    } // Function delete()
+
+    /**
+     * 创建系统所在建筑关系
+     *
+     * @param    rSyInBd     系统和建筑的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "系统所在建筑,系统一对多建筑", notes = "必填项:SysId(系统id)、BuildingIdList(建筑id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-bd"])
+    fun createBd(@RequestBody rSyInBd: RSyInBdList): SCreateResponse<RSyInBd>{
+        logger.debug("build = ${rSyInBd.toJson()}")
+        return RSyInBdService.createSy(rSyInBd)
+    } // Function createBd()
+
+    /**
+     * 创建所在建筑的系统关系
+     *
+     * @param    rSyInBd      系统和建筑的关系对象
+     * @return                创建的结果信息
+     */
+    @ApiOperation(value = "所在建筑的系统,建筑一对多系统", notes = "必填项:sysIdList(系统id列表)、BuildingId(建筑id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyInBd: RBdInSyList): SCreateResponse<RSyInBd>{
+        logger.debug("build = ${rSyInBd.toJson()}")
+        return  RSyInBdService.createsBd(rSyInBd)
+    } // Function createSy()
+
+    /**
+     * 创建系统所在建筑关系
+     *
+     * @param    rSyInBd     系统和建筑的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "系统所在建筑,系统一对多建筑,此方法不会覆盖", notes = "必填项:SysId(系统id)、BuildingIdList(建筑id列表)")
+    @PostMapping(value = ["/link-bd-sy"])
+    fun createSyBd(@RequestBody rSyInBd: RSyInBdList): SCreateResponse<RSyInBd>{
+        logger.debug("build = ${rSyInBd.toJson()}")
+        return RSyInBdService.createSy(rSyInBd)
+    } // Function createBd()
+
+} // Class RSyInBdController

+ 97 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInFlController.kt

@@ -0,0 +1,97 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RFlInSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyInFl
+import com.persagy.server.datacenter.models.entities.rel.RSyInFlList
+import com.persagy.server.services.rel.RSyInFlService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统所在楼层
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["031、关系-系统所在楼层"])
+@RestController
+@RequestMapping("/rel/sy-in-fl")
+class RSyInFlController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyInFlController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系所在楼层关系
+     *
+     * @param    rSyInFl    系统和楼层的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "创建系所在楼层关系", notes = "必填项:SysId(系统id)、FloorId(楼层id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyInFl: RSyInFl): SCreateResponse<RSyInFl> {
+        logger.debug("floor = ${rSyInFl.toJson()}")
+        return RSyInFlService.create(rSyInFl)
+    } //Function create()
+
+    /**
+     * 根据对象删除
+     *
+     * @param    rSyInFl     对象
+     * @return               删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统所在楼层关系,只针对一个对象", notes = "必填项:SysId(系统id)、FloorId(楼层id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyInFl: RSyInFl): SBaseResponse {
+        return RSyInFlService.deletes(rSyInFl)
+    } // Function delete()
+
+    /**
+     * 创建系统所在楼层关系
+     *
+     * @param    rSyInFl    系统和楼层的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统所在楼层,系统一对多楼层", notes = "必填项:SysId(系统id)、FloorIdList(楼层id列表),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-fl"])
+    fun createFl(@RequestBody rSyInFl: RSyInFlList): SCreateResponse<RSyInFl>{
+        logger.debug("floor = ${rSyInFl.toJson()}")
+        return RSyInFlService.createSy(rSyInFl)
+    } // Function createFl()
+
+    /**
+     * 创建所在楼层的系统关系
+     *
+     * @param    rSyInFl    系统和楼层的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "所在楼层的系统,楼层一对多系统", notes = "必填项:sysIdList(系统id列表)、FloorId(楼层id),测方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyInFl: RFlInSyList): SCreateResponse<RSyInFl>{
+        logger.debug("floor = ${rSyInFl.toJson()}")
+        return  RSyInFlService.createsFl(rSyInFl)
+    } // Function createSy()
+
+    /**
+     * 创建系统所在楼层关系
+     *
+     * @param    rSyInFl    系统和楼层的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统所在楼层,系统一对多楼层,此方法不会覆盖", notes = "必填项:SysId(系统id)、FloorIdList(楼层id列表)")
+    @PostMapping(value = ["/link-fl-sy"])
+    fun createSyFl(@RequestBody rSyInFl: RSyInFlList): SCreateResponse<RSyInFl>{
+        logger.debug("floor = ${rSyInFl.toJson()}")
+        return RSyInFlService.createSyFl(rSyInFl)
+    } // Function createFl()
+
+} // Class RSyInFlController

+ 112 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInShController.kt

@@ -0,0 +1,112 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RShInSyList
+import com.persagy.server.datacenter.models.entities.rel.RSyInSh
+import com.persagy.server.datacenter.models.entities.rel.RSyInShList
+import com.persagy.server.services.rel.RSyInShService
+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
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统所在竖井
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["032、关系-系统所在竖井"])
+@RestController
+@RequestMapping("/rel/sy-in-sh")
+class RSyInShController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyInShController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统所在竖井关系
+     *
+     * @param    rSyInSh    系统和竖井的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "创建系统所在竖井关系", notes = "必填项:SysId(系统id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link"])
+    fun create(@RequestBody rSyInSh: RSyInSh): SCreateResponse<RSyInSh> {
+        logger.debug("shaft = ${rSyInSh.toJson()}")
+        return RSyInShService.create(rSyInSh)
+    } //Function create()
+
+    /**
+     * 根据对象删除
+     *
+     * @param     rSyInSh     对象
+     * @return                删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统所在竖井关系,只针对一个对象", notes = "必填项:SysId(系统id)、ShaftId(竖井id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(@RequestBody rSyInSh: RSyInSh): SBaseResponse {
+        return RSyInShService.deletes(rSyInSh)
+    } // Function delete()
+
+    /**
+     * 创建系统所在竖井关系
+     *
+     * @param    rSyInSh    系统和竖井的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统所在竖井,系统一对多,此方法会覆盖以前的记录", notes = "必填项:SysId(系统id)、ShaftIdList(竖井id列表),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sh"])
+    fun createSh(@RequestBody rSyInSh: RSyInShList): SCreateResponse<RSyInSh>{
+        logger.debug("shaft = ${rSyInSh.toJson()}")
+        return RSyInShService.createSy(rSyInSh)
+    } // Function createSh()
+
+    /**
+     * 创建所在竖井的系统关系
+     *
+     * @param     rSyInSh    系统和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "所在竖井的系统,竖井一对多,此方法会覆盖以前的记录", notes = "必填项:sysIdList(系统id列表)、ShaftId(竖井id),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy"])
+    fun createSy(@RequestBody rSyInSh: RShInSyList): SCreateResponse<RSyInSh>{
+        logger.debug("shaft = ${rSyInSh.toJson()}")
+        return  RSyInShService.createsSh(rSyInSh)
+    } // Function createSy()
+
+    /**
+     * 创建所在竖井的系统关系
+     *
+     * @param     rSyInSh    系统和竖井的关系对象
+     * @return               创建的结果信息
+     */
+    @ApiOperation(value = "系统所在的竖井,竖井一对多,累计添加,此方法不会覆盖以前记录", notes = "必填项:sysIdList(系统id列表)、ShaftId(竖井id)")
+    @PostMapping(value = ["/link-sy-sh"])
+    fun createSySh(@RequestBody rSyInSh: RShInSyList): SCreateResponse<RSyInSh>{
+        logger.debug("shaft = ${rSyInSh.toJson()}")
+        return  RSyInShService.createsShSys(rSyInSh)
+    } // Function createSy()
+
+
+    /**
+     * 创建系统所在竖井关系
+     *
+     * @param    rSyInSh    系统和竖井的关系对象
+     * @return              创建的结果信息
+     */
+    @ApiOperation(value = "系统所在竖井,系统一对多,不覆盖", notes = "必填项:SysId(系统id)、ShaftIdList(竖井id列表),此方法会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy-shs"])
+    fun createSyShs(@RequestBody rSyInSh: RSyInShList): SCreateResponse<RSyInSh>{
+        logger.debug("shaft = ${rSyInSh.toJson()}")
+        return RSyInShService.createSyShs(rSyInSh)
+    } // Function createSyShs()
+
+
+} // Class RSyInShController

+ 98 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RSyInSpController.kt

@@ -0,0 +1,98 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RSpInSyBaseList
+import com.persagy.server.datacenter.models.entities.rel.RSyInSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSyInSpBaseList
+import com.persagy.server.services.rel.RSyInSpBaseService
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 系统所在业务空间
+ *
+ * @author 张维新
+ */
+@Api(tags = ["033、关系-系统所在业务空间"])
+@RestController
+@RequestMapping("/rel/sy-in-sp-base")
+class RSyInSpController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RSyInSpController::class.java)
+    } // Companion object
+
+    /**
+     * 创建系统所在业务空间关系
+     *
+     * @param   rSyInSpBase   系统和业务空间的关系对象
+     * @return                创建的结果信息
+     */
+    @ApiOperation(value = "创建系统所在业务空间关系", notes = "必填项:SysID(系统id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/link-list"])
+    fun create( @RequestBody rSyInSpBase: SCreateRequest<RSyInSpBase>): SCreateResponse<RSyInSpBase> {
+        logger.debug("space =${rSyInSpBase.toJson()}")
+        return RSyInSpBaseService.create(rSyInSpBase)
+    } // Functio create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rSyInSpBase       对象
+     * @return                    删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除系统所在业务空间关系", notes = "必填项:SysID(系统id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/unlink-list"])
+    fun delete(type: String,@RequestBody rSyInSpBase: ArrayList<RSyInSpBase>): SBaseResponse {
+        return RSyInSpBaseService.deletes(type,rSyInSpBase)
+    } // Function delete()
+
+//    /**
+//     * 创建系统所在业务空间关系
+//     *
+//     * @param    rSyInSpBase    系统和业务空间的关系对象
+//     * @return                  创建的结果信息
+//     */
+//    @ApiOperation(value = "系统所在业务空间关系,系统一对多", notes = "必填项:SpaceIdList(业务空间id列表)、SysID(系统id),测方法会覆盖以前的记录")
+//    @PostMapping(value = ["/link-sp"])
+//    fun createSp(@RequestBody rSyInSpBase: RSyInSpBaseList): SCreateResponse<RSyInSpBase> {
+//        logger.debug("space =${rSyInSpBase.toJson()}")
+//        return RSyInSpBaseService.createSy(rSyInSpBase)
+//    } // Function createSp()
+
+    /**
+     * 创建系统所在的业务空间关系 此方法不会覆盖以前的记录,累计叠加
+     *
+     * @param   rSyInSpBase            系统和业务空间的关系对象
+     * @return                               创建的结果信息
+     */
+    @ApiOperation(value = " 处理所有空间分区和系统关系 系统所在的业务空间关系,空间分区一对多,累计叠加,不覆盖", notes = "必填项:SpaceId(业务空间id)、SysIDList(系统id列表),此方法不会覆盖以前的记录,累计叠加")
+    @PostMapping(value = ["/link-sp-sys"])
+    fun createsSpSys(type: String,@RequestBody rSyInSpBase: RSpInSyBaseList): SCreateResponse<RSpInSyBaseList> {
+        logger.debug("space =${rSyInSpBase.toJson()}")
+        return RSyInSpBaseService.createsSpSys(type,rSyInSpBase)
+    } // Function createSy()
+
+    /**
+     * 创建系统所在业务空间关系
+     *
+     * @param    rSyInSpBase    系统和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "系统所在业务空间关系,系统一对多,不覆盖", notes = "必填项:SpaceIdList(业务空间id列表)、SysID(系统id),此方法不会覆盖以前的记录")
+    @PostMapping(value = ["/link-sy-sps"])
+    fun createSySps(type: String,@RequestBody rSyInSpBase: RSyInSpBaseList): SCreateResponse<RSyInSpBaseList> {
+        logger.debug("space =${rSyInSpBase.toJson()}")
+        return RSyInSpBaseService.createSySps(type,rSyInSpBase)
+    } // Function createSySps()
+
+} // Class RSyInSpBaseController

+ 84 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RTnInSpController.kt

@@ -0,0 +1,84 @@
+package com.persagy.server.controllers.rel
+
+import com.persagy.server.datacenter.models.entities.rel.RTnInSpBase
+import com.persagy.server.datacenter.models.entities.rel.RTnInSpBaseList
+import com.persagy.server.services.rel.RTnInSpBaseService
+import com.persagy.base.extensions.toJson
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 租户所租用的业务空间
+ *
+ * @author 付国宝
+ */
+@Api(tags = ["034、关系-租户所租用的业务空间"])
+@RestController
+@RequestMapping("/rel/tn-in-sp-base")
+class RTnInSpController {
+
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RTnInSpController::class.java)
+    } // Companion object
+
+    /**
+     * 创建租户所租用的业务空间关系
+     *
+     * @param    rTnInSpBase    租户和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "创建租户所租用的业务空间关系", notes = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/link"])
+    fun create(type: String,@RequestBody rTnInSpBase: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
+        logger.debug("space =${rTnInSpBase.toJson()}")
+        return RTnInSpBaseService.create(type,rTnInSpBase)
+    } // Functio create()
+
+    /**
+     * 根据对象删除关系
+     *
+     * @param   rTnInSpBase      对象
+     * @return                   删除的结果信息
+     */
+    @ApiOperation(value = "根据对象删除租户所租用的业务空间关系", notes = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
+    @PostMapping(value = ["/unlink"])
+    fun delete(type: String,@RequestBody rTnInSpBase: ArrayList<RTnInSpBase>): SBaseResponse {
+        return RTnInSpBaseService.deletes(type,rTnInSpBase)
+    } // Function delete()
+
+    /**
+     * 创建租户所租用的业务空间关系
+     *
+     * @param    rTnInSpBase    租户和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+    @ApiOperation(value = "租户所租用的业务空间关系,租户一对多", notes = "必填项:SpaceIdList(业务空间id列表)、TenantID(租户id),此方法会覆盖以前的记录 ,type 空间类型")
+    @PostMapping(value = ["/link-sp"])
+    fun createSp(type: String,@RequestBody rTnInSpBase: RTnInSpBaseList): SCreateResponse<RTnInSpBase> {
+        logger.debug("space =${rTnInSpBase.toJson()}")
+        return RTnInSpBaseService.createTn(type,rTnInSpBase)
+    } // Function createSp()
+
+    /**
+     * 创建所租用的业务空间的租户关系
+     *
+     * @param    rTnInSpBase    租户和业务空间的关系对象
+     * @return                  创建的结果信息
+     */
+//    @ApiOperation(value = "所租用的业务空间的租户关系,业务空间一对多", notes = "必填项:SpaceId(业务空间id)、TenantIDList(租户id列表),测方法会覆盖以前的记录")
+//    @PostMapping(value = ["/link-tn"])
+//    fun createTn(@RequestBody rTnInSpBase: RSpInTnBaseList): SCreateResponse<RTnInSpBase> {
+//        logger.debug("space =${rTnInSpBase.toJson()}")
+//        return RTnInSpBaseService.createsSp(rTnInSpBase)
+//    } // Function createTn()
+
+} // Class RTnInSpBaseController

+ 33 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RUpDateEquipAndSapceController.kt

@@ -0,0 +1,33 @@
+package com.persagy.server.controllers.rel
+
+
+import com.persagy.server.datacenter.models.requests.RUpDateEquipAndSapceRequest
+import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
+import com.persagy.service.models.responses.SBaseResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 修改设备元空间的建筑楼层信息
+ *
+ * @author 张维新
+ */
+@Api(tags = ["039、模型修改设备元空间的建筑楼层信息"])
+@RestController
+@RequestMapping("/rel/update")
+class RUpDateEquipAndSapceController {
+
+    /**
+     * 修改模型的设备和元空间的设备建筑楼层信息
+     */
+    @ApiOperation(value = "模型修改模型的设备和元空间的设备建筑楼层信息", notes = "AttributeMap 中添加自定义属性例如 attributeMap["+"FloorElevation"+"]=20.3")
+    @PostMapping(value = ["/equip-ispace"])
+    fun upDateEquipAndSapce(@RequestBody rUpDateEquipAndSapceRequest: RUpDateEquipAndSapceRequest): SBaseResponse {
+    return RUpDateEquipAndSapceService.rUpDateEquipAndSapces(rUpDateEquipAndSapceRequest)
+    } // Function UpDateEquipAndSapce
+
+} // RUpDateEquipAndSapceController

+ 76 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt

@@ -0,0 +1,76 @@
+/*
+ * ********************************************************************************************************************
+ *
+ *                     :*$@@%$*:                         ;:                ;;    ;;
+ *                   :@@%!  :!@@%:                       %!             ;%%@@%$ =@@@@@@@%;     @%@@@%%%%@@@@@
+ *                  :@%;       :$=                       %%$$$%$$         ;$$  ;$@=   !@$
+ *                  =@!                                  %!              @ $=;%   !@@@%:      !$$$$$$$$$$$$$$=
+ *                  =@*                                  %!              @ $= % %@=   =%@!      %=
+ *             *$%%! @@=        ;=$%%%$*:                %!              @ $= % =%%%%%%@$      *%:         =%
+ *           %@@!:    !@@@%=$@@@@%!  :*@@$:              %!              @ $= % $*     ;@      @*          :%*
+ *         ;@@!          ;!!!;:         ;@%:      =======@%========*     @ $$ % $%*****$@     :@$=*********=@$
+ *         $@*   ;@@@%=!:                *@*
+ *         =@$    ;;;!=%@@@@=!           =@!
+ *          %@$:      =@%: :*@@@*       %@=                    Copyright (c) 2016-2019.  北京上格云技术有限公司
+ *           ;%@@$=$@@%*       *@@@$=%@@%;
+ *              ::;::             ::;::                                              All rights reserved.
+ *
+ * ********************************************************************************************************************
+ */
+
+package com.persagy.server.controllers.relation_calc
+
+import com.persagy.server.services.relation_calc.CalcSpecialService
+import com.persagy.service.models.responses.SBaseResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 关系计算-管网
+ *
+ * @author 邓婷婷
+ */
+@Api(tags = ["016、关系计算-管网接口"])
+@RestController
+@RequestMapping("/calc_special")
+open class CalcSpecialController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(CalcSpecialController::class.java)
+    } // Companion object
+
+    @Autowired
+    lateinit var service: CalcSpecialService
+
+    /**
+     * 管网系统设备分块  +  计算流向
+     *
+     * @param   SystemName  需要计算的系统名称
+     * @param   Domain      需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac
+     */
+    @ApiOperation(value = "管网系统设备分块", notes = "Domain 需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac;需要计算的building_id,如果没有提供时直接为空")
+    @PostMapping(value = ["/sys-block"])
+    fun sysBolck(relationType: String): SBaseResponse{
+        return service.sysBolck(relationType)
+    } // Function sysBolck()
+
+
+//    /**
+//     * 管网系统确定流向
+//     * @param   BlockId     需要计算的块id
+//     * @param   SystemName  需要计算的系统名称
+//     * @param   Domain      需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac
+//     * @param   isSource    跟据源或端计算:bool。true表示源,false表示端
+//     */
+//    @ApiOperation(value = "管网系统确定流向", notes = "Domain 需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac;需要计算的building_id,如果没有提供时直接为空;isSource 跟据源或端计算 true表示源,false表示端")
+//    @PostMapping(value = ["/sys-direction"])
+//    fun sysDirection(BuildingId: String?, BlockId: String, SystemName: String,Domain: String, isSource: Boolean): SBaseResponse{
+//        return service.sysDirection(BuildingId, BlockId, SystemName, Domain, isSource)
+//    } // Function sysDirection()
+
+} // Class CalcSpecialController

+ 75 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/ManualRelationCalcController.kt

@@ -0,0 +1,75 @@
+package com.persagy.server.controllers.relation_calc
+
+import com.persagy.server.datacenter.models.entities.graphtype.block.RelationAddRequest
+import com.persagy.server.datacenter.models.requests.ManualRelationCalcDel
+import com.persagy.server.datacenter.models.requests.ManualRelationCalcRequest
+import com.persagy.server.datacenter.models.response.ManualRelationCalcResponse
+import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
+import com.persagy.server.services.relation_calc.ManualRelationCalcService
+import com.persagy.service.models.responses.SBaseResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 手动计算
+ *
+ * @author 张维新
+ */
+@Api(tags = ["013、关系计算-手动计算"])
+@RestController
+@RequestMapping("/relation-manual-calc")
+class ManualRelationCalcController {
+
+    /**
+     * 服务
+     */
+    @Autowired
+    lateinit var service: ManualRelationCalcService
+
+    /**
+     * 查询关系数据
+     */
+    @ApiOperation(value = "查询关系数据", notes = "")
+    @PostMapping(value = ["/rel-query"])
+    fun query(@RequestBody manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
+        return service.query(manualRelationCalcRequest)
+    } // Fun
+
+    /**
+     * 添加关系
+     */
+    @ApiOperation(value = "添加关系", notes = "")
+    @PostMapping(value = ["/rel-add"])
+    fun addRels(@RequestBody relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
+        return service.addRel(relationAddRequest)
+    } // Fun
+
+    /**
+     * 删除关系
+     */
+    @ApiOperation(value = "删除关系", notes = "")
+    @PostMapping(value = ["/rel-del"])
+    fun delRels(@RequestBody manualRelationCalcDel: ManualRelationCalcDel): SBaseResponse {
+        return service.delRel(manualRelationCalcDel)
+    } // Fun
+
+} // Class ManualRelationCalcController
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 59 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt

@@ -0,0 +1,59 @@
+package com.persagy.server.controllers.relation_calc
+
+import com.persagy.server.datacenter.models.entities.graphtype.block.MepSourceTypeEntity
+import com.persagy.server.services.relation_calc.MepSystemCalcService
+import com.persagy.database.SFilter
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+
+/**
+ * 机电管网系统关系计算
+ *
+ * @author jxing
+ */
+@Api(tags = ["014、关系计算-管网计算"])
+@RestController
+@RequestMapping("/mep-system-calc")
+class MepSystemCalcController {
+
+    @Autowired
+    lateinit var mepSystemCalc: MepSystemCalcService
+
+    /**
+    * 添加源设备
+    */
+    @ApiOperation(value = "添加源设备", notes = "")
+    @PostMapping(value = ["/source/add"])
+    fun query(@RequestBody entity: SCreateRequest<MepSourceTypeEntity>): SCreateResponse<MepSourceTypeEntity> {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        var calcName : String? = null
+        entity.content.forEach {
+            if(it.projectId.isNullOrBlank())
+                it.projectId = projectId
+            calcName = it.calcName
+        }
+        // 删除以前卡片的源设备记录
+        mepSystemCalc.mepSourceTypeService.delete(SFilter.and(SFilter.eq("projectId", projectId), SFilter.eq("calcName", calcName!!)))
+        return mepSystemCalc.mepSourceTypeService.createList(entity)
+    } // Fun
+
+    /**
+     * 添加关系
+     */
+    @ApiOperation(value = "查看源设备", notes = "")
+    @PostMapping(value = ["/source/query"])
+    fun addRels(@RequestBody request: SQueryRequest): SQueryResponse<MepSourceTypeEntity> {
+        return mepSystemCalc.mepSourceTypeService.pageQuery(request)
+    } // Fun
+}

+ 294 - 0
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt

@@ -0,0 +1,294 @@
+package com.persagy.server.controllers.relation_calc
+
+import com.persagy.server.services.relation_calc.RelationCalcService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.responses.SBaseResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 关系计算
+ *
+ * @author  庞利祥 <sybotan@126.com>
+ */
+@Api(tags = ["015、关系计算"])
+@RestController
+@RequestMapping("/relation-calc")
+class RelationCalcController {
+    companion object {
+        /** 日志 */
+        private val logger = LoggerFactory.getLogger(RelationCalcController::class.java)
+    } // Companion object
+    @Autowired
+    lateinit var service: RelationCalcService
+
+    /**
+     * 建筑下的业务空间
+     *
+     * @param  objectTypes  参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开
+     */
+    @ApiOperation(value = "建筑下的业务空间", notes = "objectTypes 参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,DomesticWaterSupplyZone,NetworkZone,TenantZone,AirConditioningZone,FunctionZone,FireZone,SecurityZone,GeneralZone,PowerSupplyZone,LightingZone")
+    @PostMapping(value = ["/bd2sp"])
+    fun calcBd2Sp(objectTypes: String?): SBaseResponse {
+        logger.debug("calcBd2Sp --------------")
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.calcBd2Sp(objectTypes,projectId)
+    } // Function calcBd2Sp()
+
+    /**
+     * 设备所在建筑
+     */
+    @ApiOperation(value = "设备所在建筑", notes = "")
+    @PostMapping(value = ["/eq2bd"])
+    fun calcEq2Bd(relationType: String?): SBaseResponse {
+        logger.debug("calcEq2Bd --------------")
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.calcEq2Bd(projectId)
+    } // Function calcEq2Bd()
+
+    /**
+     * 设备所在楼层
+     */
+    @ApiOperation(value = "设备所在楼层", notes = "")
+    @PostMapping(value = ["/eq2fl"])
+    fun calcEq2Fl(): SBaseResponse{
+        logger.debug("calcEq2Fl --------------")
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.calcEq2Fl(projectId)
+    } // Function calcEq2Fl()
+
+
+    /**
+     * 设备所在竖井
+     */
+    @ApiOperation(value = "设备所在竖井", notes = "")
+    @PostMapping(value = ["/eq2sh"])
+    fun calcEq2Sh(): SBaseResponse {
+        logger.debug("calcEq2Sh --------------")
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.calcEq2Sh(projectId)
+    } // Function calcEq2Sh()
+
+    /**
+     * 设备所在业务空间
+     * @param   objectTypes tables 参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,DomesticWaterSupplyZone,NetworkZone,TenantZone,AirConditioningZone FunctionZone,FireZone,SecurityZone,GeneralZone,PowerSupplyZone,LightingZone
+     * @param   sign        是否要删除手动维护的关系(不填默认为false), boolean型, 值为true或false (true表示删除自动和手动维护的关系, false表示只删除自动计算的的关系)
+     */
+    @ApiOperation(value = "设备所在业务空间", notes = "objectTypes 参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,DomesticWaterSupplyZone,NetworkZone,TenantZone,AirConditioningZone,  " +
+            "FunctionZone,FireZone,SecurityZone,GeneralZone,PowerSupplyZone,LightingZone\n " +
+            "sign 是否要删除手动维护的关系(不填默认为false), boolean型, 值为true或false (true表示删除自动和手动维护的关系, false表示只删除自动计算的的关系)")
+    @PostMapping(value = ["/eq2sp_in"])
+    fun calcEq2Sp(objectTypes: String?): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcEq2Sp --------------  $projectId")
+        return service.calcEq2Sp(objectTypes,projectId, false)
+    } // Function calcEq2Sp()
+
+    /**
+     * 楼层贯通关系
+     *
+     * @param   sign1   表示r_fl_through_fl表中要被删除的sign值
+     * @param   sign2   同上 与sign1是逻辑或的关系
+     */
+    @ApiOperation(value = "楼层贯通关系", notes = "")
+    @PostMapping(value = ["/fl2fl"])
+    fun calcFl2Fl(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcFl2Fl --------------$projectId")
+        return service.calcFl2Fl(projectId)
+    } // Function calcFl2Fl()
+
+    /**
+     * 楼层下的业务空间
+     *
+     * @param  objectTypes  参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开
+     */
+    @ApiOperation(value = "楼层下的业务空间", notes = "objectTypes 参与计算的业务空间(为空表示所有业务空间类型),以英文逗号隔开 HeatingZone,CleanZone,DomesticWaterSupplyZone,NetworkZone,TenantZone,AirConditioningZone,FunctionZone,FireZone,SecurityZone,GeneralZone,PowerSupplyZone,LightingZone")
+    @PostMapping(value = ["/fl2sp"])
+    fun calcFl2Sp(objectTypes: String?): SBaseResponse {
+        logger.debug("calcFl2Sp --------------")
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.calcFl2Sp(objectTypes,projectId)
+    } // Function calcFl2Sp()
+
+    /**
+     * 资产所在建筑
+     */
+    @ApiOperation(value = "资产所在建筑", notes = "")
+    @PostMapping(value = ["/pe2bd"])
+    fun calcPe2Bd(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcPe2Bd --------------$projectId")
+        return service.calcPe2Bd(projectId)
+    } // Function calcPe2Bd()
+
+    /**
+     * 资产所在楼层
+     */
+    @ApiOperation(value = "资产所在楼层", notes = "")
+    @PostMapping(value = ["/pe2fl"])
+    fun calcPe2Fl(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcPe2Fl --------------$projectId")
+        return service.calcPe2Fl(projectId)
+    } // Function calcPe2Fl()
+
+    /**
+     * 资产所在竖井
+     */
+    @ApiOperation(value = "资产所在竖井", notes = "")
+    @PostMapping(value = ["/pe2sh"])
+    fun calcPe2Sh(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcPe2Sh --------------$projectId")
+        return service.calcPe2Sh(projectId)
+    } // Function property2Shaft()
+
+    /**
+     * 资产所在业务空间
+     */
+    @ApiOperation(value = "资产所在业务空间", notes = "")
+    @PostMapping(value = ["/pe2sp"])
+    fun calcPe2Sp(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcPe2Sp --------------$projectId")
+        return service.calcPe2Sp(projectId)
+    } // Function calcPe2Sp()
+
+    /**
+     * 建筑下的竖井
+     */
+    @ApiOperation(value = "建筑下的竖井", notes = "************************************************************")
+    @PostMapping(value = ["/sh2bd"])
+    fun calcSh2Bd(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSh2Bd --------------$projectId")
+        return service.calcSh2Bd(projectId)
+    } // Function calcSh2Bd()
+
+    /**
+     * 竖井贯通
+     */
+    @ApiOperation(value = "竖井贯通", notes = "")
+    @PostMapping(value = ["/sh2sh"])
+    fun calcSh2Sh(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSh2Sh --------------$projectId")
+        return service.calcSh2Sh(projectId)
+    } // Function calcSh2Sh()
+
+    /**
+     * 建筑下的系统设备部件
+     */
+    @ApiOperation(value = "建筑下的系统设备部件", notes = "")
+    @PostMapping(value = ["/syeq2bd"])
+    fun calcSyEq2Bd(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSyEq2Bd --------------$projectId")
+        return service.calcSyEq2Bd(projectId)
+    } // Function calcSyEq2Bd()
+
+    /**
+     * 系统所在建筑
+     */
+    @ApiOperation(value = "系统所在建筑", notes = "")
+    @PostMapping(value = ["/sy2bd"])
+    fun calcSy2Bd(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Bd --------------$projectId")
+        return service.calcSy2Bd(projectId)
+    } // Function calcSy2Bd()
+
+    /**
+     * 系统所在楼层
+     */
+    @ApiOperation(value = "系统所在楼层", notes = "")
+    @PostMapping(value = ["/sy2fl"])
+    fun calcSy2Fl(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Fl --------------$projectId")
+        return service.calcSy2Fl(projectId)
+    } // Function calcSy2Fl()
+
+    /**
+     * 系统所在竖井
+     */
+    @ApiOperation(value = "系统所在竖井", notes = "")
+    @PostMapping(value = ["/sy2sh"])
+    fun calcSy2Sh(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Sh --------------$projectId")
+        return service.calcSy2Sh(projectId)
+    } // Function calcSy2Sh()
+
+    /**
+     * 系统所在业务空间
+     */
+    @ApiOperation(value = "系统所在业务空间", notes = "")
+    @PostMapping(value = ["/sy2sp"])
+    fun calcSy2Sp(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Sp --------------$projectId")
+        return service.calcSy2Sp(projectId)
+    } // Function calcSy2Sp()
+
+    /**
+     * 空间普通交通
+     */
+    @ApiOperation(value = "空间普通交通", notes = "")
+    @PostMapping(value = ["/sp2sp_TrafficNetwork_1"])
+    fun sp2sp_TrafficNetwork_1(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Sp --------------$projectId")
+        return service.sp2spTransport(projectId)
+    } // Function sp2sp_TrafficNetwork_1()
+
+    /**
+     * 光照连通
+     */
+    @ApiOperation(value = "光照连通", notes = "")
+    @PostMapping(value = ["/sp2sp_RadiationNetwork_1"])
+    fun sp2spRadiationNetwork1(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Sp --------------$projectId")
+        return service.sp2spLight(projectId)
+    } // Function sp2spRadiationNetwork1()
+
+    /**
+    * 空气自然对流
+    */
+    @ApiOperation(value = "空气自然对流", notes = "")
+    @PostMapping(value = ["/sp2sp_ConvectionNetwork_1"])
+    fun sp2spConvectionNetwork1(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.sp2spConvection(projectId)
+    } // Fun
+
+    /**
+     * 空间连通
+     */
+    @ApiOperation(value = "空间连通", notes = "")
+    @PostMapping(value = ["/sp2sp_SpaceNeighborhood_5"])
+    fun sp2spV2(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        return service.sp2spV2(projectId)
+    } // Fun
+
+
+    /**
+     * 关系变化时标记需要处理的计算
+     */
+    @ApiOperation(value = "标记需要计算关系", notes = "")
+    @PostMapping(value = ["/sign"])
+    fun setMark(): SBaseResponse {
+        val projectId = SPageContext.getHeader("ProjectId").toString()
+        logger.debug("calcSy2Sp --------------$projectId")
+        return service.setMarks(projectId)
+    } // Function calcSy2Sp()
+
+} // Class RelationCalcController

+ 0 - 4
data-center/src/main/kotlin/com/persagy/server/services/a.java

@@ -1,4 +0,0 @@
-package com.persagy.server.services;
-
-public class a {
-}

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/assistant/ObjInfoService.kt

@@ -3,11 +3,11 @@ package com.persagy.server.services.assistant
 import com.persagy.server.datacenter.models.entities.assistant.ObjInfos
 import com.persagy.server.datacenter.models.entities.tool.ObjectBaseRequest
 import com.persagy.server.services.dict.PropertyDefProjectService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.base.extensions.toMap
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
+import com.persagy.base.extensions.toJson
+import com.persagy.base.extensions.toMap
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
 import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.*

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt

@@ -3,13 +3,13 @@ package com.persagy.server.services.assistant
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.requests.RUpDateEquipAndSapceRequest
 import com.persagy.server.services.objects.FloorService
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
 
 /**

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt

@@ -1,8 +1,8 @@
 package com.persagy.server.services.assistant
 
+import com.persagy.database.SFilter
 import com.persagy.server.datacenter.dao.mappers.SchemeMapper
 import com.persagy.server.services.objects.FloorService
-import com.sybotan.database.SFilter
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftBuildingService.kt

@@ -1,8 +1,8 @@
 package com.persagy.server.services.assistant
 
 import com.persagy.server.datacenter.models.entities.rel.ShaftBuilding
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 竖井和建筑关系服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/assistant/ShaftFloorService.kt

@@ -1,8 +1,8 @@
 package com.persagy.server.services.assistant
 
 import com.persagy.server.datacenter.models.entities.rel.ShaftFloor
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 竖井和楼层关系服务

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt

@@ -3,10 +3,10 @@ package com.persagy.server.services.assistant
 import com.persagy.server.datacenter.models.response.EqpeDefferentReqponse
 import com.persagy.server.datacenter.models.response.StatisticsCountResponse
 import com.persagy.server.mappers.StatisticsCountMapper
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SQueryResponse
 // import org.checkerframework.checker.units.qual.A
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt

@@ -1,5 +1,7 @@
 package com.persagy.server.services.assistant
 
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
@@ -10,11 +12,9 @@ import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
 import org.json.JSONObject
 
 /**

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/base/RService.kt

@@ -1,10 +1,10 @@
 package com.persagy.server.services.base
 
-import cn.sagacloud.server.synchronize.MessageHandler
+import com.persagy.database.SAbstractDao
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
-import com.sybotan.database.SAbstractDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.server.synchronize.MessageHandler
+import com.persagy.service.SObjectService
+import com.persagy.service.utils.SSpringContextUtil
 
 /**
  * 关系处理服务基类

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/base/Service.kt

@@ -1,19 +1,19 @@
 package com.persagy.server.services.base
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
-import cn.sagacloud.server.synchronize.MessageHandler
+import com.persagy.database.SAbstractDao
+import com.persagy.database.SFilter
+import com.persagy.database.extensions.keyValue
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.services.assistant.SchemeService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
-import com.sybotan.database.SAbstractDao
-import com.sybotan.database.SFilter
-import com.sybotan.database.extensions.keyValue
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.server.synchronize.MessageHandler
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.utils.SSpringContextUtil
 import org.json.JSONArray
 import org.json.JSONObject
 import org.slf4j.LoggerFactory

+ 9 - 9
data-center/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt

@@ -1,20 +1,20 @@
 package com.persagy.server.services.base
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
-import cn.sagacloud.server.synchronize.MessageHandler
+import com.persagy.server.synchronize.MessageHandler
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.services.assistant.SchemeService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
-import com.sybotan.database.SAbstractDao
-import com.sybotan.database.SFilter
-import com.sybotan.database.extensions.keyValue
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.SBaseEntity
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.database.SAbstractDao
+import com.persagy.database.SFilter
+import com.persagy.database.extensions.keyValue
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.SBaseEntity
+import com.persagy.service.utils.SSpringContextUtil
 import org.json.JSONArray
 import org.json.JSONObject
 import org.slf4j.LoggerFactory

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/dict/DClassDefService.kt

@@ -1,14 +1,14 @@
 package com.persagy.server.services.dict
 
+import com.persagy.database.SFilter
+import com.persagy.database.SPageQueryInfo
+import com.persagy.database.SQueryBuilder
+import com.persagy.database.functions.SLength
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.DClassDef
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.database.SPageQueryInfo
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.database.functions.SLength
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SQueryResponse
 
 /**
  * 字典头部信息服务

+ 9 - 9
data-center/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt

@@ -1,16 +1,16 @@
 package com.persagy.server.services.dict
 
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.*
 import com.persagy.server.services.base.Service
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import org.slf4j.LoggerFactory
 
 /**

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictAirConditionerService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictAirConditioner
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 空调类型信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingDirectService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictDirection
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 建筑朝向信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingFunctionalService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictBuildingFunctional
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 建筑功能类型信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictBuildingStructureTypeService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictBuildingStructureType
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 建筑结构类型信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictClimateService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictClimate
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 气候区信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictDevelopService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictDevelop
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 发展水平代码信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictFloorTypeService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictFloorType
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 楼层性质信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictGreenBuildLevService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictGreenBuildLev
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 绿建等级信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictHeatingTypeService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictHeatingType
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 采暖类型信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictInsulateTypeService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictInsulateType
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 保温类型信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictProvincialCityCodeService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictProvincialCityCode
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 省市区代码信息服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceFunctionalTypesService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictSpaceFunctionalTypes
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 空间功能类型信息服务

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt

@@ -2,14 +2,14 @@ package com.persagy.server.services.dict
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import com.persagy.server.datacenter.models.entities.dict.DictSpaceProject
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 
 /**
  * 项目级空间类型

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DictWindService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DictWind
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 空气风力等级状况服务

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/dict/DitcWeatherService.kt

@@ -21,8 +21,8 @@
 package com.persagy.server.services.dict
 
 import com.persagy.server.datacenter.models.entities.dict.DitcWeather
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
 
 /**
  * 天气状况信息服务

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/dict/EquipFamilyService.kt

@@ -1,12 +1,12 @@
 package com.persagy.server.services.dict
 
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.services.base.Service
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SQueryResponse
 
 /**
  * 设备和族的关系

+ 11 - 11
data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt

@@ -1,19 +1,19 @@
 package com.persagy.server.services.dict
 
-import com.persagy.server.utils.RecursiveQuery
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.database.SQueryBuilder
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.*
 import com.persagy.server.datacenter.models.response.*
 import com.persagy.server.services.base.Service
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.server.utils.RecursiveQuery
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 import org.slf4j.LoggerFactory
 import java.util.concurrent.Executors
 

+ 12 - 12
data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt

@@ -1,20 +1,20 @@
 package com.persagy.server.services.dict
 
-import com.persagy.server.utils.RecursiveQuery
+import com.persagy.base.extensions.toJson
+import com.persagy.base.utils.SJsonUtil
+import com.persagy.database.SFilter
+import com.persagy.database.functions.SLength
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.*
 import com.persagy.server.datacenter.models.response.AllDictCategory
 import com.persagy.server.services.base.Service
-import com.sybotan.base.extensions.toJson
-import com.sybotan.base.utils.SJsonUtil
-import com.sybotan.database.SFilter
-import com.sybotan.database.functions.SLength
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.server.utils.RecursiveQuery
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 
 /**
  * 数据字典说明

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/graphtype/BaseDataService.kt

@@ -3,8 +3,8 @@ package com.persagy.server.services.graphtype
 import com.persagy.server.datacenter.models.entities.graphtype.MDoor
 import com.persagy.server.datacenter.models.entities.graphtype.MVirtualWall
 import com.persagy.server.datacenter.models.entities.graphtype.MWindow
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
 
 /**
  *

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt

@@ -5,11 +5,11 @@ import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBl
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockItem
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockResponse
 import com.persagy.server.services.dict.EquipFamilyService
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 import org.slf4j.LoggerFactory
 
 /**

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

@@ -3,11 +3,11 @@ package com.persagy.server.services.graphtype
 import com.persagy.server.services.base.RService
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSource
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSourceRequest
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SCreateResponse
 import org.slf4j.LoggerFactory
 
 /**

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt

@@ -9,11 +9,11 @@ import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.objects.PropertyService
 import com.persagy.server.services.rel.RSyInBdService
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SQueryResponse
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeService.kt

@@ -4,14 +4,14 @@ import com.persagy.server.datacenter.models.entities.graphtype.GraphicType
 import com.persagy.server.datacenter.models.entities.graphtype.RelationType
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.services.base.RService
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.SCascadeQuery
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.SCascadeQuery
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 import org.slf4j.LoggerFactory
 import java.util.*
 

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -5,13 +5,13 @@ import cn.sagacloud.server.datacenter.utils.IdUtils
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.mappers.IRelationExcelExportMapper
 import com.persagy.server.mappers.IRelationExcelImportMapper
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.utils.SSpringContextUtil
 import org.apache.poi.xssf.usermodel.XSSFSheet
 import org.apache.poi.xssf.usermodel.XSSFWorkbook
 import org.slf4j.LoggerFactory

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/objects/BuildingService.kt

@@ -22,12 +22,12 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
+import com.persagy.service.SPageContext
 import java.util.*
 
 /**

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt

@@ -22,14 +22,14 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.database.SFilter
+import com.persagy.database.SQueryBuilder
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
+import com.persagy.service.SPageContext
 
 /**
  * 部件信息服务

+ 11 - 11
data-center/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -22,24 +22,24 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
-import cn.sagacloud.server.scanbuilding.UserLog
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.database.SQueryBuilder
+import com.persagy.database.extensions.keyValue
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.ObjInfos
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.database.extensions.keyValue
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SQueryResponse
 import org.json.JSONArray
 import org.json.JSONObject
 import org.slf4j.LoggerFactory

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt

@@ -22,18 +22,18 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import org.json.JSONArray
 import org.json.JSONObject
 

+ 12 - 13
data-center/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt

@@ -22,6 +22,10 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.database.SQueryBuilder
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
 import com.persagy.server.datacenter.models.entities.dict.DClassDef
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
@@ -37,18 +41,14 @@ import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.rel.RSyInBdService
 import com.persagy.server.services.rel.RSyInFlService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import org.json.JSONObject
 
 /**
@@ -58,7 +58,6 @@ import org.json.JSONObject
  */
 object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::class.java)) {
 
-
     /** 对象查询 */
     val defService = SBaseService(SMybatisDao(DClassDef::class.java))
 

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt

@@ -3,14 +3,14 @@ package com.persagy.server.services.objects
 import com.persagy.server.services.base.RService
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.scanbuilding.User
-import cn.sagacloud.server.scanbuilding.UserLog
+import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.datacenter.models.entities.assistant.PointImage
 import com.persagy.server.datacenter.models.entities.objects.LocationPoint
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
 import org.slf4j.LoggerFactory
 
 /**

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/objects/ProjectService.kt

@@ -20,9 +20,9 @@
 
 package com.persagy.server.services.objects
 
-import com.persagy.server.services.base.Service
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.objects.Project
-import com.sybotan.mybatis.SMybatisDao
+import com.persagy.server.services.base.Service
 import org.slf4j.LoggerFactory
 
 /**

+ 7 - 8
data-center/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt

@@ -23,19 +23,18 @@ package com.persagy.server.services.objects
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
 import cn.sagacloud.server.scanbuilding.User
-import cn.sagacloud.server.scanbuilding.UserLog
-
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.database.SQueryBuilder
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
+import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.dict.EquipFamilyService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.database.SQueryBuilder
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
 
 /**
  * 资产信息服务

+ 12 - 12
data-center/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -2,10 +2,13 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
-import cn.sagacloud.server.synchronize.MessageHandler
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.persagy.base.utils.SJsonUtil
+import com.persagy.database.SFilter
+import com.persagy.database.SPageQueryInfo
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.ShaftFuncType
 import com.persagy.server.datacenter.models.entities.assistant.ShaftWithCount
 import com.persagy.server.datacenter.models.entities.dict.DataDictionaryDescription
@@ -15,17 +18,14 @@ import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.server.datacenter.models.entities.task.FloorDic
 import com.persagy.server.services.base.Service
-import com.sybotan.base.utils.SJsonUtil
-import com.sybotan.database.SFilter
-import com.sybotan.database.SPageQueryInfo
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.server.synchronize.MessageHandler
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SQueryResponse
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RequestBody
 import java.util.*

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/objects/SpaceService.kt

@@ -22,15 +22,15 @@ package com.persagy.server.services.objects
 
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SQueryResponse
 
 /**
  * 模型空间信息服务

+ 7 - 9
data-center/src/main/kotlin/com/persagy/server/services/objects/TenantService.kt

@@ -3,23 +3,21 @@ package com.persagy.server.services.objects
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.IdUtils.tenantIdCreate
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
 import com.persagy.server.datacenter.models.entities.objects.Tenant
 import com.persagy.server.datacenter.models.entities.objects.TenantWithCount
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.responses.SQueryResponse
 import org.springframework.web.bind.annotation.RequestBody
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * 租户信息服务

+ 13 - 13
data-center/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -21,10 +21,12 @@
 package com.persagy.server.services.objects
 
 
-import com.persagy.server.services.base.ServiceSpace
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.ShaftNameUtil
-import cn.sagacloud.server.scanbuilding.UserLog
+import com.persagy.base.extensions.toDouble
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.DictSpaceProject
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.objects.Building
@@ -34,21 +36,19 @@ import com.persagy.server.datacenter.models.entities.rel.RSpinFl
 import com.persagy.server.datacenter.models.requests.DCSQueryRequest
 import com.persagy.server.datacenter.models.requests.UpDataFloorAndBuildingRequests
 import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
+import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.assistant.ObjInfoService
+import com.persagy.server.services.base.ServiceSpace
 import com.persagy.server.services.dict.DClassDefService
 import com.persagy.server.services.rel.RSpInBdService
 import com.persagy.server.services.rel.RSpInFlService
-import com.sybotan.base.extensions.toDouble
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SBaseService
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SQueryResponse
 import org.json.JSONObject
 import org.slf4j.LoggerFactory
 

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/rel/REq2SpService.kt

@@ -1,11 +1,11 @@
 package com.persagy.server.services.rel
 
-import cn.sagacloud.server.synchronize.MessageHandler
+import com.persagy.server.synchronize.MessageHandler
 import com.persagy.server.datacenter.models.entities.rel.REq2Sp
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SObjectService
-import com.sybotan.service.SPageContext
-import com.sybotan.service.utils.SSpringContextUtil
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.utils.SSpringContextUtil
 import org.json.JSONObject
 
 object REq2SpService: SObjectService<REq2Sp>(SMybatisDao(REq2Sp::class.java)) {

+ 35 - 32
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt

@@ -1,15 +1,15 @@
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.rel.RBdForEqList
-import com.persagy.server.datacenter.models.entities.rel.REqForBd
+import com.persagy.server.datacenter.models.entities.rel.REq2Bd
 import com.persagy.server.datacenter.models.entities.rel.REqForBdList
-import com.sybotan.base.extensions.toJson
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.server.services.base.RService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import org.json.JSONObject
 
 /**
@@ -17,26 +17,27 @@ import org.json.JSONObject
  *
  * @author 张维新
  */
-object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
+object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
 
 
     /**
      * 创建设备服务于建筑关系
      *
-     * @param   rEqForBd    设备服务于建筑关系对象
+     * @param   req2Bd    设备服务于建筑关系对象
      */
-    fun create(rEqForBd: REqForBd): SCreateResponse<REqForBd> {
+    fun create(req2Bd: REq2Bd): SCreateResponse<REq2Bd> {
         return try {
             val projectId = SPageContext.getHeader("ProjectId")
-            rEqForBd.projectId = projectId
-            val isInsert = insert(rEqForBd)
+            req2Bd.projectId = projectId
+            req2Bd.type = "eq2bd_for"
+            val isInsert = insert(req2Bd)
             if (isInsert){
                 val jsonObject = JSONObject()
                 jsonObject.put("type", "11")
                 jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rEqForBd.equipId)
+                jsonObject.put("id", req2Bd.id1)
                 jsonObject.put("obj_type", "Eq2Bd")
-                jsonObject.put("linkId",rEqForBd.buildingId)
+                jsonObject.put("linkId",req2Bd.id2)
 
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
@@ -54,27 +55,27 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
     /**
      * 根据对象删除
      *
-     * @param    rEqForBd     关系对象实例
+     * @param    req2Bd     关系对象实例
      * @return
      */
-    fun deletes(rEqForBd: REqForBd): SBaseResponse {
+    fun deletes(req2Bd: REq2Bd): SBaseResponse {
         return try {
             val projectId = SPageContext.getHeader("ProjectId")
-            val isDelete = delete(rEqForBd)
+            val isDelete = delete(req2Bd)
             /** 删除成功 */
             if (isDelete) {
                 val jsonObject = JSONObject()
                 jsonObject.put("type", "12")
                 jsonObject.put("projectId", projectId)
-                jsonObject.put("id", rEqForBd.equipId)
+                jsonObject.put("id", req2Bd.id1)
                 jsonObject.put("obj_type", "Eq2Bd")
-                jsonObject.put("linkId",rEqForBd.buildingId)
+                jsonObject.put("linkId",req2Bd.id2)
 
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
 
                 val sBaseResponse = SBaseResponse(SResponseType.success)
-                sBaseResponse.message = rEqForBd.toJson()
+                sBaseResponse.message = req2Bd.toJson()
                 sBaseResponse
             } else {
                 SBaseResponse(SResponseType.failure)
@@ -90,7 +91,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
      *
      * @param    rEqForBdList     设备和建筑关系的对象列表
      */
-    fun createEq(rEqForBdList: REqForBdList): SCreateResponse<REqForBd> {
+    fun createEq(rEqForBdList: REqForBdList): SCreateResponse<REq2Bd> {
         return try {
             /** 成功集合 */
             val successList = ArrayList<Any>()
@@ -99,10 +100,11 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
             delete("equipID = '${rEqForBdList.equipId}'")
             val projectId = SPageContext.getHeader("ProjectId")
             for (buildingId in rEqForBdList.buildingIdList!!){
-                val rEqForBd = REqForBd()
-                rEqForBd.equipId = rEqForBdList.equipId
-                rEqForBd.buildingId = buildingId
+                val rEqForBd = REq2Bd()
+                rEqForBd.id1 = rEqForBdList.equipId
+                rEqForBd.id2 = buildingId
                 rEqForBd.projectId = projectId
+                rEqForBd.type = "eq2bd_for"
                 val replace = replace(rEqForBd)
                 if (replace){
                     successList.add(rEqForBd)
@@ -120,7 +122,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 /** 发送消息 */
                 messageHandler.sendMessage(jsonObject.toString())
 
-                val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
+                val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
                 if (failureList.size>0){
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
                 }
@@ -139,7 +141,7 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
      *
      * @param    rEqForBdList    设备和建筑关系的对象列表
      */
-    fun createsBd(rEqForBdList: RBdForEqList): SCreateResponse<REqForBd> {
+    fun createsBd(rEqForBdList: RBdForEqList): SCreateResponse<REq2Bd> {
         return try {
             /** 成功集合 */
             val successList = ArrayList<Any>()
@@ -148,10 +150,11 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
             delete("buildingID = '${rEqForBdList.buildingId}'")
             val projectId = SPageContext.getHeader("ProjectId")
             for (equipId in rEqForBdList.equipIdList!!){
-                val rEqForBd = REqForBd()
-                rEqForBd.buildingId = rEqForBdList.buildingId
-                rEqForBd.equipId = equipId
+                val rEqForBd = REq2Bd()
+                rEqForBd.id2 = rEqForBdList.buildingId
+                rEqForBd.id1 = equipId
                 rEqForBd.projectId = projectId
+                rEqForBd.type = "eq2bd_for"
                 val replace = replace(rEqForBd)
                 if (replace){
                     successList.add(rEqForBd)
@@ -170,11 +173,11 @@ object REqForBdService: RService<REqForBd>(SMybatisDao(REqForBd::class.java)) {
                 messageHandler.sendMessage(jsonObject.toString())
 
                 if (failureList.size>0){
-                    val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
+                    val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()
                     sCreateResponse
                 }else{
-                    val sCreateResponse = SCreateResponse<REqForBd>(SResponseType.success)
+                    val sCreateResponse = SCreateResponse<REq2Bd>(SResponseType.success)
                     sCreateResponse
                 }
             }else{

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForFlService.kt

@@ -4,12 +4,12 @@ import com.persagy.server.datacenter.models.entities.rel.REqForFl
 import com.persagy.server.datacenter.models.entities.rel.REqForFlList
 import com.persagy.server.datacenter.models.entities.rel.RFlForEqList
 import com.persagy.server.services.base.RService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import org.json.JSONObject
 
 /**

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForShService.kt

@@ -4,12 +4,12 @@ import com.persagy.server.datacenter.models.entities.rel.REqForSh
 import com.persagy.server.datacenter.models.entities.rel.REqForShList
 import com.persagy.server.datacenter.models.entities.rel.RShForEqList
 import com.persagy.server.services.base.RService
-import com.sybotan.base.extensions.toJson
-import com.sybotan.mybatis.SMybatisDao
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.enums.SResponseType
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCreateResponse
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import org.json.JSONObject
 
 /**

+ 563 - 0
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt

@@ -0,0 +1,563 @@
+package com.persagy.server.services.rel
+
+import com.persagy.server.datacenter.models.entities.rel.REq2Sp
+import com.persagy.server.datacenter.models.entities.rel.REqForSpBase
+import com.persagy.server.datacenter.models.entities.rel.RSpForEqBaseList
+import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import org.json.JSONObject
+
+/**
+ * 设备服务于业务空间关系服务
+ *
+ * @author 付国宝
+ */
+object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase::class.java)){
+
+
+    var rEq2SpService = SObjectService(SMybatisDao( REq2Sp::class.java))
+
+    /**
+     * 创建设备服务于空间关系
+     *
+     * @param    rEqForSpBase    设备服务于空间关系对象
+     */
+    fun create(type: String, rEqForSpBase: SCreateRequest<REqForSpBase>): SCreateResponse<REqForSpBase> {
+        return try {
+            val projectId = SPageContext.getHeader("ProjectId")
+
+            for (rEqForSp in rEqForSpBase.content){
+
+                try {
+                    val rEq2Sp = REq2Sp()
+                    rEq2Sp.id1 = rEqForSp.equipId
+                    rEq2Sp.id2 = rEqForSp.spaceId
+                    rEq2Sp.projectId =projectId
+                    rEq2Sp.sign = 1
+                    rEq2Sp.zoneType = type
+                    rEq2Sp.type = "eq2sp_for"
+                    val isInsert = rEq2SpService.insert(rEq2Sp)
+                    if (isInsert){
+                        val jsonObject = JSONObject()
+                        jsonObject.put("type", "11")
+                        jsonObject.put("projectId", projectId)
+                        jsonObject.put("id", rEqForSp.spaceId)
+                        jsonObject.put("obj_type", "EquipforSpace")
+                        jsonObject.put("linkId",rEqForSp.equipId)
+
+                        /** 发送消息 */
+                        RService.messageHandler.sendMessage(jsonObject.toString())
+//                        kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipforSpace", "11", IdUtils.uuidCreate(), rEqForSpZoneHeating.spaceId!!,rEqForSpZoneHeating.equipId),false)
+                    }else{
+
+                    }
+                }catch (e: Exception){
+                    e.printStackTrace()
+                }
+            }
+            SCreateResponse(SResponseType.success)
+
+
+//            if (type == "HeatingZone"){
+//                val list = ArrayList<REqForSpZoneHeating>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneHeating = REqForSpZoneHeating()
+//                    rEqForSpZoneHeating.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneHeating.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneHeating.projectId =projectId
+//
+//                    list.add(rEqForSpZoneHeating)
+//                }
+//                REqForSpZoneHeatingService.create(list)
+//            }else if (type == "CleanZone"){
+//                val list = ArrayList<REqForSpZoneClean>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneClean = REqForSpZoneClean()
+//                    rEqForSpZoneClean.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneClean.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneClean.projectId =projectId
+//
+//                    list.add(rEqForSpZoneClean)
+//                }
+//                REqForSpZoneCleanService.create(list)
+//            }else if (type == "DomesticWaterSupplyZone"){
+//                val list = ArrayList<REqForSpZoneDomesticWaterSupply>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneDomesticWaterSupply = REqForSpZoneDomesticWaterSupply()
+//                    rEqForSpZoneDomesticWaterSupply.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneDomesticWaterSupply.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneDomesticWaterSupply.projectId =projectId
+//
+//                    list.add(rEqForSpZoneDomesticWaterSupply)
+//                }
+//                REqForSpZoneDomesticWaterSupplyService.create(list)
+//            }else if (type == "NetworkZone" ){
+//                val list = ArrayList<REqForSpZoneNetwork>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneNetwork = REqForSpZoneNetwork()
+//                    rEqForSpZoneNetwork.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneNetwork.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneNetwork.projectId =projectId
+//
+//                    list.add(rEqForSpZoneNetwork)
+//                }
+//                REqForSpZoneNetworkService.create(list)
+//            }else if (type == "TenantZone"){
+//                val list = ArrayList<REqForSpZoneTenant>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneTenant = REqForSpZoneTenant()
+//                    rEqForSpZoneTenant.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneTenant.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneTenant.projectId =projectId
+//
+//                    list.add(rEqForSpZoneTenant)
+//                }
+//                REqForSpZoneTenantService.create(list)
+//            }else if (type == "AirConditioningZone"){
+//                val list = ArrayList<REqForSpZoneAirConditioning>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneAirConditioning = REqForSpZoneAirConditioning()
+//                    rEqForSpZoneAirConditioning.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneAirConditioning.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneAirConditioning.projectId =projectId
+//
+//                    list.add(rEqForSpZoneAirConditioning)
+//                }
+//                REqForSpZoneAirConditioningService.create(list)
+//            }else if (type == "FunctionZone"){
+//                val list = ArrayList<REqForSpZoneFunction>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneFunction = REqForSpZoneFunction()
+//                    rEqForSpZoneFunction.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneFunction.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneFunction.projectId =projectId
+//
+//                    list.add(rEqForSpZoneFunction)
+//                }
+//                REqForSpZoneFunctionService.create(list)
+//            }else if (type == "FireZone"){
+//                val list = ArrayList<REqForSpZoneFire>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneFire = REqForSpZoneFire()
+//                    rEqForSpZoneFire.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneFire.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneFire.projectId =projectId
+//
+//                    list.add(rEqForSpZoneFire)
+//                }
+//                REqForSpZoneFireService.create(list)
+//            }else if (type == "SecurityZone"){
+//                val list = ArrayList<REqForSpZoneSecurity>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneSecurity = REqForSpZoneSecurity()
+//                    rEqForSpZoneSecurity.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneSecurity.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneSecurity.projectId =projectId
+//
+//                    list.add(rEqForSpZoneSecurity)
+//                }
+//                REqForSpZoneSecurityService.create(list)
+//            }else if (type == "GeneralZone"){
+//                val list = ArrayList<REqForSpZoneGeneral>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneGeneral = REqForSpZoneGeneral()
+//                    rEqForSpZoneGeneral.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneGeneral.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneGeneral.projectId =projectId
+//
+//                    list.add(rEqForSpZoneGeneral)
+//                }
+//                REqForSpZoneGeneralService.create(list)
+//            }else if (type == "PowerSupplyZone"){
+//                val list = ArrayList<REqForSpZonePowerSupply>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZonePowerSupply = REqForSpZonePowerSupply()
+//                    rEqForSpZonePowerSupply.equipId = rEqForSpBase.equipId
+//                    rEqForSpZonePowerSupply.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZonePowerSupply.projectId =projectId
+//
+//                    list.add(rEqForSpZonePowerSupply)
+//                }
+//                REqForSpZonePowerSupplyService.create(list)
+//            }else if (type == "LightingZone"){
+//                val list = ArrayList<REqForSpZoneLighting>()
+//                for (rEqForSpBase in rEqForSpBase.content){
+//                    val rEqForSpZoneLighting = REqForSpZoneLighting()
+//                    rEqForSpZoneLighting.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneLighting.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneLighting.projectId =projectId
+//
+//                    list.add(rEqForSpZoneLighting)
+//                }
+//                REqForSpZoneLightingService.create(list)
+//            }else{
+//                val sCreateResponse = SCreateResponse<REqForSpBase>(SResponseType.failure)
+//                sCreateResponse.message = "空间分区类型不存在:$type"
+//                sCreateResponse
+//            }
+        } catch (e: Exception){
+            e.printStackTrace()
+            SCreateResponse(SResponseType.failure,e.message.toString())
+        }
+    } //Function create()
+
+    /**
+     * 根据对象删除
+     *
+     * @param    rEqForSpBaseList    关系对象实例
+     */
+    fun deletes(type: String, rEqForSpBaseList: ArrayList<REqForSpBase>): SBaseResponse {
+        return try {
+
+            val projectId = SPageContext.getHeader("ProjectId")
+            for (rEqForSpBase in rEqForSpBaseList){
+                try {
+                    /** 删除成功 */
+                    val rEq2Sp = REq2Sp()
+                    rEq2Sp.projectId = projectId
+                    rEq2Sp.id1 = rEqForSpBase.equipId
+                    rEq2Sp.id2 = rEqForSpBase.spaceId
+                    rEq2Sp.zoneType = type
+                    rEq2Sp.type = "eq2sp_for"
+                    val isDelete = rEq2SpService.delete(rEq2Sp)
+                    if (isDelete) {
+                        val jsonObject = JSONObject()
+                        jsonObject.put("type", "12")
+                        jsonObject.put("projectId", projectId)
+                        jsonObject.put("id", rEqForSpBase.spaceId)
+                        jsonObject.put("obj_type", "EquipforSpace")
+                        jsonObject.put("linkId",rEqForSpBase.equipId)
+
+                        /** 发送消息 */
+                        RService.messageHandler.sendMessage(jsonObject.toString())
+    //                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipforSpace", "12", IdUtils.uuidCreate(), rEqForSpZoneHeating.spaceId!!,rEqForSpZoneHeating.equipId),false)
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+
+            SBaseResponse(SResponseType.success)
+
+//            if (type == "HeatingZone"){
+//                val list = ArrayList<REqForSpZoneHeating>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneHeating = REqForSpZoneHeating()
+//                    rEqForSpZoneHeating.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneHeating.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneHeating.projectId =projectId
+//
+//                    list.add(rEqForSpZoneHeating)
+//                }
+//                REqForSpZoneHeatingService.deleteByKeysList(list)
+//            }else if (type == "CleanZone"){
+//                val list = ArrayList<REqForSpZoneClean>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneClean = REqForSpZoneClean()
+//                    rEqForSpZoneClean.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneClean.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneClean.projectId =projectId
+//
+//                    list.add(rEqForSpZoneClean)
+//                }
+//                REqForSpZoneCleanService.deleteByKeysList(list)
+//            }else if (type == "DomesticWaterSupplyZone"){
+//                val list = ArrayList<REqForSpZoneDomesticWaterSupply>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneDomesticWaterSupply = REqForSpZoneDomesticWaterSupply()
+//                    rEqForSpZoneDomesticWaterSupply.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneDomesticWaterSupply.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneDomesticWaterSupply.projectId =projectId
+//
+//                    list.add(rEqForSpZoneDomesticWaterSupply)
+//                }
+//                REqForSpZoneDomesticWaterSupplyService.deleteByKeysList(list)
+//            }else if (type == "NetworkZone" ){
+//                val list = ArrayList<REqForSpZoneNetwork>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneNetwork = REqForSpZoneNetwork()
+//                    rEqForSpZoneNetwork.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneNetwork.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneNetwork.projectId =projectId
+//
+//                    list.add(rEqForSpZoneNetwork)
+//                }
+//                REqForSpZoneNetworkService.deleteByKeysList(list)
+//            }else if (type == "TenantZone"){
+//                val list = ArrayList<REqForSpZoneTenant>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneTenant = REqForSpZoneTenant()
+//                    rEqForSpZoneTenant.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneTenant.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneTenant.projectId =projectId
+//
+//                    list.add(rEqForSpZoneTenant)
+//                }
+//                REqForSpZoneTenantService.deleteByKeysList(list)
+//            }else if (type == "AirConditioningZone"){
+//                val list = ArrayList<REqForSpZoneAirConditioning>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneAirConditioning = REqForSpZoneAirConditioning()
+//                    rEqForSpZoneAirConditioning.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneAirConditioning.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneAirConditioning.projectId =projectId
+//
+//                    list.add(rEqForSpZoneAirConditioning)
+//                }
+//                REqForSpZoneAirConditioningService.deleteByKeysList(list)
+//            }else if (type == "FunctionZone"){
+//                val list = ArrayList<REqForSpZoneFunction>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneFunction = REqForSpZoneFunction()
+//                    rEqForSpZoneFunction.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneFunction.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneFunction.projectId =projectId
+//
+//                    list.add(rEqForSpZoneFunction)
+//                }
+//                REqForSpZoneFunctionService.deleteByKeysList(list)
+//            }else if (type == "FireZone"){
+//                val list = ArrayList<REqForSpZoneFire>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneFire = REqForSpZoneFire()
+//                    rEqForSpZoneFire.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneFire.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneFire.projectId =projectId
+//
+//                    list.add(rEqForSpZoneFire)
+//                }
+//                REqForSpZoneFireService.deleteByKeysList(list)
+//            }else if (type == "SecurityZone"){
+//                val list = ArrayList<REqForSpZoneSecurity>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneSecurity = REqForSpZoneSecurity()
+//                    rEqForSpZoneSecurity.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneSecurity.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneSecurity.projectId =projectId
+//
+//                    list.add(rEqForSpZoneSecurity)
+//                }
+//                REqForSpZoneSecurityService.deleteByKeysList(list)
+//            }else if (type == "GeneralZone"){
+//                val list = ArrayList<REqForSpZoneGeneral>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneGeneral = REqForSpZoneGeneral()
+//                    rEqForSpZoneGeneral.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneGeneral.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneGeneral.projectId =projectId
+//
+//                    list.add(rEqForSpZoneGeneral)
+//                }
+//                REqForSpZoneGeneralService.deleteByKeysList(list)
+//            }else if (type == "PowerSupplyZone"){
+//                val list = ArrayList<REqForSpZonePowerSupply>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZonePowerSupply = REqForSpZonePowerSupply()
+//                    rEqForSpZonePowerSupply.equipId = rEqForSpBase.equipId
+//                    rEqForSpZonePowerSupply.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZonePowerSupply.projectId =projectId
+//
+//                    list.add(rEqForSpZonePowerSupply)
+//                }
+//                REqForSpZonePowerSupplyService.deleteByKeysList(list)
+//            }else if (type == "LightingZone"){
+//                val list = ArrayList<REqForSpZoneLighting>()
+//                for (rEqForSpBase in rEqForSpBaseList){
+//                    val rEqForSpZoneLighting = REqForSpZoneLighting()
+//                    rEqForSpZoneLighting.equipId = rEqForSpBase.equipId
+//                    rEqForSpZoneLighting.spaceId = rEqForSpBase.spaceId
+//                    rEqForSpZoneLighting.projectId =projectId
+//
+//                    list.add(rEqForSpZoneLighting)
+//                }
+//                REqForSpZoneLightingService.deleteByKeysList(list)
+//            }else{
+//                val sCreateResponse = SBaseResponse(SResponseType.failure)
+//                sCreateResponse.message = "空间分区类型不存在:$type"
+//                sCreateResponse
+//            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return SBaseResponse(SResponseType.failure, e.message!!)
+        }
+    } // Function deletes()
+
+//    /**
+//     * 创建设备服务于业务空间关系
+//     *
+//     * @param    rEqForSpBaseList    设备和业务空间关系的对象列表
+//     */
+//    fun createEq(rEqForSpBaseList: REqForSpBaseList): SCreateResponse<REqForSpBase> {
+//        return try {
+//            /** 成功集合 */
+//            val successList = ArrayList<Any>()
+//            /** 失败集合 */
+//            val failureList = ArrayList<Any>()
+//            delete("equipId = '${rEqForSpBaseList.equipId}'")
+//            val projectId = SPageContext.getHeader("ProjectId")
+//            for (spaceId in rEqForSpBaseList.spaceIdList!!){
+//                val rEqForSpBase = REqForSpBase()
+//                rEqForSpBase.equipId = rEqForSpBaseList.equipId
+//                rEqForSpBase.spaceId = spaceId
+//                rEqForSpBase.projectId = projectId
+//                val replace = replace(rEqForSpBase)
+//                if (replace){
+//                    successList.add(rEqForSpBase)
+//                }else{
+//                    failureList.add(rEqForSpBase)
+//                }
+//            }
+//            if (successList.size>0){
+//                val sCreateResponse = SCreateResponse<REqForSpBase>(SResponseType.success)
+//                if (failureList.size>0){
+//                    sCreateResponse.message ="失败对象:"+failureList.toJson()
+//                }
+//                sCreateResponse
+//            }else{
+//                SCreateResponse(SResponseType.failure)
+//            }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            SCreateResponse(SResponseType.failure,e.message.toString())
+//        }
+//    } // Function createEq()
+
+//    /**
+//     * 创建服务于业务空间的设备关系
+//     *
+//     * @param    rEqForSpBaseList    设备和业务空间关系的对象列表
+//     */
+//    fun createsSp(rEqForSpBaseList: RSpForEqBaseList): SCreateResponse<REqForSpBase> {
+//        return try {
+//            /** 成功集合 */
+//            val successList = ArrayList<Any>()
+//            /** 失败集合 */
+//            val failureList = ArrayList<Any>()
+//            delete("spaceID = '${rEqForSpBaseList.spaceId}'")
+//            val projectId = SPageContext.getHeader("ProjectId")
+//            for (equipId in rEqForSpBaseList.equipIdList!!){
+//                val rEqForSpBase = REqForSpBase()
+//                rEqForSpBase.spaceId = rEqForSpBaseList.spaceId
+//                rEqForSpBase.equipId = equipId
+//                rEqForSpBase.projectId = projectId
+//                val replace = replace(rEqForSpBase)
+//                if (replace){
+//                    successList.add(rEqForSpBase)
+//                }else{
+//                    failureList.add(rEqForSpBase)
+//                }
+//            }
+//            if (successList.size>0){
+//                if (failureList.size>0){
+//                    val sCreateResponse = SCreateResponse<REqForSpBase>(SResponseType.success)
+//                    sCreateResponse.message ="失败对象:"+failureList.toJson()
+//                    sCreateResponse
+//                }else{
+//                    val sCreateResponse = SCreateResponse<REqForSpBase>(SResponseType.success)
+//                    sCreateResponse
+//                }
+//            }else{
+//                SCreateResponse(SResponseType.failure)
+//            }
+//        } catch (e:Exception){
+//            e.printStackTrace()
+//            SCreateResponse(SResponseType.failure,e.message.toString())
+//        }
+//    } // Function createsSp()
+
+    /**
+     * 创建服务于业务空间的设备关系
+     *
+     * @param    rEqForSpBaseList    设备和业务空间关系的对象列表
+     */
+    fun createsSpEq(type: String,rEqForSpBaseList: RSpForEqBaseList): SCreateResponse<RSpForEqBaseList> {
+        return try {
+
+            /** 成功集合 */
+            val successList = ArrayList<Any>()
+            /** 失败集合 */
+            val failureList = ArrayList<Any>()
+            val projectId = SPageContext.getHeader("ProjectId")
+            for (equipId in rEqForSpBaseList.equipIdList!!){
+                val rEq2Sp = REq2Sp()
+                rEq2Sp.id2 = rEqForSpBaseList.spaceId
+                rEq2Sp.id1 = equipId
+                rEq2Sp.projectId = projectId
+                rEq2Sp.sign = 1
+                rEq2Sp.zoneType = type
+                rEq2Sp.type = "eq2sp_for"
+                val replace = rEq2SpService.replace(rEq2Sp)
+                if (replace){
+                    successList.add(rEq2Sp)
+                }else{
+                    failureList.add(rEq2Sp)
+                }
+            }
+            if (successList.size>0){
+                val jsonObject = JSONObject()
+                jsonObject.put("type", "14")
+                jsonObject.put("projectId", projectId)
+                jsonObject.put("id", rEqForSpBaseList.spaceId)
+                jsonObject.put("obj_type", "EquipforSpace")
+                jsonObject.put("linkId",successList.toJson())
+
+                /** 发送消息 */
+                RService.messageHandler.sendMessage(jsonObject.toString())
+//                kafkaService.sendNotice("datacenterrel", RelationNotice(projectId!!, "EquipforSpace", "14", IdUtils.uuidCreate(), rSpForEqZoneHeatingList.spaceId!!,null),false)
+                if (failureList.size>0){
+                    val sCreateResponse = SCreateResponse<RSpForEqBaseList>(SResponseType.success)
+                    sCreateResponse.message ="失败对象:"+failureList.toJson()
+                    sCreateResponse
+                }else{
+                    val sCreateResponse = SCreateResponse<RSpForEqBaseList>(SResponseType.success)
+                    sCreateResponse
+                }
+            }else{
+                SCreateResponse(SResponseType.failure)
+            }
+
+
+//            if (type == "HeatingZone"){
+//                REqForSpZoneHeatingService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "CleanZone"){
+//                REqForSpZoneCleanService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "DomesticWaterSupplyZone"){
+//                REqForSpZoneDomesticWaterSupplyService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "NetworkZone" ){
+//                REqForSpZoneNetworkService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "TenantZone"){
+//                REqForSpZoneTenantService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "AirConditioningZone"){
+//                REqForSpZoneAirConditioningService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "FunctionZone"){
+//                REqForSpZoneFunctionService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "FireZone"){
+//                REqForSpZoneFireService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "SecurityZone"){
+//                REqForSpZoneSecurityService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "GeneralZone"){
+//                REqForSpZoneGeneralService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "PowerSupplyZone"){
+//                REqForSpZonePowerSupplyService.createsSpEq(rEqForSpBaseList)
+//            }else if (type == "LightingZone"){
+//                REqForSpZoneLightingService.createsSpEq(rEqForSpBaseList)
+//            }else{
+//                val sCreateResponse = SCreateResponse<RSpForEqBaseList>(SResponseType.failure)
+//                sCreateResponse.message = "空间分区类型不存在:$type"
+//                sCreateResponse
+//            }
+        } catch (e:Exception){
+            e.printStackTrace()
+            SCreateResponse(SResponseType.failure,e.message.toString())
+        }
+    } // Function createsSp()
+
+} // Object REqForSpBaseService

+ 0 - 0
data-center/src/main/kotlin/com/persagy/server/services/rel/REqInShService.kt


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä