Browse Source

万达构件识别修改

caiaf 4 years ago
parent
commit
9f4fe18163

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

@@ -115,4 +115,12 @@ class Connector : BaseComponent(){
     @JSONField(name = "BelongBimId")
     @JsonProperty("BelongBimId")
     var belongBimId: String? = null
+
+
+    /** 管道类型 */
+    @ApiModelProperty(value = "管道类型")
+    @Column(name = "riser_state")
+    @JSONField(name = "RiserState")
+    @JsonProperty("RiserState")
+    var riserState: Int? = null
 }

+ 8 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/entities/Duct.kt

@@ -44,7 +44,7 @@ import javax.persistence.Table
 class Duct : BaseComponent(){
     /** 名称 */
     @ApiModelProperty(value = "名称")
-    @Column(name = "name")
+    @Column(name = "name")n
     @JSONField(name = "Name")
     @JsonProperty("Name")
     var name: String? = null
@@ -111,4 +111,11 @@ class Duct : BaseComponent(){
     @JSONField(name = "Parameters")
     @JsonProperty("Parameters")
     var parameters: ArrayList<Parameter>? = null
+
+    /** 管道类型 */
+    @ApiModelProperty(value = "管道类型")
+    @Column(name = "riser_state")
+    @JSONField(name = "RiserState")
+    @JsonProperty("RiserState")
+    var riserState: Int? = null
 }

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

@@ -91,4 +91,11 @@ class Pipe  : BaseComponent(){
     @JSONField(name = "Parameters")
     @JsonProperty("Parameters")
     var parameters: ArrayList<Parameter>? = null
+
+    /** 管道类型 */
+    @ApiModelProperty(value = "管道类型")
+    @Column(name = "riser_state")
+    @JSONField(name = "RiserState")
+    @JsonProperty("RiserState")
+    var riserState: Int? = null
 }

+ 1 - 1
scheduler/src/main/kotlin/cn/sagacloud/server/scheduler/models/TaskResultEntity.kt

@@ -28,5 +28,5 @@ class TaskResultEntity : SBaseEntity() {
     @ApiModelProperty(value = "任务执行结果")
     @Column(name = "content")
     @JsonProperty(value = "Content")
-    var content: String? =null
+    var content: Any? =null
 }