|
@@ -155,6 +155,9 @@ open class ManualRelationCalcService {
|
|
/** 级联资产 */
|
|
/** 级联资产 */
|
|
val sCascadeQuery = SCascadeQuery()
|
|
val sCascadeQuery = SCascadeQuery()
|
|
sCascadeQuery.name = "objectInfo"
|
|
sCascadeQuery.name = "objectInfo"
|
|
|
|
+ if (!manualRelationCalcRequest.category.isNullOrEmpty()) {
|
|
|
|
+ sCascadeQuery.filters = "zoneType = '${manualRelationCalcRequest.category}'"
|
|
|
|
+ }
|
|
sCascadeQueryList.add(sCascadeQuery)
|
|
sCascadeQueryList.add(sCascadeQuery)
|
|
sQueryRequest.cascade = sCascadeQueryList
|
|
sQueryRequest.cascade = sCascadeQueryList
|
|
|
|
|
|
@@ -2274,7 +2277,7 @@ open class ManualRelationCalcService {
|
|
delete = REqForBdService.delete(SFilter.eq("projectId", projectId!!),
|
|
delete = REqForBdService.delete(SFilter.eq("projectId", projectId!!),
|
|
SFilter.eq("equipId", manualRelationCalcDel.fromId!!), SFilter.eq("buildingId", manualRelationCalcDel.toId!!))
|
|
SFilter.eq("equipId", manualRelationCalcDel.fromId!!), SFilter.eq("buildingId", manualRelationCalcDel.toId!!))
|
|
}else if (manualRelationCalcDel.relType == "sy2sp_for"){ /** 系统服务于业务空间 */
|
|
}else if (manualRelationCalcDel.relType == "sy2sp_for"){ /** 系统服务于业务空间 */
|
|
- delete = RSyForSpBaseService.delete(SFilter.eq("projectId", projectId!!),
|
|
|
|
|
|
+ delete = rSy2SpService.delete(SFilter.eq("projectId", projectId!!),
|
|
SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
|
|
SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
|
|
}else if (manualRelationCalcDel.relType == "sy2sh_for"){
|
|
}else if (manualRelationCalcDel.relType == "sy2sh_for"){
|
|
/** 系统服务于竖井 */
|
|
/** 系统服务于竖井 */
|
|
@@ -3646,7 +3649,7 @@ open class ManualRelationCalcService {
|
|
manualRelationCalcResponse.total = pageQuery.total
|
|
manualRelationCalcResponse.total = pageQuery.total
|
|
logger.debug("条件1= ${manualRelationCalcResponse.toJson()}")
|
|
logger.debug("条件1= ${manualRelationCalcResponse.toJson()}")
|
|
return manualRelationCalcResponse
|
|
return manualRelationCalcResponse
|
|
- }else if (manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_3") {
|
|
|
|
|
|
+ }else if (manualRelationCalcRequest.relType == "sp2sp_TrafficNetwork_2") {
|
|
/** 空间消防常开交通 */
|
|
/** 空间消防常开交通 */
|
|
val pageQuery = relZoneSpacefireOpenService.pageQuery(sQueryRequest, list)
|
|
val pageQuery = relZoneSpacefireOpenService.pageQuery(sQueryRequest, list)
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|