Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/adm-backgroud into develop

lijie 3 years ago
parent
commit
96da6fce9b

+ 4 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/common/utils/FloorLevelCheckUtil.kt

@@ -6,6 +6,7 @@ import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.lang3.StringUtils
 import org.springframework.beans.BeanUtils
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * 楼层号检查
@@ -14,6 +15,7 @@ import java.util.*
  * @date 2021-10-21
  */
 object FloorLevelCheckUtil {
+
     /**
      * 检查
      * @param views
@@ -98,7 +100,7 @@ object FloorLevelCheckUtil {
             }
             // 顶层
             if (floorName.startsWith("RF")) {
-                floor.type = 2
+                floor.type = 3
                 return floor
             }
             // 正常楼层/地下
@@ -125,7 +127,7 @@ object FloorLevelCheckUtil {
      * 楼层信息
      */
     class FloorLevel {
-        /** 楼层类型:0-地下,1-正常,2-顶层  */
+        /** 楼层类型:0-地下,1-正常,2-顶层夹层,3-顶层  */
         var type = 1
 
         /** 楼层号  */

+ 5 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/entities/Project.kt

@@ -33,6 +33,11 @@ open class Project {
     @Column(name = "config_json")
     var configJson: TaskEntity? = null
 
+    /** 集团编码 */
+    @ApiModelProperty(value = "集团编码")
+    @Column(name = "group_code")
+    var groupCode: String? = null
+
     /** 标准类型 */
     @ApiModelProperty(value = "标准类型")
     @Column(name = "type")