Browse Source

代码同步

caiaf 4 years ago
parent
commit
5b053492ed

+ 13 - 0
revit-algorithm/build.gradle

@@ -193,6 +193,19 @@ task buildProdWar {
     }
     finalizedBy(doWar)
 }
+
+// 打测试环境包
+task buildTestWar {
+    doFirst {
+        sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-test']
+        test.onlyIf {
+            project.hasProperty("needTest")
+        }
+    }
+    finalizedBy(doWar)
+
+}
+
 // 打开发环境包
 task buildDevWar {
     doFirst {

+ 3 - 4
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/state/ExportPassedState_3.kt

@@ -105,10 +105,9 @@ class ExportPassedState_3 : ModelState {
                 val excelService = SSpringContextUtil.getBean(ExcelService::class.java) as ExcelService
                 excelService.readBlockingExcel2007()
                 // 多楼层的模型检查
-                var isPassed = monitorService.doMultiFloorCheck(it, excelService, floor.projectId!!, floor.folderId!!, floor.floorName)
-                // 如果标高和轴网检查没通过, 则删除所有数据, 并回退到上个版本
-                /************************************************** 轴网计算 处理标志 *********************************************************************/
-//                var isPassed = true
+//                var isPassed = monitorService.doMultiFloorCheck(it, excelService, floor.projectId!!, floor.folderId!!, floor.floorName)
+//                // 如果标高和轴网检查没通过, 则删除所有数据, 并回退到上个版本
+//                /************************************************** 轴网计算 处理标志 *********************************************************************/
 //                if(!isPassed){
 //                    modelFileService.removeSingle(it, myProperties, isForce = true, isMarkDelete = false)
 //                    //发送标高和轴网检查没通过的消息

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

@@ -405,7 +405,6 @@ class ModelFileService {
 
     fun registerMultipartUpload(model: ModelFile, properties: MyProperties): String {
         val result = HttpService.sendPost(properties.fileService.registerMultipartUpload + model.fileKey, "")
-        println(result+"11111111111111111111111111111111111111")
         val resultObj = JSON.parseObject(result)
         val uploadId = resultObj.getString("UploadId")
         if(uploadId.isNullOrEmpty())

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

@@ -120,15 +120,15 @@ object EquipmentAnalyzer {
                     }
 
 
-                    if (null != family && !param.name.isNullOrEmpty()) {
-                        //信息点编码转换
-                        val infoPointComp = infoPointCompService.select(SFilter.eq("family", family), SFilter.eq("infoPointCode", param.name!!)).entity()
-                        if (infoPointComp != null) {
-                            infos[infoPointComp.sInfoPointCode!!] = param.value ?: ""
-                        } else {
-                            infos[param.name!!] = param.value ?: ""
-                        }
-                    }
+//                    if (null != family && !param.name.isNullOrEmpty()) {
+//                        //信息点编码转换
+//                        val infoPointComp = infoPointCompService.select(SFilter.eq("family", family), SFilter.eq("infoPointCode", param.name!!)).entity()
+//                        if (infoPointComp != null) {
+//                            infos[infoPointComp.sInfoPointCode!!] = param.value ?: ""
+//                        } else {
+//                            infos[param.name!!] = param.value ?: ""
+//                        }
+//                    }
                 }
                 var equipComp: EquipComp? = null
 
@@ -137,12 +137,17 @@ object EquipmentAnalyzer {
                     if(! obj.sysName.isNullOrEmpty()){
                         equipComp = equipCompService.select(SFilter.eq("bimTypeID",obj.bimTypeID!!), SFilter.eq("sysName",obj.sysName!!)).entity()
                         if(equipComp != null){
-                            obj.family = equipComp.classCode
+                            obj.family = equipComp.classCode?:"OTXXXX"
+                        }else{
+                            //未识别的设备类型,类型码转换为"OTXXXX",OT表示“其他系统”,“XXXX”表示未识别的设备
+                            obj.family = "OTXXXX"
                         }
                     }else{
                         equipComp = equipCompService.select(SFilter.eq("bimTypeID",obj.bimTypeID!!)).entity()
                         if(equipComp != null){
-                            obj.family = equipComp.classCode
+                            obj.family = equipComp.classCode?:"OTXXXX"
+                        }else{
+                            obj.family = "OTXXXX"
                         }
                     }
                     if(!obj.family.isNullOrEmpty()){
@@ -183,6 +188,7 @@ object EquipmentAnalyzer {
         equipmentService.delete(SFilter.eq("modelId", baseObj.modelId!!))
         val create = SCreateRequest<Equipment>()
         create.content = newEquipmnets
+//        create.content = equipments
         val result = equipmentService.createList(create)
         return SResponseType.success == result.result
     }