|
@@ -237,7 +237,7 @@ class FloorModelController {
|
|
|
|
|
|
// 调用数据中心绑定楼层的接口
|
|
|
// val prevFloors = floorMapper.getFloorByDcFloorId(request.floorId!!)
|
|
|
-// var prevBimId : String? = null
|
|
|
+ var prevBimId : String? = null
|
|
|
// var prevFloor : FloorModel? = null
|
|
|
// if(!prevFloors.isNullOrEmpty()){
|
|
|
// prevFloor = prevFloors[0]
|
|
@@ -248,11 +248,20 @@ class FloorModelController {
|
|
|
// prevFloor.floorIdList!!.remove(request.floorId!!)
|
|
|
// prevBimId = CommonService.generateBIMIDPrefix(prevFloor.projectId!!, prevFloor.folderId!!, prevFloor.floorName!!, false)
|
|
|
// }
|
|
|
+ /** 处理楼层id 获取之前的模型信息 */
|
|
|
+ if (!request.currentModelId.isNullOrEmpty()) {
|
|
|
+ try {
|
|
|
+ val floorModel = dataService.floorModelService.select(SFilter.eq("id", request.currentModelId!!)).entity()
|
|
|
+ prevBimId = CommonService.generateBIMIDPrefix(SPageContext.getHeader("ProjectId")!!, floorModel!!.folderId!!, floorModel!!.floorName!!, false)
|
|
|
+ } catch (e: Exception) {
|
|
|
+ e.printStackTrace()
|
|
|
+ }
|
|
|
+ }
|
|
|
val bimId = CommonService.generateBIMIDPrefix(floor.projectId!!, floor.folderId!!, floor.floorName!!, false)
|
|
|
val bindFloorRequest = BindFloorRequest()
|
|
|
bindFloorRequest.attributeMap["floorElevation"] = model.baseLevel
|
|
|
bindFloorRequest.bimId = bimId
|
|
|
-// bindFloorRequest.oldBimId = prevBimId
|
|
|
+ bindFloorRequest.oldBimId = prevBimId
|
|
|
bindFloorRequest.floorId = request.floorId
|
|
|
bindFloorRequest.floorMap = "${myProperties.fileService.baseGraph}/${floor.currentModelId}.jsonz"
|
|
|
bindFloorRequest.modelId = floor.id
|