Pārlūkot izejas kodu

新adm 配置修改

caiaf 4 gadi atpakaļ
vecāks
revīzija
2a2c6e9555

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

@@ -33,4 +33,9 @@ open class Project {
     @Column(name = "config_json")
     var configJson: TaskEntity? = null
 
+    /** 标准类型 */
+    @ApiModelProperty(value = "标准类型")
+    @Column(name = "type")
+    var type: String? = null
+
 }

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

@@ -22,7 +22,7 @@ object EquipmentAnalyzer {
 
     fun analyze(equipmentService: SObjectService<Equipment>, baseObj: BaseObj<AllComponents>, equipments: ArrayList<Equipment>?, bimIdPrefix: String, equipMap: HashMap<String, BaseComponent>, flag: Boolean, equipCompService: SObjectService<EquipComp>, infoPointCompService: SObjectService<InfoPointComp>,unrecognizedEquipService: SObjectService<UnrecognizedEquip>): Boolean {
 
-        if(flag){
+        if(!flag){
             return analyze1(equipmentService,baseObj,equipments,bimIdPrefix,equipMap)
         }else{
             return analyze2(equipmentService,baseObj,equipments,bimIdPrefix,equipMap,equipCompService,infoPointCompService,unrecognizedEquipService)

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

@@ -105,6 +105,9 @@ open class JSONAnalyzerService {
 //        val baseObj = mapper.readValue<BaseObj<AllComponents>>(json.toString(), mapper.typeFactory.constructParametricType(BaseObj::class.java, AllComponents::class.java))
         // 验证是否baseObj.modelId合法, 不合法不允许入库
         val modelFile = checkModelId(baseObj.modelId) ?: return "ModelId ${baseObj.modelId} 不存在!"
+
+        val checkProject = checkProject(modelFile.projectId)
+
         var result = true
         // 获取model, 更新字段
         result = result and ModelAnalyzer.analyze(dataService.modelFileService, modelFile, baseObj)
@@ -185,21 +188,37 @@ open class JSONAnalyzerService {
             return "处理BoundarySegment异常"
         }
 
-        //修改万达管道名称对应标准管道名称
-        val pdCompService = dataService.pdCompService // 管道对照
-        val pdComps = pdCompService.selectAll().exec()
-        val map = HashMap<String, String>()
-        for (pdComp in pdComps) {
-            map[pdComp.pPdName!!] = pdComp.pdName!!
+        var pipes = baseObj.elements!!.pipes as ArrayList<BaseComponent>?
+        var flexPipes = baseObj.elements!!.flexPipes as ArrayList<BaseComponent>?
+        var ducts = baseObj.elements!!.ducts as ArrayList<BaseComponent>?
+        var flexDucts = baseObj.elements!!.flexDucts as ArrayList<BaseComponent>?
+        var connectors = baseObj.elements!!.connectors
+
+
+        if(checkProject){
+            //修改万达管道名称对应标准管道名称
+            val pdCompService = dataService.pdCompService // 管道对照
+            val pdComps = pdCompService.selectAll().exec()
+            val map = HashMap<String, String>()
+            for (pdComp in pdComps) {
+                map[pdComp.pPdName!!] = pdComp.pdName!!
+            }
+            pipes = pipeConvert(null, baseObj.elements!!.pipes,map)
+            flexPipes = pipeConvert(null, baseObj.elements!!.flexPipes,map)
+            ducts = pipeConvert(null, baseObj.elements!!.flexPipes,map)
+            flexDucts = pipeConvert(baseObj.elements!!.ducts, null,map)
+            connectors = connectorConvert(baseObj.elements!!.connectors,map)
         }
 
+
         // 处理Pipe
         val revitIdMap = HashMap<String, BaseComponent>() //     revit_id --> 对象
         result = result and RevitIdAnalyzer.analyzePipesDucts(
                 dataService.pipeService as SObjectService<BaseComponent>,
                 baseObj,
                 //baseObj.elements!!.pipes as ArrayList<BaseComponent>?,
-                pipeConvert(null, baseObj.elements!!.pipes,map),
+//                pipeConvert(null, baseObj.elements!!.pipes,map),
+                pipes,
                 revitIdMap,
                 "Pipe"
         )
@@ -211,7 +230,8 @@ open class JSONAnalyzerService {
                 dataService.pipeService as SObjectService<BaseComponent>,
                 baseObj,
 //                baseObj.elements!!.flexPipes as ArrayList<BaseComponent>?,
-                pipeConvert(null, baseObj.elements!!.flexPipes,map),
+//                pipeConvert(null, baseObj.elements!!.flexPipes,map),
+                flexPipes,
                 revitIdMap,
                 "FlexPipe"
         )
@@ -223,7 +243,8 @@ open class JSONAnalyzerService {
                 dataService.ductService as SObjectService<BaseComponent>,
                 baseObj,
 //                baseObj.elements!!.ducts as ArrayList<BaseComponent>?,
-                pipeConvert(baseObj.elements!!.ducts, null,map),
+//                pipeConvert(baseObj.elements!!.ducts, null,map),
+                ducts,
                 revitIdMap,
                 "Duct"
         )
@@ -235,7 +256,8 @@ open class JSONAnalyzerService {
                 dataService.ductService as SObjectService<BaseComponent>,
                 baseObj,
 //                baseObj.elements!!.flexDucts as ArrayList<BaseComponent>?,
-                pipeConvert(baseObj.elements!!.flexDucts, null,map),
+//                pipeConvert(baseObj.elements!!.flexDucts, null,map),
+                flexDucts,
                 revitIdMap,
                 "FlexDuct"
         )
@@ -278,7 +300,7 @@ open class JSONAnalyzerService {
                 baseObj,
                 baseObj.elements!!.equipments,
                 bimIdPrefix, revitIdMap,
-                checkProject(modelFile.projectId),
+                checkProject,
                 dataService.equipCompService,
                 dataService.infoPointCompService,
                 dataService.unrecognizedEquipService
@@ -304,7 +326,8 @@ open class JSONAnalyzerService {
                 dataService.connectorService,
                 baseObj,
                 //连接件转换
-                connectorConvert(baseObj.elements!!.connectors,map),
+//                connectorConvert(baseObj.elements!!.connectors,map),
+                connectors,
                 revitIdMap
         )
         if (!result) {
@@ -381,9 +404,12 @@ open class JSONAnalyzerService {
 
     fun checkProject(projectId: String?): Boolean {
         if (projectId.isNullOrEmpty()) {
-            return false;
+            return false
         }
-        return dataService.projectService.select(SFilter.eq("id", projectId)).entity() == null;
+        val projectConfig = dataService.projectService.select(SFilter.eq("id", projectId)).entity()
+        return if(projectConfig == null){
+            false
+        }else projectConfig.type == "wanda"
     }
 
     /**

+ 24 - 23
revit-algorithm/src/main/resources-prod/application.yml

@@ -18,7 +18,7 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
     #    url:                                jdbc:postgresql://192.168.20.250:5432/postgres
     #    url:                                jdbc:postgresql://47.94.89.44:5432/datacenter
     username:                           postgres
@@ -49,7 +49,7 @@ spring:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
   activemq:
-    broker-url: failover:(tcp://192.168.64.14:61616)
+    broker-url: failover:(tcp://172.17.100.16:61616)
     in-memory: true
     pool:
       enabled: false
@@ -74,7 +74,8 @@ properties:
   #文件服务器配置
   fileService:
     # 基本属性
-    url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
+    #url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
+    url:                               http://47.93.33.207:8888/image-service/
     systemId:                          revit
     secret:                            63afbef6906c342b
     dir:                               model
@@ -98,7 +99,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://192.168.64.14:28888/scheduler/
+    url:                               http://172.17.100.16:8080/scheduler/
     createTask:                        ${properties.scheduler.url}task/create
     queryTask:                         ${properties.scheduler.url}task/query
     queryTaskResult:                   ${properties.scheduler.url}result/query
@@ -106,36 +107,36 @@ properties:
 
 
   datacenter:
-    url:                               http://192.168.64.14:28888/datacenter/object/
+    url:                               http://172.17.100.16:8080/datacenter/
     # 设备相关接口
-    equipCreate: ${properties.datacenter.url}equip/create
-    equipDelete: ${properties.datacenter.url}equip/delete
-    equipQuery: ${properties.datacenter.url}equip/query
-    equipUpdate: ${properties.datacenter.url}equip/update
+    equipCreate: ${properties.datacenter.url}object/equip/create
+    equipDelete: ${properties.datacenter.url}object/equip/delete
+    equipQuery: ${properties.datacenter.url}object/equip/query
+    equipUpdate: ${properties.datacenter.url}object/equip/update
     # 元空间相关接口
-    ispaceCreate: ${properties.datacenter.url}ispace/create
-    ispaceDelete: ${properties.datacenter.url}ispace/delete
-    ispaceQuery: ${properties.datacenter.url}ispace/query
-    ispaceUpdate: ${properties.datacenter.url}ispace/update
+    ispaceCreate: ${properties.datacenter.url}object/ispace/create
+    ispaceDelete: ${properties.datacenter.url}object/ispace/delete
+    ispaceQuery: ${properties.datacenter.url}object/ispace/query
+    ispaceUpdate: ${properties.datacenter.url}object/ispace/update
     # 部件相关接口
-    componentCreate: ${properties.datacenter.url}component/create
-    componentDelete: ${properties.datacenter.url}component/delete
-    componentQuery: ${properties.datacenter.url}component/query
-    componentUpdate: ${properties.datacenter.url}component/update
+    componentCreate: ${properties.datacenter.url}object/component/create
+    componentDelete: ${properties.datacenter.url}object/component/delete
+    componentQuery: ${properties.datacenter.url}object/component/query
+    componentUpdate: ${properties.datacenter.url}object/component/update
     # 楼层相关接口
-    floorQuery: ${properties.datacenter.url}floor/query
-    floorUpdate: ${properties.datacenter.url}floor/update
+    floorQuery: ${properties.datacenter.url}object/floor/query
+    floorUpdate: ${properties.datacenter.url}object/floor/update
     # 绑定楼层接口
-    floorBind: ${properties.datacenter.url}update/equip-ispace
+    floorBind: ${properties.datacenter.url}rel/update/equip-ispace
     # 资产接口
-    propertyQuery: ${properties.datacenter.url}property/query
-    propertyUpdate: ${properties.datacenter.url}property/update
+    propertyQuery: ${properties.datacenter.url}object/property/query
+    propertyUpdate: ${properties.datacenter.url}object/property/update
     # 同步构件接口
     windowCreate: ${properties.datacenter.url}window/create_ignore
     vwallCreate: ${properties.datacenter.url}vwall/create_ignore
     doorCreate: ${properties.datacenter.url}door/create_ignore
 
   message:
-    url: http://192.168.64.14:28888/message-center/
+    url: http://172.17.100.16:8080/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 18 - 18
revit-algorithm/src/main/resources-test/application.yml

@@ -106,30 +106,30 @@ properties:
 
 
   datacenter:
-    url:                               http://192.168.64.14:28888/datacenter/object/
+    url:                               http://192.168.64.14:28888/datacenter/
     # 设备相关接口
-    equipCreate: ${properties.datacenter.url}equip/create
-    equipDelete: ${properties.datacenter.url}equip/delete
-    equipQuery: ${properties.datacenter.url}equip/query
-    equipUpdate: ${properties.datacenter.url}equip/update
+    equipCreate: ${properties.datacenter.url}object/equip/create
+    equipDelete: ${properties.datacenter.url}object/equip/delete
+    equipQuery: ${properties.datacenter.url}object/equip/query
+    equipUpdate: ${properties.datacenter.url}object/equip/update
     # 元空间相关接口
-    ispaceCreate: ${properties.datacenter.url}ispace/create
-    ispaceDelete: ${properties.datacenter.url}ispace/delete
-    ispaceQuery: ${properties.datacenter.url}ispace/query
-    ispaceUpdate: ${properties.datacenter.url}ispace/update
+    ispaceCreate: ${properties.datacenter.url}object/ispace/create
+    ispaceDelete: ${properties.datacenter.url}object/ispace/delete
+    ispaceQuery: ${properties.datacenter.url}object/ispace/query
+    ispaceUpdate: ${properties.datacenter.url}object/ispace/update
     # 部件相关接口
-    componentCreate: ${properties.datacenter.url}component/create
-    componentDelete: ${properties.datacenter.url}component/delete
-    componentQuery: ${properties.datacenter.url}component/query
-    componentUpdate: ${properties.datacenter.url}component/update
+    componentCreate: ${properties.datacenter.url}object/component/create
+    componentDelete: ${properties.datacenter.url}object/component/delete
+    componentQuery: ${properties.datacenter.url}object/component/query
+    componentUpdate: ${properties.datacenter.url}object/component/update
     # 楼层相关接口
-    floorQuery: ${properties.datacenter.url}floor/query
-    floorUpdate: ${properties.datacenter.url}floor/update
+    floorQuery: ${properties.datacenter.url}object/floor/query
+    floorUpdate: ${properties.datacenter.url}object/floor/update
     # 绑定楼层接口
-    floorBind: ${properties.datacenter.url}update/equip-ispace
+    floorBind: ${properties.datacenter.url}rel/update/equip-ispace
     # 资产接口
-    propertyQuery: ${properties.datacenter.url}property/query
-    propertyUpdate: ${properties.datacenter.url}property/update
+    propertyQuery: ${properties.datacenter.url}object/property/query
+    propertyUpdate: ${properties.datacenter.url}object/property/update
     # 同步构件接口
     windowCreate: ${properties.datacenter.url}window/create_ignore
     vwallCreate: ${properties.datacenter.url}vwall/create_ignore