|
@@ -132,32 +132,35 @@ class ExportPassedState_3 : ModelState {
|
|
// 开始同步设备, 部件, 元空间
|
|
// 开始同步设备, 部件, 元空间
|
|
syncUtil.syncDataWithBindingFloor(syncFloor, it, floor)
|
|
syncUtil.syncDataWithBindingFloor(syncFloor, it, floor)
|
|
|
|
|
|
- val prevBimId = CommonService.generateBIMIDPrefix(SPageContext.getHeader("ProjectId")!!, floor!!.folderId!!, floor!!.floorName!!, false)
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- val bimId = CommonService.generateBIMIDPrefix(floor.projectId!!, floor.folderId!!, floor.floorName!!, false)
|
|
|
|
- val bindFloorRequest = BindFloorRequest()
|
|
|
|
- bindFloorRequest.attributeMap["floorElevation"] = it.baseLevel
|
|
|
|
- bindFloorRequest.bimId = bimId
|
|
|
|
- bindFloorRequest.oldBimId = prevBimId
|
|
|
|
- bindFloorRequest.floorId = floor.id
|
|
|
|
- bindFloorRequest.floorMap = "${myProperties.fileService.baseGraph}/${floor.currentModelId}.jsonz"
|
|
|
|
- bindFloorRequest.modelId = floor.id
|
|
|
|
- // 访问数据中心绑定楼层接口
|
|
|
|
- var message: MessageEntity
|
|
|
|
- if(!dataCenterService.bindFloor(bindFloorRequest, floor.projectId!!)){
|
|
|
|
- // 转状态到4
|
|
|
|
- it.status = 31
|
|
|
|
- it.syncRetryDate = Date()
|
|
|
|
- it.syncErrorMsg = "数据中心绑定楼层失败"
|
|
|
|
- dataService.modelFileService.update(it, arrayListOf("status", "syncRetryDate", "syncErrorMsg"))
|
|
|
|
- message = messageService.buildMessageEntityWithoutLink("${folderFloorName.first}的${folderFloorName.second}模型绑定楼层失败",MessageType.Error, it.projectId, arrayListOf(it.userId?:""),"即将重试")
|
|
|
|
- }else{
|
|
|
|
- // 转状态到4
|
|
|
|
- it.status = 4
|
|
|
|
- dataService.modelFileService.update(it, arrayListOf("status"))
|
|
|
|
- message = messageService.buildMessageEntityWithoutLink("${folderFloorName.first}的${folderFloorName.second}模型上传成功", MessageType.Success, it.projectId, arrayListOf(it.userId?:""), "")
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+// val prevBimId = CommonService.generateBIMIDPrefix(SPageContext.getHeader("ProjectId")!!, floor!!.folderId!!, floor!!.floorName!!, false)
|
|
|
|
+// val bimId = CommonService.generateBIMIDPrefix(floor.projectId!!, floor.folderId!!, floor.floorName!!, false)
|
|
|
|
+// val bindFloorRequest = BindFloorRequest()
|
|
|
|
+// bindFloorRequest.attributeMap["floorElevation"] = it.baseLevel
|
|
|
|
+// bindFloorRequest.bimId = bimId
|
|
|
|
+// bindFloorRequest.oldBimId = prevBimId
|
|
|
|
+// bindFloorRequest.floorId = floor.id
|
|
|
|
+// bindFloorRequest.floorMap = "${myProperties.fileService.baseGraph}/${floor.currentModelId}.jsonz"
|
|
|
|
+// bindFloorRequest.modelId = floor.id
|
|
|
|
+// // 访问数据中心绑定楼层接口
|
|
|
|
+// var message: MessageEntity
|
|
|
|
+// if(!dataCenterService.bindFloor(bindFloorRequest, floor.projectId!!)){
|
|
|
|
+// // 转状态到4
|
|
|
|
+// it.status = 31
|
|
|
|
+// it.syncRetryDate = Date()
|
|
|
|
+// it.syncErrorMsg = "数据中心绑定楼层失败"
|
|
|
|
+// dataService.modelFileService.update(it, arrayListOf("status", "syncRetryDate", "syncErrorMsg"))
|
|
|
|
+// message = messageService.buildMessageEntityWithoutLink("${folderFloorName.first}的${folderFloorName.second}模型绑定楼层失败",MessageType.Error, it.projectId, arrayListOf(it.userId?:""),"即将重试")
|
|
|
|
+// }else{
|
|
|
|
+// // 转状态到4
|
|
|
|
+// it.status = 4
|
|
|
|
+// dataService.modelFileService.update(it, arrayListOf("status"))
|
|
|
|
+// message = messageService.buildMessageEntityWithoutLink("${folderFloorName.first}的${folderFloorName.second}模型上传成功", MessageType.Success, it.projectId, arrayListOf(it.userId?:""), "")
|
|
|
|
+// }
|
|
|
|
+ // // 转状态到4
|
|
|
|
+ it.status = 4
|
|
|
|
+ dataService.modelFileService.update(it, arrayListOf("status"))
|
|
|
|
+ val message = messageService.buildMessageEntityWithoutLink("${folderFloorName.first}的${folderFloorName.second}模型上传成功", MessageType.Success, it.projectId, arrayListOf(it.userId?:""), "")
|
|
messageService.sendMessage(message)
|
|
messageService.sendMessage(message)
|
|
} catch (e: Exception) {
|
|
} catch (e: Exception) {
|
|
// 转状态到31
|
|
// 转状态到31
|