caiaf 4 лет назад
Родитель
Сommit
898229070b

+ 10 - 9
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/state/ExportPassedState_3.kt

@@ -105,17 +105,18 @@ class ExportPassedState_3 : ModelState {
                 val excelService = SSpringContextUtil.getBean(ExcelService::class.java) as ExcelService
                 excelService.readBlockingExcel2007()
                 // 多楼层的模型检查
-                val isPassed = monitorService.doMultiFloorCheck(it, excelService, floor.projectId!!, floor.folderId!!, floor.floorName)
+                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 = true
+//                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()

+ 2 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/json/JSONAnalyzerService.kt

@@ -211,7 +211,7 @@ open class JSONAnalyzerService {
                 dataService.pipeService as SObjectService<BaseComponent>,
                 baseObj,
 //                baseObj.elements!!.flexPipes as ArrayList<BaseComponent>?,
-                pipeConvert(null, baseObj.elements!!.pipes,map),
+                pipeConvert(null, baseObj.elements!!.flexPipes,map),
                 revitIdMap,
                 "FlexPipe"
         )
@@ -235,7 +235,7 @@ open class JSONAnalyzerService {
                 dataService.ductService as SObjectService<BaseComponent>,
                 baseObj,
 //                baseObj.elements!!.flexDucts as ArrayList<BaseComponent>?,
-                pipeConvert(baseObj.elements!!.ducts, null,map),
+                pipeConvert(baseObj.elements!!.flexDucts, null,map),
                 revitIdMap,
                 "FlexDuct"
         )