|
@@ -29,7 +29,9 @@ package com.persagy.server.syn.services.jms
|
|
import com.persagy.database.SFilter
|
|
import com.persagy.database.SFilter
|
|
import com.persagy.mybatis.SMybatisDao
|
|
import com.persagy.mybatis.SMybatisDao
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DictProject
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DictProject
|
|
|
|
+import com.persagy.server.datacenter.models.entities.objects.Building
|
|
import com.persagy.server.datacenter.models.entities.objects.Floor
|
|
import com.persagy.server.datacenter.models.entities.objects.Floor
|
|
|
|
+import com.persagy.server.datacenter.models.entities.objects.Project
|
|
import com.persagy.server.syn.Configure
|
|
import com.persagy.server.syn.Configure
|
|
import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
|
|
import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
|
|
import com.persagy.server.syn.models.api.obj.BuildingApi
|
|
import com.persagy.server.syn.models.api.obj.BuildingApi
|
|
@@ -53,7 +55,8 @@ class RwdFloor {
|
|
var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
|
|
var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
|
|
/** 项目所属的集团 */
|
|
/** 项目所属的集团 */
|
|
private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
|
|
private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
|
|
-
|
|
|
|
|
|
+ /** 建筑服务 */
|
|
|
|
+ private val buildingService = SObjectService(SMybatisDao(Building::class.java))
|
|
/**
|
|
/**
|
|
* 楼层
|
|
* 楼层
|
|
*
|
|
*
|
|
@@ -78,7 +81,7 @@ class RwdFloor {
|
|
val hashMap = floorInBuildingList[0]
|
|
val hashMap = floorInBuildingList[0]
|
|
floorDataConversions.buildingId = hashMap["objFrom"].toString()
|
|
floorDataConversions.buildingId = hashMap["objFrom"].toString()
|
|
}
|
|
}
|
|
- floorService.insert(floorDataConversions)
|
|
|
|
|
|
+ floorService.replace(floorDataConversions)
|
|
message.state = 0
|
|
message.state = 0
|
|
} else {
|
|
} else {
|
|
message.state = 2
|
|
message.state = 2
|
|
@@ -102,7 +105,7 @@ class RwdFloor {
|
|
dictProject!!.groupCode!!,
|
|
dictProject!!.groupCode!!,
|
|
queryIdList[0]
|
|
queryIdList[0]
|
|
)
|
|
)
|
|
- floorService.update(floorDataConversions)
|
|
|
|
|
|
+ floorService.replace(floorDataConversions)
|
|
message.state = 0
|
|
message.state = 0
|
|
} else {
|
|
} else {
|
|
message.state = 2
|
|
message.state = 2
|