Browse Source

**************************************万达adm*********************************************
空间类型

zhangweixin 3 years ago
parent
commit
f70e2b6037

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/objects/SpaceService.kt

@@ -93,7 +93,7 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
             zoneSpace.buildingId = zoneIspace.buildingId
             zoneSpace.floorId = zoneIspace.floorId
             zoneSpace.bimId = zoneIspace.bimId
-            zoneSpace.classCode = "FunctionZone"
+            zoneSpace.classCode = "GeneralZone"
             zoneSpace.infos = zoneIspace.infos
             if(zoneIspace.outline != null){
                 zoneSpace.outline = arrayListOf(zoneIspace.outline!!)

+ 13 - 13
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectToFromController.kt

@@ -171,19 +171,19 @@ class ObjectToFromController {
                 if (!updateObj) {
                     logger.debug("设备更新失败:${equip.toJson()}")
                 }
-                if (!equip.buildingId.isNullOrEmpty()) {
-                    val toJsonObjArray =
-                        Configure.toJsonObjArray("MechInArch", "Eq2Bd", equip.id!!, equip.buildingId!!)
-                    if (!equip.floorId.isNullOrEmpty()){
-                        val toJsonObjArray2 =
-                            Configure.toJsonObjArray("MechInArch", "Eq2Fl", equip.id!!, equip.floorId!!)
-                        toJsonObjArray.add(toJsonObjArray2[0])
-                    }
-                    val createRel = EquipApi.createRel(dictProject.groupCode!!, projectId, toJsonObjArray)
-                    if (!createRel){
-                        logger.debug("设备和楼层的关系失败:${equip.toJson()}")
-                    }
-                }
+//                if (!equip.buildingId.isNullOrEmpty()) {
+//                    val toJsonObjArray =
+//                        Configure.toJsonObjArray("MechInArch", "Eq2Bd", equip.id!!, equip.buildingId!!)
+//                    if (!equip.floorId.isNullOrEmpty()){
+//                        val toJsonObjArray2 =
+//                            Configure.toJsonObjArray("MechInArch", "Eq2Fl", equip.id!!, equip.floorId!!)
+//                        toJsonObjArray.add(toJsonObjArray2[0])
+//                    }
+//                    val createRel = EquipApi.createRel(dictProject.groupCode!!, projectId, toJsonObjArray)
+//                    if (!createRel){
+//                        logger.debug("设备和楼层的关系失败:${equip.toJson()}")
+//                    }
+//                }
             }
             return SBaseResponse(SResponseType.success)
         } catch (e: Exception) {