caiaf 4 anos atrás
pai
commit
ca9cbd9815

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

@@ -108,4 +108,11 @@ class Connector : BaseComponent(){
     @JSONField(name = "ConnectId")
     @JsonProperty("ConnectId")
     var connectIdJson: ArrayList<String>? = null
+
+    /** 所属BIMID */
+    @ApiModelProperty(value = "所属BIMID")
+    @Column(name = "belong_bimid")
+    @JSONField(name = "BelongBimId")
+    @JsonProperty("BelongBimId")
+    var belongBimId: String? = null
 }

+ 1 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/datacenter/DataCenterService.kt

@@ -524,7 +524,7 @@ class DataCenterService {
         if(result != null && "success" == result.result){
             return true
         }
-        logger.error(result.toString())
+        logger.error(result.toJson())
         logger.error(createRequest.toJson())
         return false
     }

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

@@ -304,6 +304,7 @@ open class JSONAnalyzerService {
                 baseObj,
                 //连接件转换
                 connectorConvert(baseObj.elements!!.connectors,map),
+                bimIdPrefix,
                 revitIdMap
         )
         if (!result) {

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

@@ -48,7 +48,7 @@ object RevitIdAnalyzer {
         return SResponseType.success == result.result
     }
 
-    fun analyzeConnector(connectorService: SObjectService<Connector>, baseObj: BaseObj<AllComponents>, connectors: ArrayList<Connector>?, revitIdMap: HashMap<String, BaseComponent>) : Boolean{
+    fun analyzeConnector(connectorService: SObjectService<Connector>, baseObj: BaseObj<AllComponents>, connectors: ArrayList<Connector>?, bimIdPrefix: String, revitIdMap: HashMap<String, BaseComponent>) : Boolean{
         if(connectors == null || connectors.isEmpty())
             return true
         // revit id --> id
@@ -60,6 +60,7 @@ object RevitIdAnalyzer {
                 val tmp = revitIdMap[obj.owner!!]
                 obj.belong = tmp!!.id
                 obj.belongType = tmp.elementType
+                obj.belongBimId = "${bimIdPrefix}${tmp.sourceId}"
             }
             if(obj.revitId != null && obj.revitId!!.isNotEmpty())
                 connectorMap[obj.revitId!!] = obj.id!!