|
@@ -105,17 +105,17 @@ class ExportPassedState_3 : ModelState {
|
|
|
val excelService = SSpringContextUtil.getBean(ExcelService::class.java) as ExcelService
|
|
|
excelService.readBlockingExcel2007()
|
|
|
// 多楼层的模型检查
|
|
|
-// var isPassed = monitorService.doMultiFloorCheck(it, excelService, floor.projectId!!, floor.folderId!!, floor.floorName)
|
|
|
-// // 如果标高和轴网检查没通过, 则删除所有数据, 并回退到上个版本
|
|
|
-// /************************************************** 轴网计算 处理标志 *********************************************************************/
|
|
|
-// if(!isPassed){
|
|
|
-// modelFileService.removeSingle(it, myProperties, isForce = true, isMarkDelete = false)
|
|
|
-// //发送标高和轴网检查没通过的消息
|
|
|
-// val message = messageService.buildMultiModelCheckErrorMessage(floor.projectId!!, it.userId?: "",
|
|
|
-// "${folderFloorName.first}的${folderFloorName.second}未通过模型检查,请修改后重新上传", excelService.getDownloadUrl(it.id!!), folderFloorName)
|
|
|
-// messageService.sendMessage(message)
|
|
|
-// return@forEach
|
|
|
-// }
|
|
|
+ var isPassed = monitorService.doMultiFloorCheck(it, excelService, floor.projectId!!, floor.folderId!!, floor.floorName)
|
|
|
+ // 如果标高和轴网检查没通过, 则删除所有数据, 并回退到上个版本
|
|
|
+ /************************************************** 轴网计算 处理标志 *********************************************************************/
|
|
|
+ if(!isPassed){
|
|
|
+ modelFileService.removeSingle(it, myProperties, isForce = true, isMarkDelete = false)
|
|
|
+ //发送标高和轴网检查没通过的消息
|
|
|
+ val message = messageService.buildMultiModelCheckErrorMessage(floor.projectId!!, it.userId?: "",
|
|
|
+ "${folderFloorName.first}的${folderFloorName.second}未通过模型检查,请修改后重新上传", excelService.getDownloadUrl(it.id!!), folderFloorName)
|
|
|
+ messageService.sendMessage(message)
|
|
|
+ return@forEach
|
|
|
+ }
|
|
|
|
|
|
val syncFloor = SSpringContextUtil.getBean(SyncFloor::class.java) as SyncFloor
|
|
|
syncFloor.init(floor).prepareDataCenterData()
|