caiaf 4 лет назад
Родитель
Сommit
5448a33a7b
30 измененных файлов с 86 добавлено и 2601 удалено
  1. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/GeneralSystem.kt
  2. 0 108
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForBdController.kt
  3. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForFlController.kt
  4. 0 110
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForShController.kt
  5. 0 97
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForSpConreoller.kt
  6. 0 123
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqInShController.kt
  7. 0 94
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqInSpController.kt
  8. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RFlThroughFlController.kt
  9. 0 140
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShContainSpBaseController.kt
  10. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShaftThroughShaftController.kt
  11. 0 79
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpInBdOrFlController.kt
  12. 0 121
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpInSiController.kt
  13. 0 92
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpatialConnectionConreoller.kt
  14. 0 135
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyEqController.kt
  15. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForBdController.kt
  16. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForFlController.kt
  17. 0 109
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForShController.kt
  18. 0 110
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForSpController.kt
  19. 0 123
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInBdController.kt
  20. 0 123
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInFlController.kt
  21. 0 138
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInShController.kt
  22. 0 124
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInSpController.kt
  23. 0 94
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RTnInSpController.kt
  24. 0 60
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RelationController.kt
  25. 0 62
      datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RelationObjectController.kt
  26. 2 2
      datacenter/src/main/kotlin/com/persagy/server/datacenter/jms/TopicReceiver.kt
  27. 4 2
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/dict/dictnew/DictDefClassService.kt
  28. 11 10
      datacenter/src/main/kotlin/com/persagy/server/datacenter/services/graphtype/RelationTypeProjectService.kt
  29. 9 0
      equip-component/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt
  30. 50 0
      equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/obj/GeneralSystem.kt

@@ -166,4 +166,14 @@ open class GeneralSystem : BaseInfo() {
     @Schema(description = "建筑楼层")
     var buildingFloorInfoList: ArrayList<BuildingFloorInfo>? = null
 
+    /** 别编码 */
+    @Schema(description = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @Schema(description = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
+
 } // Class GeneralSystem

+ 0 - 108
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForBdController.kt

@@ -1,108 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.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.REqForBd
-//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.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 设备服务于建筑
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "036、关系-设备服务于建筑")
-//@RestController
-//@RequestMapping("/rel/eq-for-bd")
-//class REqForBdController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(REqForBdController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建设备服务于建筑关系
-//     *
-//     * @param   req2Bd     设备和建筑的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建设备服务于建筑关系", description = "必填项:EquipId(设备id)、BuildingId(建筑id)")
-//    @PostMapping(value = ["/link"])
-//    fun create(@RequestBody req2Bd: REqForBd): SCreateResponse<REqForBd>{
-//        logger.debug("build = ${req2Bd.toJson()}")
-//        return REqForBdService.create(req2Bd)
-//    } // Function create()
-//
-//    /**
-//     * 根据对象删除关系
-//     *
-//     * @param   rEqForBd      对象
-//     * @return                删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备服务于建筑的关系,只针对一个对象", description = "必填项:EquipId(设备id)、BuildingId(建筑id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody req2Bd: REqForBd): SBaseResponse {
-//        return REqForBdService.deletes(req2Bd)
-//    } // Function delete()
-//
-//    /**
-//     * 创建设备服务于建筑关系
-//     *
-//     * @param   rEqForBd    设备和建筑关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "设备服务于建筑,设备一对多", description = "必填项:BuildingIdList(建筑id列表)、EquipId(设备id),测方法会覆盖以前的记录")
-//    @PostMapping(value = ["link-bd"])
-//    fun createBd(@RequestBody rEqForBd: REqForBdList): SCreateResponse<REqForBd>{
-//        logger.debug("build =${rEqForBd.toJson()}")
-//        return REqForBdService.createEq(rEqForBd)
-//    } // Function createBd()
-//
-//    /**
-//     * 创建服务于建筑的设备关系
-//     *
-//     * @param   rEqForBd    设备和建筑关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "服务于建筑的设备,建筑一对多",description = "必填项:EquipIdList(设备id列表)、BuildingId(建筑id),测方法会覆盖以前的记录")
-//    @PostMapping(value = ["link-sy"])
-//    fun createSy(@RequestBody rEqForBd: RBdForEqList): SCreateResponse<REqForBd>{
-//        logger.debug("build =${rEqForBd.toJson()}")
-//        return REqForBdService.createsBd(rEqForBd)
-//    } // Function createSy()
-//}

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForFlController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 设备服务于楼层
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "037、关系-设备服务于楼层")
-//@RestController
-//@RequestMapping("/rel/eq-for-fl")
-//class REqForFlController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(REqForFlController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建设备服务于楼层关系
-//     *
-//     * @param   rEqForFl     设备和楼层的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建设备服务于楼层关系", description = "必填项: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                删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备服务于楼层的关系,只针对一个对象", description = "必填项:EquipId(设备id)、FloorId(楼层id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rEqForFl: REqForFl): SBaseResponse {
-//        return REqForFlService.deletes(rEqForFl)
-//    } // Function delete()
-//
-//    /**
-//     * 创建设备服务于楼层关系
-//     *
-//     * @param   rEqForFl    设备和楼层关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "设备服务于楼层,设备一对多", description = "必填项: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              创建的结果信息
-//     */
-//    @Operation(summary = "服务于楼层的设备,楼层一对多",description = "必填项: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()
-//
-//}

+ 0 - 110
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForShController.kt

@@ -1,110 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 设备服务于竖井
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "038、关系-设备服务于竖井")
-//@RestController
-//@RequestMapping("/rel/eq-for-sh")
-//class REqForShController {
-//
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(REqForShController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建设备服务于竖井关系
-//     *
-//     * @param    rEqForSh    设备和竖井的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建设备服务于竖井关系", description = "必填项: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                删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备服务于竖井关系,只针对一个对象", description = "必填项:EquipId(设备id)、shaftId(竖井id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rEqForSh: REqForSh): SBaseResponse{
-//        return REqForShService.deletes(rEqForSh)
-//    } // Function delete()
-//
-//    /**
-//     * 创建设备服务于竖井关系
-//     *
-//     * @param    rEqForSh    设备和竖井的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "设备服务于竖井,设备一对多", description = "必填项: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               创建的结果信息
-//     */
-//    @Operation(summary = "服务于竖井的设备,竖井一对多", description = "必填项: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()
-//
-//}

+ 0 - 97
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqForSpConreoller.kt

@@ -1,97 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.requests.SCreateRequest
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 设备服务于业务空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                   创建的结果信息
-//     */
-//    @Operation(summary = "创建设备服务于业务空间关系", description = "必填项: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                       删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备服务于业务空间关系", description = "必填项: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                    创建的结果信息
-//     */
-//    @Operation(summary = "服务于业务空间的设备,业务空间一对多,累计添加不会覆盖以前记录", description = "必填项: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()
-//
-//}

+ 0 - 123
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqInShController.kt

@@ -1,123 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 设备所在竖井
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "020、关系-设备所在竖井")
-//@RestController
-//@RequestMapping("/rel/eq-in-sh")
-//class REqInShController {
-//
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(REqInShController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建设备所在竖井关系
-//     *
-//     * @param    rEqInSh    设备和竖井的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "创建设备所在竖井关系,累计添加不会覆盖以前记录", description = "必填项: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               删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备所在竖井关系,只针对一个对象", description = "必填项:EquipId(设备id)、ShaftId(竖井id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rEqInSh: REqInSh): SBaseResponse{
-//        return REqInShService.deletes(rEqInSh)
-//    } // Function delete()
-//
-//    /**
-//     * 创建设备所在竖井关系
-//     *
-//     * @param    rEqInSh     设备和竖井的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "设备所在竖井,设备一对多,此方法会覆盖以前的记录", description = "必填项: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                创建的结果信息
-//     */
-//    @Operation(summary = "所在竖井的设备,竖井一对多,此方法会覆盖以前的记录", description = "必填项: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                创建的结果信息
-//     */
-//    @Operation(summary = "设备所在的竖井,竖井一对多,此方不会覆盖以前的记录,累计添加", description = "必填项: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()
-//
-//}

+ 0 - 94
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/REqInSpController.kt

@@ -1,94 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.requests.SCreateRequest
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.*
-//
-///**
-// * 设备所在业务空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                  创建的结果信息
-//     */
-//    @Operation(summary = "创建设备所在业务空间关系,累计添加不会覆盖以前记录", description = "必填项:EquipId(设备id)、SpaceId(业务空间id)")
-//    @PostMapping(value = ["/link-list"])
-//    fun create(@RequestParam type: String, @RequestBody rEqInSpBase: SCreateRequest<REqInSpBase>): SCreateResponse<REqInSpBase> {
-//        logger.debug("space = ${rEqInSpBase.toJson()}")
-//        return REqInSpBaseService.create(type,rEqInSpBase)
-//    } // Function create()
-//
-//    /**
-//     * 根据对象删除关系
-//     *
-//     * @param    rEqInSpBaseList    对象
-//     * @return                      删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除设备所在业务空间关系", description = "必填项:EquipId(设备id)、SpaceId(业务空间id),type为空间类型")
-//    @PostMapping(value = ["/unlink-list"])
-//    fun delete(@RequestParam type: String, @RequestBody rEqInSpBaseList: ArrayList<REqInSpBase>): SBaseResponse {
-//        return REqInSpBaseService.deletes(type,rEqInSpBaseList)
-//    } // Function delete()
-//
-//    /**
-//     * 创建所在业务空间的设备关系
-//     *
-//     * @param    rEqInSpBase     设备和业务空间的关系对象
-//     * @return                   创建的结果信息
-//     */
-//    @Operation(summary = "所在业务空间的设备,业务空间一对多,累计添加不会覆盖以前记录", description = "必填项:EquipIdList(设备id列表)、SpaceId(业务空间id)")
-//    @PostMapping(value = ["/link-eq-sp"])
-//    fun createEq(@RequestParam type:String, @RequestBody rEqInSpBase: RSpInEqBaseList): SCreateResponse<RSpInEqBaseList>{
-//        logger.debug("space = ${rEqInSpBase.toJson()}")
-//        return REqInSpBaseService.createsSpEq(type,rEqInSpBase)
-//    } // Function createEq()
-//
-//}

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RFlThroughFlController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//import com.persagy.server.datacenter.models.entities.rel.RFlThroughFl
-//import com.persagy.server.datacenter.models.entities.rel.RFloorOtherThroughFloorList
-//import com.persagy.server.datacenter.models.entities.rel.RFloorThroughFloorOtherList
-//import com.persagy.server.services.rel.RFlThroughFlService
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 楼层的贯通关系
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "021、关系-楼层的贯通")
-//@RestController
-//@RequestMapping("/rel/fl-through-fl")
-//class RFlThroughFlController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RFlThroughFlController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建楼层的贯通关系
-//     *
-//     * @param   RFlThroughFl    楼层和楼层的关系对象
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "创建楼层的贯通关系", description = "必填项: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                  删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除楼层的贯通关系,只针对一个对象", description = "必填项:FloorId(楼层id)、FloorOtherId(其他楼层id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rFlThroughFl: RFlThroughFl): SBaseResponse {
-//        return RFlThroughFlService.deletes(rFlThroughFl)
-//    } // Function delete()
-//
-//    /**
-//     * 创建楼层的贯通关系
-//     *
-//     * @param   rFlThroughFl    楼层和其他楼层列表关系对象r
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "楼层的贯通,楼层一对多", description = "必填项: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                  创建的结果信息
-//     */
-//    @Operation(summary = "楼层的贯通,其他楼层一对多",description = "必填项: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()
-//
-//}

+ 0 - 140
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShContainSpBaseController.kt

@@ -1,140 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.datacenter.services.rel.RShContainSpBaseService
-//import com.persagy.server.services.rel.RSpContainShBaseList
-//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.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.*
-//
-///**
-// * 竖井下的业务空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                       创建的结果信息
-//     */
-//    @Operation(summary = "创建竖井下的业务空间关系", description = "必填项: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                       删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除竖井下的业务空间关系,只针对一个对象", description = "必填项:ShaftID(竖井id)、SpaceID(业务空间id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestParam type: String, @RequestBody rShContainSpBase: ArrayList<RShContainSpBase>): SBaseResponse {
-//        return RShContainSpBaseService.deletes(type,rShContainSpBase)
-//    } // Function delete()
-//
-//
-//    /**
-//     * 创建竖井下的业务空间关系
-//     *
-//     * @param   rShContainSpBase     竖井和业务空间的关系对象
-//     * @param   type                 空间类型
-//     * @return                       创建的结果信息
-//     */
-//    @Operation(summary = "竖井下的业务空间,竖井一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法不会覆盖以前的记录")
-//    @PostMapping(value = ["link-shsps"])
-//    fun createShSps(@RequestParam type: String?,@RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
-//        logger.debug("space =${rShContainSpBase.toJson()}")
-//        return RShContainSpBaseService.createShSps(type,rShContainSpBase)
-//    } // Function createSp()
-//
-//    /**
-//     * 创建竖井下的业务空间关系
-//     *
-//     * @param   rSpContainShBase     竖井和业务空间的关系对象
-//     * @param   type                 空间类型
-//     * @return                       创建的结果信息
-//     */
-//    @Operation(summary = "竖井下的业务空间,空间一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceId(业务空间id)、ShaftIDList(竖井id列表),此方法不会覆盖以前的记录")
-//    @PostMapping(value = ["link-spshs"])
-//    fun createSpShs(@RequestParam type: String,@RequestBody rSpContainShBase: RSpContainShBaseList): SCreateResponse<RSpContainShBaseList> {
-//        logger.debug("space =${rSpContainShBase.toJson()}")
-//        return RShContainSpBaseService.createSpShs(type,rSpContainShBase)
-//    } // Function createSp()
-//
-//    /**
-//     * 创建竖井下的业务空间关系
-//     *
-//     * @param   rShContainSpBase     竖井和业务空间的关系对象
-//     * @param   type                 空间类型
-//     * @return                       创建的结果信息
-//     */
-//    @Operation(summary = "竖井下的业务空间,竖井一对多,此方法会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
-//    @PostMapping(value = ["link-shsps-replace"])
-//    fun createShSpsReplace(@RequestParam Type: String,@RequestParam BuildingId: String,@RequestParam FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
-//        logger.debug("space =${rShContainSpBase.toJson()}")
-//        return RShContainSpBaseService.createShSpsReplace(Type,BuildingId,FloorId,rShContainSpBase)
-//    } // Function createSp()
-//
-//    /**
-//     * 查询空间类型和名称
-//     * @param shaftId 竖井id
-//     */
-//    @Operation(summary = "查询空间类型和名称",description = "")
-//    @PostMapping(value = ["/space-type-query"])
-//    fun spaceTypeQuery(@RequestParam shaftId: String): SQueryResponse<SpaceInfoDic> {
-//        val projectId = SPageContext.getHeader("projectId").toString()
-//        return RShContainSpBaseService.spaceTypeQuery(projectId,shaftId)
-//    } // Function spaceTypeQuery()
-//
-//} // Class RShContainSpBaseController

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RShaftThroughShaftController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 竖井的贯通关系
-// *
-// * @author 张维新
-// */
-//@Tag(name = "022、关系-竖井的贯通关系")
-//@RestController
-//@RequestMapping("/rel/sh-through-sh")
-//class RShaftThroughShaftController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RShaftThroughShaftController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建竖井的贯通关系
-//     *
-//     * @param   rFlThroughFl    竖井和竖井的关系对象
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "创建竖井的贯通关系", description = "必填项: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                  删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除竖井的贯通关系,只针对一个对象", description = "必填项:ShaftId(竖井id)、ShaftOtherId(其他数据竖井id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rFlThroughFl: RShaftThroughShaft): SBaseResponse {
-//        return RShaftThroughShaftService.deletes(rFlThroughFl)
-//    } // Function delete()
-//
-//    /**
-//     * 创建竖井的贯通关系
-//     *
-//     * @param   rFlThroughFl    竖井和其他竖井列表关系对象r
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "竖井的贯通,竖井一对多,此方法会覆盖以前的记录", description = "必填项: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                  创建的结果信息
-//     */
-//    @Operation(summary = "竖井的贯通,竖井一对多,此方法不会覆盖以前的记录", description = "必填项: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()
-//
-//
-//}

+ 0 - 79
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpInBdOrFlController.kt

@@ -1,79 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.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.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//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 张维新
-// */
-//@Tag(name = "025、关系-业务空间所在的建筑楼层")
-//@RestController
-//@RequestMapping("/rel/sp-in")
-//class RSpInBdOrFlController {
-//
-//    /**
-//     * 创建业务空间和建筑的关系
-//     */
-//    @Operation(summary = "创建业务空间和建筑的关系", description = "")
-//    @PostMapping(value = ["/bd-create"])
-//    fun spInBdCreate(@RequestBody rSiInSpBase: SCreateRequest<RSpinBd>): SCreateResponse<RSpinBd> {
-//        return RSpInBdService.spInBdCreates(rSiInSpBase)
-//    } // Function spInBdCreate()
-//
-//    /**
-//     * 删除业务空间和建筑的关系
-//     */
-//    @Operation(summary = "删除业务空间和建筑的关系", description = "")
-//    @PostMapping(value = ["/bd-del"])
-//    fun spInBdDeL(@RequestBody rSpinBdList: ArrayList<RSpinBd>): SBaseResponse {
-//        return RSpInBdService.spInBdDeLs(rSpinBdList)
-//    } // Function spInBdCreate()
-//
-//    /**
-//     * 修改业务空间所在的建筑
-//     */
-//    @Operation(summary = "删除业务空间和建筑的关系", description = "")
-//    @PostMapping(value = ["/bd-update"])
-//    fun spInBdUpdate(@RequestBody request: SUpdateRequest<RSpinBd>): SBaseResponse{
-//        return RSpInBdService.spInBdUpdates(request)
-//    } // Function spInBdUpdate()
-//
-//}

+ 0 - 121
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpInSiController.kt

@@ -1,121 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.requests.SCreateRequest
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.*
-//
-//
-///**
-// * 业务空间内的元空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                   创建的结果信息
-//     */
-//    @Operation(summary = "创建业务空间内的元空间关系, 累计添加不会覆盖", description = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
-//    @PostMapping(value = ["/link-list"])
-//    fun create(@RequestParam type: String, @RequestBody rSiInSpBase: SCreateRequest<RSiInSpBase>): SCreateResponse<RSiInSpBase> {
-//        logger.debug("space = ${rSiInSpBase.toJson()}")
-//        return RSpInSiBaseService.createLists(type,rSiInSpBase)
-//    } // Function create()
-//
-//    /**
-//     * 根据对象删除关系
-//     *
-//     * @param    rSiInSpBase    对象
-//     * @return                  删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除业务空间内的元空间关系", description = "必填项:IspaceId(元空间id)、SpaceId(业务空间id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestParam type: String, @RequestBody rSiInSpBase: ArrayList<RSiInSpBase>): SBaseResponse {
-//        return RSpInSiBaseService.deletes(type,rSiInSpBase)
-//    } // Function delete()
-//
-////    /**
-////     * 创建业务空间内的元空间关系
-////     *
-////     * @param    rSpInSiBase    业务空间和元空间的关系对象
-////     * @return                  创建的结果信息
-////     */
-////    @Operation(summary = "元空间关联业务空间,元空间一对多", description = "必填项: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                  创建的结果信息
-//     */
-//    @Operation(summary = "业务空间内的元空间,业务空间一对多,此方法会覆盖以前的记录", description = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id),此方法会覆盖以前的记录")
-//    @PostMapping(value = ["/link-sp"])
-//    fun createSp(@RequestParam type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
-//        logger.debug("space = ${rSpInSiBase.toJson()}")
-//        return RSpInSiBaseService.createsSp(type,rSpInSiBase)
-//    } // Function createSp()
-//
-//    /**
-//     * 创建业务空间内的元空间关系
-//     *
-//     * @param    rSpInSiBase    业务空间和元空间的关系对象
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "业务空间内的元空间,业务空间一对多,累计添加不会覆盖以前记录", description = "必填项:IspaceIdList(元空间id列表)、SpaceId(业务空间id)")
-//    @PostMapping(value = ["/link-si-sp"])
-//    fun createSpSi(@RequestParam type:String, @RequestBody rSpInSiBase: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList>{
-//        logger.debug("space = ${rSpInSiBase.toJson()}")
-//        return RSpInSiBaseService.createsSpSi(type, rSpInSiBase)
-//    } // Function createSp()
-//
-//} // Class RSpInSiBaseController

+ 0 - 92
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSpatialConnectionConreoller.kt

@@ -1,92 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.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.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//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
-//
-//@Tag(name = "024、关系-空间关系")
-//@RestController
-//@RequestMapping("/rel/sp-rel")
-//class RSpatialConnectionConreoller {
-//
-//    /**
-//     * 创建邻接关系
-//     */
-//    @Operation(summary= "创建邻接关系", description = "图类型 GraphType:空间邻接关系 SpaceNeighborhood 建筑交通关系 TrafficNetwork  空气流通关系  ConvectionNetwork  光照辐射关系  RadiationNetwork ")
-//    @PostMapping(value = ["/space-neighborhood-Create"])
-//    fun spaceNeighborhoodCreate(@RequestBody rSiInSpBase: SCreateRequest<RSpatialConnection>): SCreateResponse<RSpatialConnection> {
-//        return RSpatialConnectionService.create(rSiInSpBase)
-//    } // Function spaceNeighborhood
-//
-//    /**
-//     * 空间关系
-//    */
-//    @Operation(summary="查询空间关系", description =" 楼层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              删除的结果信息
-//     */
-//    @Operation(summary = "删除某一个关系", description = "必填: SpaceIdOne、SpaceIdTwo、GraphType、ZoneType")
-//    @PostMapping(value = ["/delete"])
-//    fun delete(@RequestBody idList: ArrayList<RSpatialConnection>): SBaseResponse {
-//        return RSpatialConnectionService.delete(idList)
-//    } // Function delete()
-//
-//    /**
-//     * 清除某个楼层下的数据
-//     *
-//     * @param   idList      id数组
-//     * @return              删除的结果信息
-//     */
-//    @Operation(summary = "清除某个楼层下的数据", description = "必填 graphType、floorId、ZoneType")
-//    @PostMapping(value = ["/delete-floor"])
-//    fun deleteFloor(@RequestBody idList: RSpatialConnection): SBaseResponse {
-//        return RSpatialConnectionService.deleteFloor(idList)
-//    } // Function deleteFloor()
-//
-//
-//} // Class RSpatialConnectionConreoller

+ 0 - 135
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyEqController.kt

@@ -1,135 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// *系统下的设备设施
-// *
-// * @author 张维新
-// */
-//@Tag(name = "019、关系-系统下的设备设施")
-//@RestController
-//@RequestMapping("/rel/sy-in-eq")
-//class RSyEqController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyEqController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统下的设备关系
-//     *
-//     * @param   rSyEq           系统和设备的关系对象
-//     * @return                  创建结果信息
-//     */
-//    @Operation(summary = "创建系统下的设备关系", description = "必填项: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             删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统和设备的关系,只针对一个对象", description = "必填项:EquipID(设备id)、SysID(系统id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyEq: RSyEq): SBaseResponse {
-//        return RSyEqService.deletes(rSyEq)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统下的设备关系
-//     *
-//     * @param   rSyEq           系统和设备的关系对象
-//     * @return                  创建结果信息
-//     */
-//    @Operation(summary = "系统下的设备,系统一对多,数据覆盖", description = "必填项: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                  创建结果信息
-//     */
-//    @Operation(summary = "设备关联系统,设备一对多, 数据覆盖", description = "必填项: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                  创建结果信息
-//     */
-//    @Operation(summary = "设备关联系统,系统一对多,数据叠加", description = "必填项: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                  创建结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统和设备的关系", description = "必填项: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)
-//    }
-//
-//}

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForBdController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统服务于建筑
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "026、关系-系统服务于建筑")
-//@RestController
-//@RequestMapping("/rel/sy-for-bd")
-//class RSyForBdController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyForBdController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统服务于建筑关系
-//     *
-//     * @param   rSyForBd     系统和建筑的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建系统服务于建筑关系", description = "必填项: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                删除的结果信息
-//     */
-//     @Operation(summary = "根据对象删除系统服务于建筑的关系,只针对一个对象", description = "必填项:SysId(系统id)、BuildingId(建筑id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyForBd: RSyForBd): SBaseResponse {
-//        return RSyForBdService.deletes(rSyForBd)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统服务于建筑关系
-//     *
-//     * @param   rSyForBd    系统和建筑关系对象
-//     * @return              创建的结果信息
-//     */
-//     @Operation(summary = "系统服务于建筑,系统一对多", description = "必填项: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              创建的结果信息
-//     */
-//     @Operation(summary = "服务于建筑的系统,建筑一对多",description = "必填项: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()
-//
-//}

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForFlController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统服务于楼层
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "027、关系-系统服务于楼层")
-//@RestController
-//@RequestMapping("/rel/sy-for-fl")
-//class RSyForFlController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyForFlController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统服务于楼层关系
-//     *
-//     * @param   rSyForFl    系统和楼层的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "创建系统服务于楼层关系", description = "必填项: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              删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统服务于楼层的关系,只针对一个对象", description = "必填项:SysId(系统id)、FloorId(楼层id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyForFl: RSyForFl): SBaseResponse{
-//        return RSyForFlService.deletes(rSyForFl)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统服务于楼层关系
-//     *
-//     * @param    rSyForFl    系统和楼层关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "系统服务于楼层,系统一对多", description = "必填项: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              创建的结果信息
-//     */
-//    @Operation(summary = "服务于楼层的系统,楼层一对多", description = "必填项: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()
-//
-//}

+ 0 - 109
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForShController.kt

@@ -1,109 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统服务于竖井
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "028、关系-系统服务于竖井")
-//@RestController
-//@RequestMapping("/rel/sy-for-sh")
-//class RSyForShController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyForShController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统服务于竖井关系
-//     *
-//     * @param    rSyForSh    系统和竖井的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建系统服务于竖井关系", description = "必填项: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               删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统服务于竖井的关系,只针对一个对象", description = "必填项:SysId(系统id)、ShaftId(竖井id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyForSh: RSyForSh): SBaseResponse{
-//        return RSyForShService.deletes(rSyForSh)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统服务于竖井关系
-//     *
-//     * @param   rSyForSh    系统和竖井关系的对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "系统服务于竖井,系统一对多", description = "必填项: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               创建的结果信息
-//     */
-//    @Operation(summary = "服务于竖井的系统,竖井一对多", description = "必填项: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

+ 0 - 110
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyForSpController.kt

@@ -1,110 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.datacenter.services.rel.RSyForSpBaseService
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统服务于业务空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                      创建的结果信息
-//     */
-//    @Operation(summary = "创建系统服务于业务空间关系", description = "必填项: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                    删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统服务于业务空间关系,只针对一个对象", description = "必填项:SysID(系统id)、SpaceID(业务空间id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyForSpBase: RSyForSpBase): SBaseResponse {
-//        return RSyForSpBaseService.deletes(rSyForSpBase)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统服务于业务空间关系
-//     *
-//     * @param   rSyForSpBase   系统和业务空间的关系对象
-//     * @return                 创建的结果信息
-//     */
-//    @Operation(summary = "系统服务于业务空间关系,系统一对多", description = "必填项: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                  创建的结果信息
-//     */
-//    @Operation(summary = "服务于业务空间的系统,业务空间一对多",description = "必填项: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()
-//
-//}

+ 0 - 123
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInBdController.kt

@@ -1,123 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统所在建筑
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "030、关系-系统所在建筑")
-//@RestController
-//@RequestMapping("/rel/sy-in-bd")
-//class RSyInBdController {
-//
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyInBdController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统所在建筑关系
-//     *
-//     * @param    rSyInBd     系统和建筑的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "创建系统所在建筑关系", description = "必填项: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                删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统所在建筑关系,只针对一个对象", description = "必填项:SysId(系统id)、BuildingId(建筑id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyInBd: RSyInBd): SBaseResponse {
-//        return RSyInBdService.deletes(rSyInBd)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统所在建筑关系
-//     *
-//     * @param    rSyInBd     系统和建筑的关系对象
-//     * @return               创建的结果信息
-//     */
-//    @Operation(summary = "系统所在建筑,系统一对多建筑", description = "必填项: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                创建的结果信息
-//     */
-//    @Operation(summary = "所在建筑的系统,建筑一对多系统", description = "必填项: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               创建的结果信息
-//     */
-//    @Operation(summary = "系统所在建筑,系统一对多建筑,此方法不会覆盖", description = "必填项: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()
-//
-//}

+ 0 - 123
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInFlController.kt

@@ -1,123 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统所在楼层
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "031、关系-系统所在楼层")
-//@RestController
-//@RequestMapping("/rel/sy-in-fl")
-//class RSyInFlController {
-//
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyInFlController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系所在楼层关系
-//     *
-//     * @param    rSyInFl    系统和楼层的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "创建系所在楼层关系", description = "必填项: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               删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统所在楼层关系,只针对一个对象", description = "必填项:SysId(系统id)、FloorId(楼层id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyInFl: RSyInFl): SBaseResponse {
-//        return RSyInFlService.deletes(rSyInFl)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统所在楼层关系
-//     *
-//     * @param    rSyInFl    系统和楼层的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "系统所在楼层,系统一对多楼层", description = "必填项: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              创建的结果信息
-//     */
-//    @Operation(summary = "所在楼层的系统,楼层一对多系统", description = "必填项: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              创建的结果信息
-//     */
-//    @Operation(summary = "系统所在楼层,系统一对多楼层,此方法不会覆盖", description = "必填项: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()
-//
-//}

+ 0 - 138
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInShController.kt

@@ -1,138 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统所在竖井
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "032、关系-系统所在竖井")
-//@RestController
-//@RequestMapping("/rel/sy-in-sh")
-//class RSyInShController {
-//
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(RSyInShController::class.java)
-//    } // Companion object
-//
-//    /**
-//     * 创建系统所在竖井关系
-//     *
-//     * @param    rSyInSh    系统和竖井的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "创建系统所在竖井关系", description = "必填项: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                删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统所在竖井关系,只针对一个对象", description = "必填项:SysId(系统id)、ShaftId(竖井id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestBody rSyInSh: RSyInSh): SBaseResponse {
-//        return RSyInShService.deletes(rSyInSh)
-//    } // Function delete()
-//
-//    /**
-//     * 创建系统所在竖井关系
-//     *
-//     * @param    rSyInSh    系统和竖井的关系对象
-//     * @return              创建的结果信息
-//     */
-//    @Operation(summary = "系统所在竖井,系统一对多,此方法会覆盖以前的记录", description = "必填项: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               创建的结果信息
-//     */
-//    @Operation(summary = "所在竖井的系统,竖井一对多,此方法会覆盖以前的记录", description = "必填项: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               创建的结果信息
-//     */
-//    @Operation(summary = "系统所在的竖井,竖井一对多,累计添加,此方法不会覆盖以前记录", description = "必填项: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              创建的结果信息
-//     */
-//    @Operation(summary = "系统所在竖井,系统一对多,不覆盖", description = "必填项: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()
-//
-//
-//}

+ 0 - 124
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RSyInSpController.kt

@@ -1,124 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.datacenter.services.rel.RSyInSpBaseService
-//import com.persagy.service.models.requests.SCreateRequest
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 系统所在业务空间
-// *
-// * @author 张维新
-// */
-//@Tag(name = "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                创建的结果信息
-//     */
-//    @Operation(summary = "创建系统所在业务空间关系", description = "必填项: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                    删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除系统所在业务空间关系", description = "必填项: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                  创建的结果信息
-////     */
-////    @Operation(summary = "系统所在业务空间关系,系统一对多", description = "必填项: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                               创建的结果信息
-//     */
-//    @Operation(summary = " 处理所有空间分区和系统关系 系统所在的业务空间关系,空间分区一对多,累计叠加,不覆盖", description = "必填项: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                  创建的结果信息
-//     */
-//    @Operation(summary = "系统所在业务空间关系,系统一对多,不覆盖", description = "必填项: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()
-//
-//}

+ 0 - 94
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RTnInSpController.kt

@@ -1,94 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.base.extensions.toJson
-//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.service.models.requests.SCreateRequest
-//import com.persagy.service.models.responses.SBaseResponse
-//import com.persagy.service.models.responses.SCreateResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.web.bind.annotation.*
-//
-///**
-// * 租户所租用的业务空间
-// *
-// * @author 付国宝
-// */
-//@Tag(name = "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                  创建的结果信息
-//     */
-//    @Operation(summary = "创建租户所租用的业务空间关系", description = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
-//    @PostMapping(value = ["/link"])
-//    fun create(@RequestParam type: String,@RequestBody rTnInSpBase: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
-//        logger.debug("space =${rTnInSpBase.toJson()}")
-//        return RTnInSpBaseService.create(type,rTnInSpBase)
-//    } // Functio create()
-//
-//    /**
-//     * 根据对象删除关系
-//     *
-//     * @param   rTnInSpBase      对象
-//     * @return                   删除的结果信息
-//     */
-//    @Operation(summary = "根据对象删除租户所租用的业务空间关系", description = "必填项:TenantID(租户id)、SpaceID(业务空间id)")
-//    @PostMapping(value = ["/unlink"])
-//    fun delete(@RequestParam type: String,@RequestBody rTnInSpBase: ArrayList<RTnInSpBase>): SBaseResponse {
-//        return RTnInSpBaseService.deletes(type,rTnInSpBase)
-//    } // Function delete()
-//
-//    /**
-//     * 创建租户所租用的业务空间关系
-//     *
-//     * @param    rTnInSpBase    租户和业务空间的关系对象
-//     * @return                  创建的结果信息
-//     */
-//    @Operation(summary = "租户所租用的业务空间关系,租户一对多", description = "必填项:SpaceIdList(业务空间id列表)、TenantID(租户id),此方法会覆盖以前的记录 ,type 空间类型")
-//    @PostMapping(value = ["/link-sp"])
-//    fun createSp(@RequestParam type: String, @RequestBody rTnInSpBase: RTnInSpBaseList): SCreateResponse<RTnInSpBase> {
-//        logger.debug("space =${rTnInSpBase.toJson()}")
-//        return RTnInSpBaseService.createTn(type,rTnInSpBase)
-//    } // Function createSp()
-//
-//}

+ 0 - 60
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RelationController.kt

@@ -1,60 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.server.datacenter.models.entities.graphtype.GraphicType
-//import com.persagy.server.services.graphtype.GraphicTypeService
-//import com.persagy.service.models.responses.SQueryResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 关系
-// *
-// * @author wx  <zhangweixin@sagacloud.com>
-// * @date  2020/11/7 10:49
-// */
-//@Tag(name = "041、关系-查询关系类型")
-//@RestController
-//@RequestMapping("/rel")
-//class RelationController {
-//
-//    /**
-//     * 查询设备的关系类型
-//     *
-//     * @return 返回结果对象
-//     */
-//    @Operation(summary = "查询设备的关系类型", description = "只有包含二级和三级关系")
-//    @PostMapping(value = ["/equip/category"])
-//    fun equipRel(): SQueryResponse<GraphicType> {
-//    return GraphicTypeService.equipType()
-//    }
-//
-//}

+ 0 - 62
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/rel/RelationObjectController.kt

@@ -1,62 +0,0 @@
-///*
-// * *********************************************************************************************************************
-// *
-// *          !!
-// *        .F88X
-// *        X8888Y
-// *      .}888888N;
-// *        i888888N;        .:!              .I$WI:
-// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
-// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
-// *            +888888N;  .8888888Y                                  "&&8Y.}8,
-// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
-// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
-// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
-// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
-// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
-// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
-// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
-// *      .:R888888I
-// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
-// *        ~8888'
-// *        .!88~                                                                     All rights reserved.
-// *
-// * *********************************************************************************************************************
-// */
-//
-//package com.persagy.server.controllers.rel
-//
-//import com.persagy.database.SFilter
-//import com.persagy.mybatis.SMybatisDao
-//import com.persagy.server.Opt
-//import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Eq
-//import com.persagy.service.SObjectService
-//import com.persagy.service.models.requests.SQueryRequest
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//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 wx  <zhangweixin@sagacloud.com>
-// * @date  2020/11/7 11:36
-// */
-//@Tag(name = "042、关系-查询关系类型对相应的对象id")
-//@RestController
-//@RequestMapping("/rel/obj")
-//class RelationObjectController {
-//    /** 设备与设备关系服务 */
-//    val rEq2EqService = SObjectService(SMybatisDao(REq2Eq::class.java))
-//    /**
-//     *
-//     */
-//    @Operation(summary = "查询设备的关系", description = "")
-//    @PostMapping(value = ["/equip/query"])
-//    fun equipTypeObj(@RequestBody request: SQueryRequest){
-//        rEq2EqService.pageQuery(request, arrayListOf(SFilter.eq("projectId",Opt.projectId!!)))
-//    }
-//
-//}

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/jms/TopicReceiver.kt

@@ -63,8 +63,8 @@ class TopicReceiver {
      *
      * @param
      */
-//    @RabbitListener(queues = ["queue-center-adm"])
-//    @RabbitHandler
+    @RabbitListener(queues = ["queue-center-adm"])
+    @RabbitHandler
     fun receiveMessage(message: String) {
         try {
             println("接收数据中心消息 , $message")

+ 4 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/dict/dictnew/DictDefClassService.kt

@@ -343,8 +343,10 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                }else if (dictDefFuncList01.size == 0) {
 //                    schemeService.dictInfo(projectId, dictProject.groupCode!!, request.type!!)
 //                }
-                val dictDefFuncBuilder = dictDefFuncId.select(request.filters).filter(SFilter.eq("projectId", projectId),
-                    SFilter.eq("groupCode", dictProject.groupCode!!),
+                val dictDefFuncBuilder = dictDefFuncId.select(request.filters).filter(
+//                        SFilter.eq("projectId", projectId),
+//                    SFilter.eq("groupCode", dictProject.groupCode!!),
+                        SFilter.eq("type", "common"),
                     SFilter.eq("classCode", request.type!!))
                 /** 过滤 */
                 if (null != request.projection) {

+ 11 - 10
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/graphtype/RelationTypeProjectService.kt

@@ -420,16 +420,16 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
             for (i in rowNum .. sheet.lastRowNum) {
                 val row = sheet.getRow(i)
                 try {
-                if (row == null||row.getCell(id1Col) == null||row.getCell(id2Col) == null){
-                    sheet.getRow(0).createCell(stateCol).setCellValue("第$i 行数据为空")
-                    continue
-                }
-                val id1 = row.getCell(id1Col).toString()
-                val id2 = row.getCell(id2Col).toString()
-                // 任意一个ID为空,则不能导入数据
-                if (id1.isEmpty() || id2.isEmpty()) {
-                    return
-                }
+                    if (row == null||row.getCell(id1Col) == null||row.getCell(id2Col) == null){
+                        sheet.getRow(0).createCell(stateCol).setCellValue("第$i 行数据为空")
+                        continue
+                    }
+                    val id1 = row.getCell(id1Col).toString()
+                    val id2 = row.getCell(id2Col).toString()
+                    // 任意一个ID为空,则不能导入数据
+                    if (id1.isEmpty() || id2.isEmpty()) {
+                        return
+                    }
                     if(zoneType.isNullOrEmpty()) {
                         importMethod.invoke(excelImport, projectId, type, id1, id2, graphCode)
                     } else {
@@ -441,6 +441,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                     row.createCell(stateCol).setCellValue("关联失败")
                 }
             }
+
         } catch (e: Exception) {
             e.printStackTrace()
         }

+ 9 - 0
equip-component/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt

@@ -81,5 +81,14 @@ class DictCustomController {
         return  DefFuncIdService.dictProjectTypeSystemQuery()
     }
 
+    /**
+     * 统计所有的系统类型
+     */
+    @Operation(summary = "统计所有的系统类型", description = "专业-系统树形结构")
+    @GetMapping(value = ["/system/type"])
+    fun systemType(): SQueryResponse<DefClass>{
+        return  DefFuncIdService.dictTypeSystemQuery()
+    }
+
 
 }

+ 50 - 0
equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

@@ -341,4 +341,54 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
     }
 
 
+    /**
+     * 所有的系统
+     */
+    fun dictTypeSystemQuery(): SQueryResponse<DefClass>{
+        return try {
+            val sQueryResponse = SQueryResponse<DefClass>(SResponseType.success)
+
+            /** 系统 */
+            var systemDefClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("parentCode","system")).order("code").exec()
+            if (systemDefClassList.size == 0){
+                systemDefClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.eq("parentCode","system")).order("code").exec()
+                if (systemDefClassList.size == 0){
+                    systemDefClassList = defClassService.select(SFilter.eq("type", "common"),SFilter.eq("parentCode","system")).order("code").exec()
+                }
+            }
+            val typeset = HashSet<String>()
+            for (systemDefClass in systemDefClassList) {
+                typeset.add(systemDefClass.majorCode!!)
+            }
+            val dictMajorList = dictMajorService.select(SFilter.inList("code", typeset.toList())).order("code").exec()
+            val listMajor = ArrayList<DefClass>()
+            for (dictMajor in dictMajorList) {
+                val defClass = DefClass()
+                defClass.code = dictMajor.code
+                defClass.name = dictMajor.name
+                defClass.aliasCode = dictMajor.aliasCode
+                defClass.aliasName = dictMajor.aliasName
+
+                for (systemDefClass in  systemDefClassList) {
+                    if (systemDefClass.majorCode == dictMajor.code) {
+                        if (defClass.children.isNullOrEmpty()) {
+                            defClass.children = ArrayList<DefClass>()
+                        }
+                        defClass.children!!.add(systemDefClass)
+                    }
+                }
+                listMajor.add(defClass)
+            }
+
+            sQueryResponse.content = listMajor
+            sQueryResponse.total = listMajor.size.toLong()
+            sQueryResponse
+        } catch (e: Exception) {
+            e.printStackTrace()
+            SQueryResponse(SResponseType.failure)
+        }
+    }
+
+
+
 }