|
@@ -27,12 +27,15 @@
|
|
|
package com.persagy.server.services.rel
|
|
|
|
|
|
import com.persagy.base.extensions.toJson
|
|
|
+import com.persagy.database.extensions.keyValue
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
+import com.persagy.server.Opt
|
|
|
import com.persagy.server.datacenter.models.entities.rel.REq2Sp
|
|
|
import com.persagy.server.datacenter.models.entities.rel.REqInSpBase
|
|
|
import com.persagy.server.datacenter.models.entities.rel.REqInSpBaseList
|
|
|
import com.persagy.server.datacenter.models.entities.rel.RSpInEqBaseList
|
|
|
import com.persagy.server.services.base.RService
|
|
|
+import com.persagy.server.services.base.Service
|
|
|
import com.persagy.service.SObjectService
|
|
|
import com.persagy.service.SPageContext
|
|
|
import com.persagy.service.models.enums.SResponseType
|
|
@@ -81,120 +84,15 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
|
|
|
|
|
|
/** 发送消息 */
|
|
|
// messageHandler.sendMessage(jsonObject.toString())
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","11",rEqInSpBase.equipId!!,rEqInSpBase.spaceId!!)
|
|
|
}
|
|
|
} catch (e: Exception) {
|
|
|
e.printStackTrace()
|
|
|
}
|
|
|
}
|
|
|
SCreateResponse(SResponseType.success)
|
|
|
-// if (type == "HeatingZone"){
|
|
|
-// REqInSpZoneHeatingService.create(rEqInSpBaseList.content)
|
|
|
-// }else if (type == "CleanZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneClean>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneClean = REqInSpZoneClean()
|
|
|
-// rEqInSpZoneClean.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneClean.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneClean)
|
|
|
-// }
|
|
|
-// REqInSpZoneCleanService.create(list)
|
|
|
-// }else if (type == "DomesticWaterSupplyZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneDomesticWaterSupply>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneDomesticWaterSupply = REqInSpZoneDomesticWaterSupply()
|
|
|
-// rEqInSpZoneDomesticWaterSupply.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneDomesticWaterSupply.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneDomesticWaterSupply)
|
|
|
-// }
|
|
|
-//
|
|
|
-// REqInSpZoneDomesticWaterSupplyService.create(list)
|
|
|
-// }else if (type == "NetworkZone" ){
|
|
|
-// val list= ArrayList<REqInSpZoneNetwork>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneNetwork = REqInSpZoneNetwork()
|
|
|
-// rEqInSpZoneNetwork.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneNetwork.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneNetwork)
|
|
|
-// }
|
|
|
-//
|
|
|
-// REqInSpZoneNetworkService.create(list)
|
|
|
-// }else if (type == "TenantZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneTenant>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneTenant = REqInSpZoneTenant()
|
|
|
-// rEqInSpZoneTenant.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneTenant.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneTenant)
|
|
|
-// }
|
|
|
-// REqInSpZoneTenantService.create(list)
|
|
|
-// }else if (type == "AirConditioningZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneAirConditioning>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneAirConditioning = REqInSpZoneAirConditioning()
|
|
|
-// rEqInSpZoneAirConditioning.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneAirConditioning.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneAirConditioning)
|
|
|
-// }
|
|
|
-// REqInSpZoneAirConditioningService.create(list)
|
|
|
-// }else if (type == "FunctionZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneFunction>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneFunction = REqInSpZoneFunction()
|
|
|
-// rEqInSpZoneFunction.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneFunction.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneFunction)
|
|
|
-// }
|
|
|
-// REqInSpZoneFunctionService.create(list)
|
|
|
-// }else if (type == "FireZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneFire>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneFire = REqInSpZoneFire()
|
|
|
-// rEqInSpZoneFire.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneFire.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneFire)
|
|
|
-// }
|
|
|
-// REqInSpZoneFireService.create(list)
|
|
|
-// }else if (type == "SecurityZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneSecurity>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneSecurity = REqInSpZoneSecurity()
|
|
|
-// rEqInSpZoneSecurity.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneSecurity.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneSecurity)
|
|
|
-// }
|
|
|
-// REqInSpZoneSecurityService.create(list)
|
|
|
-// }else if (type == "GeneralZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneGeneral>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneGeneral = REqInSpZoneGeneral()
|
|
|
-// rEqInSpZoneGeneral.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneGeneral.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneGeneral)
|
|
|
-// }
|
|
|
-// REqInSpZoneGeneralService.create(list)
|
|
|
-// }else if (type == "PowerSupplyZone"){
|
|
|
-// val list =ArrayList<REqInSpZonePowerSupply>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZonePowerSupply = REqInSpZonePowerSupply()
|
|
|
-// rEqInSpZonePowerSupply.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZonePowerSupply.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZonePowerSupply)
|
|
|
-// }
|
|
|
-// REqInSpZonePowerSupplyService.create(list)
|
|
|
-// }else if (type == "LightingZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneLighting>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList.content){
|
|
|
-// val rEqInSpZoneLighting = REqInSpZoneLighting()
|
|
|
-// rEqInSpZoneLighting.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneLighting.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneLighting)
|
|
|
-// }
|
|
|
-// REqInSpZoneLightingService.create(list)
|
|
|
-// }else{
|
|
|
-// val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.failure)
|
|
|
-// sCreateResponse.message = "空间分区类型不存在:$type"
|
|
|
-// sCreateResponse
|
|
|
-// }
|
|
|
+
|
|
|
} catch (e: Exception){
|
|
|
e.printStackTrace()
|
|
|
SCreateResponse(SResponseType.failure,e.message.toString())
|
|
@@ -221,120 +119,6 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
|
|
|
}
|
|
|
REq2SpService.deleteByKeysList(list)
|
|
|
|
|
|
-// if (type == "HeatingZone"){
|
|
|
-// val list= ArrayList<REqInSpZoneHeating>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneHeating = REqInSpZoneHeating()
|
|
|
-// rEqInSpZoneHeating.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneHeating.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneHeating)
|
|
|
-// }
|
|
|
-// REqInSpZoneHeatingService.deleteByKeysList(list)
|
|
|
-// }else if (type == "CleanZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneClean>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneClean = REqInSpZoneClean()
|
|
|
-// rEqInSpZoneClean.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneClean.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneClean)
|
|
|
-// }
|
|
|
-// REqInSpZoneCleanService.deleteByKeysList(list)
|
|
|
-// }else if (type == "DomesticWaterSupplyZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneDomesticWaterSupply>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneDomesticWaterSupply = REqInSpZoneDomesticWaterSupply()
|
|
|
-// rEqInSpZoneDomesticWaterSupply.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneDomesticWaterSupply.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneDomesticWaterSupply)
|
|
|
-// }
|
|
|
-// REqInSpZoneDomesticWaterSupplyService.deleteByKeysList(list)
|
|
|
-// }else if (type == "NetworkZone" ){
|
|
|
-// val list= ArrayList<REqInSpZoneNetwork>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneNetwork = REqInSpZoneNetwork()
|
|
|
-// rEqInSpZoneNetwork.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneNetwork.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneNetwork)
|
|
|
-// }
|
|
|
-// REqInSpZoneNetworkService.deleteByKeysList(list)
|
|
|
-// }else if (type == "TenantZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneTenant>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneTenant = REqInSpZoneTenant()
|
|
|
-// rEqInSpZoneTenant.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneTenant.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneTenant)
|
|
|
-// }
|
|
|
-// REqInSpZoneTenantService.deleteByKeysList(list)
|
|
|
-// }else if (type == "AirConditioningZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneAirConditioning>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneAirConditioning = REqInSpZoneAirConditioning()
|
|
|
-// rEqInSpZoneAirConditioning.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneAirConditioning.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneAirConditioning)
|
|
|
-// }
|
|
|
-// REqInSpZoneAirConditioningService.deleteByKeysList(list)
|
|
|
-// }else if (type == "FunctionZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneFunction>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneFunction = REqInSpZoneFunction()
|
|
|
-// rEqInSpZoneFunction.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneFunction.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneFunction)
|
|
|
-// }
|
|
|
-// REqInSpZoneFunctionService.deleteByKeysList(list)
|
|
|
-// }else if (type == "FireZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneFire>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneFire = REqInSpZoneFire()
|
|
|
-// rEqInSpZoneFire.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneFire.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneFire)
|
|
|
-// }
|
|
|
-// REqInSpZoneFireService.deleteByKeysList(list)
|
|
|
-// }else if (type == "SecurityZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneSecurity>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneSecurity = REqInSpZoneSecurity()
|
|
|
-// rEqInSpZoneSecurity.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZoneSecurity.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZoneSecurity)
|
|
|
-// }
|
|
|
-// REqInSpZoneSecurityService.deleteByKeysList(list)
|
|
|
-// }else if (type == "GeneralZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneGeneral>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneGeneral = REqInSpZoneGeneral()
|
|
|
-// rEqInSpZoneGeneral.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneGeneral.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneGeneral)
|
|
|
-// }
|
|
|
-//
|
|
|
-// REqInSpZoneGeneralService.deleteByKeysList(list)
|
|
|
-// }else if (type == "PowerSupplyZone"){
|
|
|
-// val list =ArrayList<REqInSpZonePowerSupply>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZonePowerSupply = REqInSpZonePowerSupply()
|
|
|
-// rEqInSpZonePowerSupply.spaceId = rEqInSpBase.spaceId
|
|
|
-// rEqInSpZonePowerSupply.equipId = rEqInSpBase.equipId
|
|
|
-// list.add(rEqInSpZonePowerSupply)
|
|
|
-// }
|
|
|
-// REqInSpZonePowerSupplyService.deleteByKeysList(list)
|
|
|
-// }else if (type == "LightingZone"){
|
|
|
-// val list = ArrayList<REqInSpZoneLighting>()
|
|
|
-// for (rEqInSpBase in rEqInSpBaseList){
|
|
|
-// val rEqInSpZoneLighting = REqInSpZoneLighting()
|
|
|
-// rEqInSpZoneLighting.equipId = rEqInSpBase.equipId
|
|
|
-// rEqInSpZoneLighting.spaceId = rEqInSpBase.spaceId
|
|
|
-// list.add(rEqInSpZoneLighting)
|
|
|
-// }
|
|
|
-// REqInSpZoneLightingService.deleteByKeysList(list)
|
|
|
-// }else{
|
|
|
-// val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.failure)
|
|
|
-// sCreateResponse.message = "空间分区类型不存在:$type"
|
|
|
-// sCreateResponse
|
|
|
-// }
|
|
|
} catch (e: Exception) {
|
|
|
e.printStackTrace()
|
|
|
return SBaseResponse(SResponseType.failure, e.message!!)
|
|
@@ -376,7 +160,8 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
|
|
|
|
|
|
/** 发送消息 */
|
|
|
// RService.messageHandler.sendMessage(jsonObject.toString())
|
|
|
-
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.equipId!!,successList.toJson()!!)
|
|
|
val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
|
|
|
if (failureList.size>0){
|
|
|
sCreateResponse.message ="失败对象:"+failureList.toJson()
|
|
@@ -426,7 +211,8 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
|
|
|
|
|
|
/** 发送消息 */
|
|
|
// RService.messageHandler.sendMessage(jsonObject.toString())
|
|
|
-
|
|
|
+ /** 发送消息 */
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
|
|
|
if (failureList.size>0){
|
|
|
val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
|
|
|
sCreateResponse.message ="失败对象:"+failureList.toJson()
|
|
@@ -485,6 +271,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
|
|
|
jsonObject.put("linkId",successList.toJson())
|
|
|
/** 发送消息 */
|
|
|
// messageHandler.sendMessage(jsonObject.toString())
|
|
|
+ rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","14",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
|
|
|
if (failureList.size>0){
|
|
|
val sCreateResponse = SCreateResponse<RSpInEqBaseList>(SResponseType.success)
|
|
|
sCreateResponse.message ="失败对象:"+failureList.toJson()
|