Explorar o código

新adm 配置修改

caiaf %!s(int64=4) %!d(string=hai) anos
pai
achega
9ac0a30f28

+ 1 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/endpoint/ModelFileService.kt

@@ -414,7 +414,7 @@ class ModelFileService {
         return uploadId
     }
 
-    val floorNamePattern = "^([F|B][1-9][0-9]{0,4}|RF)(M([1-9][0-9]{0,4})?)?\$"
+    val floorNamePattern = "^([F|B]\\d+|RF)M?\$"
     /**
      * 检查输入是否合法
      */

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

@@ -157,12 +157,12 @@ open class JSONAnalyzerService {
             return "处理column异常"
         }
         // 处理Space, 填充数据, replace插入表
-        result = result and SpaceAnalyzer.analyze(dataService.spaceService, baseObj, baseObj.elements!!.spaces)
-        if (!result) {
-            return "处理Space异常"
-        }
+//        result = result and SpaceAnalyzer.analyze(dataService.spaceService, baseObj, baseObj.elements!!.spaces)
+//        if (!result) {
+//            return "处理Space异常"
+//        }
         //---------------------------------------------------------
-        //12.20临时演示方案,room当作space
+       //room当作space
         result = result and SpaceAnalyzer.analyze(dataService.spaceService, baseObj, baseObj.elements!!.rooms)
         if (!result) {
             return "处理Room异常"