caiaf 4 vuotta sitten
vanhempi
commit
d1aa0fbb26

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

@@ -196,4 +196,14 @@ open class EquipmentProSy : BaseInfo() {
     @Column(name = "code_type")
     var codeType: Int? = null
 
+    /** 别编码 */
+    @Schema(description = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @Schema(description = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
+
 }

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

@@ -248,4 +248,15 @@ open class Equipment : BaseInfo() {
     @Schema(description = "级联-设备所在空间")
     @SCascade(table="relationship.r_eq2sp", idColumn="eq_id", childIdColumn="sp_id",filter ="type = 'Eq2Sp' and graph_code = 'MechInArch'" )
     var objectInfo: ArrayList<RelZoneSpace>? = null
+
+
+    /** 别编码 */
+    @Schema(description = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @Schema(description = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
 }

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

@@ -121,5 +121,15 @@ open class EquipmentBase : BaseInfo() {
     @Column(name = "code_name")
     var codeName: String? = null
 
+    /** 别编码 */
+    @Schema(description = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @Schema(description = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
+
 
 }

+ 0 - 83
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/CalcSpecialController.kt

@@ -1,83 +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.relation_calc
-//
-//import com.persagy.server.datacenter.services.relation_calc.CalcSpecialService
-//import com.persagy.service.models.responses.SBaseResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.slf4j.LoggerFactory
-//import org.springframework.beans.factory.annotation.Autowired
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RequestParam
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 关系计算-管网
-// *
-// * @author 邓婷婷
-// */
-//@Tag(name = "016、关系计算-管网接口")
-//@RestController
-//@RequestMapping("/calc_special")
-//open class CalcSpecialController {
-//    companion object {
-//        /** 日志 */
-//        private val logger = LoggerFactory.getLogger(CalcSpecialController::class.java)
-//    } // Companion object
-//
-//    @Autowired
-//    lateinit var service: CalcSpecialService
-//
-//    /**
-//     * 管网系统设备分块  +  计算流向
-//     *
-//     * @param   SystemName  需要计算的系统名称
-//     * @param   Domain      需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac
-//     */
-//    @Operation(summary = "管网系统设备分块", description = "Domain 需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac;需要计算的building_id,如果没有提供时直接为空")
-//    @PostMapping(value = ["/sys-block"])
-//    fun sysBolck(@RequestParam relationType: String,@RequestParam buildingId: String): SBaseResponse{
-//        return service.sysBolck(relationType,buildingId)
-//    } // Function sysBolck()
-//
-//
-////    /**
-////     * 管网系统确定流向
-////     * @param   BlockId     需要计算的块id
-////     * @param   SystemName  需要计算的系统名称
-////     * @param   Domain      需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac
-////     * @param   isSource    跟据源或端计算:bool。true表示源,false表示端
-////     */
-////    @Operation(summary = "管网系统确定流向", description = "Domain 需要计算的管道系统类型,枚举(水管或风管):DomainPiping,DomainHvac;需要计算的building_id,如果没有提供时直接为空;isSource 跟据源或端计算 true表示源,false表示端")
-////    @PostMapping(value = ["/sys-direction"])
-////    fun sysDirection(BuildingId: String?, BlockId: String, SystemName: String,Domain: String, isSource: Boolean): SBaseResponse{
-////        return service.sysDirection(BuildingId, BlockId, SystemName, Domain, isSource)
-////    } // Function sysDirection()
-//
-//} // Class CalcSpecialController

+ 0 - 101
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/ManualRelationCalcController.kt

@@ -1,101 +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.relation_calc
-//
-//import com.persagy.server.datacenter.datacenter.models.entities.graphtype.block.RelationAddRequest
-//import com.persagy.server.datacenter.models.requests.ManualRelationCalcDel
-//import com.persagy.server.datacenter.datacenter.models.requests.ManualRelationCalcRequest
-//import com.persagy.server.datacenter.models.response.ManualRelationCalcResponse
-//import com.persagy.server.datacenter.models.response.ManualRelationCalcSCreateResponse
-//import com.persagy.server.datacenter.services.relation_calc.ManualRelationCalcService
-//import com.persagy.service.models.responses.SBaseResponse
-//import io.swagger.v3.oas.annotations.Operation
-//import io.swagger.v3.oas.annotations.tags.Tag
-//import org.springframework.beans.factory.annotation.Autowired
-//import org.springframework.web.bind.annotation.PostMapping
-//import org.springframework.web.bind.annotation.RequestBody
-//import org.springframework.web.bind.annotation.RequestMapping
-//import org.springframework.web.bind.annotation.RestController
-//
-///**
-// * 手动计算
-// *
-// * @author 张维新
-// */
-//@Tag(name = "013、关系计算-手动计算")
-//@RestController
-//@RequestMapping("/rel-manual-calc")
-//class ManualRelationCalcController {
-//
-//    /**
-//     * 服务
-//     */
-//    @Autowired
-//    lateinit var service: ManualRelationCalcService
-//
-//    /**
-//     * 查询关系数据
-//     */
-//    @Operation(summary = "查询关系数据", description = "")
-//    @PostMapping(value = ["/query"])
-//    fun query(@RequestBody manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse {
-//        return service.query(manualRelationCalcRequest)
-//    }
-//
-//    /**
-//     * 添加关系
-//     */
-//    @Operation(summary = "添加关系", description = "")
-//    @PostMapping(value = ["/add"])
-//    fun addRels(@RequestBody relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
-//        return service.addRel(relationAddRequest)
-//    }
-//
-//    /**
-//     * 删除关系
-//     */
-//    @Operation(summary = "删除关系", description = "")
-//    @PostMapping(value = ["/del"])
-//    fun delRels(@RequestBody manualRelationCalcDel: ManualRelationCalcDel): SBaseResponse {
-//        return service.delRel(manualRelationCalcDel)
-//    }
-//
-//}
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//

+ 0 - 85
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/MepSystemCalcController.kt

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

+ 0 - 342
datacenter/src/main/kotlin/com/persagy/server/datacenter/controllers/relation_calc/RelationCalcController.kt

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

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

@@ -205,6 +205,30 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                             }
                         }
                     }
+                    // 系统下的设备
+                    "systemEquipment" -> {
+                        dictSchemeCategoryList = defClassService.select(
+                                SFilter.eq("parentCode","system"),
+                                SFilter.eq("projectId",projectId!!)
+                        ).exec()
+
+                        val dictClassProjects = defClassService.select(
+                                SFilter.eq("parentCode","equipment"),
+                                SFilter.eq("projectId",projectId!!)
+                        ).exec()
+
+                        for (dictSystem in dictSchemeCategoryList) {
+                            dictSystem.children = ArrayList()
+                            val systemCode = dictSystem.code
+                            for (dictClassProject in dictClassProjects) {
+                                if(systemCode == dictClassProject.systemCode){
+                                    dictSystem.children!!.add(dictClassProject)
+                                }
+                            }
+                        }
+                    }
+
+
                     "equipmentAndComponent" -> {
                         /** 设备和部件 */
                         dictSchemeCategoryList = defClassService.select(

+ 28 - 31
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/RelToFromController.kt

@@ -35,10 +35,7 @@ import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.datacenter.wanda.obj.ZoneSpace
-import com.persagy.server.datacenter.wanda.rel.REq2Eq
-import com.persagy.server.datacenter.wanda.rel.REq2Sp
-import com.persagy.server.datacenter.wanda.rel.RSp2Sp
-import com.persagy.server.datacenter.wanda.rel.RSy2Sp
+import com.persagy.server.datacenter.wanda.rel.*
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.service.SBaseService
@@ -74,7 +71,7 @@ class RelToFromController {
     /** 设备服务建筑 */
     private val rEqForBdService = SBaseService(SMybatisDao(REqForBd::class.java))
     /** 系统下的设备 */
-    private val rSyEqService = SBaseService(SMybatisDao(RSyEq::class.java))
+    private val rSyEqService = SBaseService(SMybatisDao(REq2Sy::class.java))
     /** 设备服务于竖井 */
     private val rEqForShService = SBaseService(SMybatisDao(REqForSh::class.java))
     /** 设备所在竖井 */
@@ -113,6 +110,8 @@ class RelToFromController {
     private val rEq2EqService = SObjectService(SMybatisDao(REq2Eq::class.java))
     /** 数据中心设备服务 */
     private val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
+    /** 数据中心空间服务 */
+    private val zoneSpaceService = SObjectService(SMybatisDao(ZoneSpace::class.java))
     /** 数据中心楼层服务 */
     private val floorService = SObjectService(SMybatisDao(Floor::class.java))
     /** 字典项目服务 */
@@ -133,10 +132,9 @@ class RelToFromController {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
             if (graphCode == "MechInArch") {
-                val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("floorId"))).exec()
+                val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId),SFilter.not(SFilter.isNull("floorId"))).exec()
                 if (equipmentList.size>0) {
                     for (equipment in equipmentList) {
-
                         val toJsonObjArray =
                                 Configure.toJsonObjArray(graphCode, type, equipment.id!!, equipment.floorId!!,null)
                         if (isDel) {
@@ -188,7 +186,7 @@ class RelToFromController {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
             if (graphCode == "MechInArch") {
-                val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+                val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId),SFilter.not(SFilter.isNull("buildingId"))).exec()
                 if (equipmentList.size>0) {
                     for (equipment in equipmentList) {
                         val toJsonObjArray =
@@ -242,11 +240,11 @@ class RelToFromController {
             if (rSyEqList.size>0){
                 for (rSyEq in rSyEqList){
                     if (isDel) {
-                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSyEq.sysId!!, null)
+                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSyEq.id1!!, null)
                         EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                     }
                     val toJsonObjArray =
-                            Configure.toJsonObjArray(graphCode, type, rSyEq.sysId!!, rSyEq.equipId!!,null)
+                            Configure.toJsonObjArray(graphCode, type, rSyEq.id1!!, rSyEq.id2!!,null)
                     val createRel = EquipApi.createRel(dictProject!!.groupCode!!, projectId, toJsonObjArray)
                     if (!createRel){
                         logger.debug("系统下的设备关系失败:${toJsonObjArray.toJson()}")
@@ -314,12 +312,15 @@ class RelToFromController {
      */
     @Operation(summary= "设备和空间关系-同步到中台", description = "设备所在的空间(图类型 MechInArch 边类型 Eq2Sp ),设备服务的空间(图类型 MechForArch 边类型 Eq2Sp), ")
     @PostMapping("/eq2sp")
-    fun eq2Sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse {
+    fun eq2Sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false, @RequestParam(required = false) zoneType: String?): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
-            val rEq2SpList = rEq2SpService.select(
-                    SFilter.eq("projectId", projectId)
-            ).exec()
+            val filterList = arrayListOf(SFilter.eq("projectId", projectId),SFilter.eq("graphCode",graphCode), SFilter.eq("type",type))
+
+            if(zoneType != null){
+                filterList.add(SFilter.eq("zoneType",zoneType))
+            }
+            val rEq2SpList = rEq2SpService.select(filterList).exec()
             if (rEq2SpList.size>0) {
                 for (rEq2Sp in rEq2SpList) {
                     if (isDel) {
@@ -658,12 +659,11 @@ class RelToFromController {
     fun fl2sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
-//            val rSpinFlList = rSpinFlService.select(SFilter.eq("projectId", projectId)).exec()
-            val spaceList = spaceService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("floorId"))).exec()
-            if (spaceList.size>0){
-                for (rSpinFl in spaceList) {
+            val rSpinFlList = zoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("floorId"))).exec()
+            if (rSpinFlList.size>0){
+                for (rSpinFl in rSpinFlList) {
                     if (isDel) {
-                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSpinFl.floorId!!, rSpinFl.id!!)
+                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSpinFl.floorId!!, null)
                         EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                     }
                     val toJsonObjArray =
@@ -681,8 +681,6 @@ class RelToFromController {
         }
     }
 
-    /** 数据中心空间服务 */
-    private val spaceService = SObjectService(SMybatisDao(ZoneSpace::class.java))
     /**
      * 建筑体下的业务空间
      */
@@ -691,12 +689,11 @@ class RelToFromController {
     fun bd2sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
-//            val rSpinBdList = rSpinBdService.select(SFilter.eq("projectId", projectId)).exec()
-            val spaceList = spaceService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("buildingId"))).exec()
-            if (spaceList.size>0){
-                for (rSpinBd in spaceList) {
+            val rSpinBdList = zoneSpaceService.select(SFilter.eq("projectId", projectId),SFilter.not(SFilter.isNull("buildingId"))).exec()
+            if (rSpinBdList.size>0){
+                for (rSpinBd in rSpinBdList) {
                     if (isDel) {
-                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSpinBd.buildingId!!, rSpinBd.id!!)
+                        val toJsonObj = Configure.toJsonObj(graphCode, type, rSpinBd.buildingId!!, null)
                         EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                     }
                     val toJsonObjArray =
@@ -806,12 +803,12 @@ class RelToFromController {
     fun sp2sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
-            val relContrast = Configure.relContrast(graphCode, type)
-            if (relContrast.isNullOrEmpty()){
-                return SBaseResponse(SResponseType.failure)
-            }
+//            val relContrast = Configure.relContrast(graphCode, type)
+//            if (relContrast.isNullOrEmpty()){
+//                return SBaseResponse(SResponseType.failure)
+//            }
 
-            val rSp2SpList = rSp2SpService.select(SFilter.eq("projectId", projectId), SFilter.eq("type",relContrast)).exec()
+            val rSp2SpList = rSp2SpService.select(SFilter.eq("projectId", projectId), SFilter.eq("type",type), SFilter.eq("graphCode",graphCode)).exec()
             if (rSp2SpList.size>0) {
                 for (rSp2Sp in rSp2SpList) {
                     if (isDel) {