Browse Source

部件识别修改

caiaf 3 years ago
parent
commit
0ac1b76c4b

+ 2 - 2
revit-algorithm/build.gradle

@@ -166,7 +166,7 @@ dependencyManagement {
 // 下面是配置文件选择
 /*******************************************************/
 
-sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-prod']
+sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-test']
 //ext.needTest = 'true'
 
 task doWar{
@@ -197,7 +197,7 @@ task buildProdWar {
 // 打测试环境包
 task buildTestWar {
     doFirst {
-        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-prod']
+        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-test']
         test.onlyIf {
             project.hasProperty("needTest")
         }

+ 3 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/sync/SyncEquipPart.kt

@@ -97,8 +97,9 @@ class SyncEquipPart : SyncObject{
         val sb = StringBuilder()
         dataCenter.forEach { (_, dcEquip) ->
             if(dcEquip.bimId != null && bimMap.contains(dcEquip.bimId!!)){
-                val equip = bimMap[dcEquip.bimId!!]
-                if(!equip!!.family.equals(dcEquip.classCode)){
+                val equip = bimMap[dcEquip.bimId!!]!!
+                val family = equip.family
+                if(!family.isNullOrEmpty() && !dcEquip.classCode!!.endsWith(family!!)){
                     // 需要先删除, 后添加
                     deleteList.add(dcEquip)
                     return@forEach

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

@@ -75,7 +75,7 @@ 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://47.93.33.207:8888/image-service/
+    url:                               http//39.97.179.199:8891/image-service/
     systemId:                          revit
     secret:                            63afbef6906c342b
     dir:                               model

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

@@ -1,6 +1,6 @@
 ###############################################################################################################
 server:
-  port: 8080
+  port: 8082
   tomcat:
     basedir:                            /mnt/harddisk/saga/tomcatTemp