浏览代码

***********************WX*****************************
关系调整

张维新 4 年之前
父节点
当前提交
587f8ea963

+ 5 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/Configure.kt

@@ -179,7 +179,7 @@ object Configure {
      * @param objFrom       主对象 id
      * @param objTo         从对象 id
      */
-    fun toJsonObj(graphCode: String, relCode: String, objFrom: String, objTo: String?): JSONObject {
+    fun toJsonObj(graphCode: String, relCode: String, objFrom: String?, objTo: String?): JSONObject {
         /** 对象 */
         val jsonObject1 = JSONObject()
         /** 对象 */
@@ -188,8 +188,10 @@ object Configure {
         jsonObject["graphCode"] = graphCode
         /** 边类型编码 */
         jsonObject["relCode"] = relCode
-        /** 主对象 id */
-        jsonObject["objFrom"] = objFrom
+        if (!objFrom.isNullOrEmpty()){
+            /** 主对象 id */
+            jsonObject["objFrom"] = objFrom
+        }
         if (!objTo.isNullOrEmpty()){
             /** 从对象 id */
             jsonObject["objTo"] = objTo

+ 14 - 6
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdSpace.kt

@@ -31,6 +31,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
+import com.persagy.server.datacenter.models.entities.rel.RSpinFl
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
@@ -56,6 +57,8 @@ class RwdSpace {
     private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
     /** 空间所在的建筑 */
     val rSpinBdService = SObjectService(SMybatisDao(RSpinBd::class.java))
+    /** 空间所在的楼层 */
+    val rSpinFlService = SObjectService(SMybatisDao(RSpinFl::class.java))
     /**
      * 空间
      *
@@ -75,21 +78,24 @@ class RwdSpace {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
+
+                        val toJsonObj = Configure.toJsonObj("ArchSubset", "Bd2Sp", null, message.targetId)
                         /** 空间的建筑 */
                         val equipInBuildingList =
-                            EquipApi.equipInBuilding(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                            EquipApi.queryRelation(dictProject.groupCode!!, message.projectId!!, toJsonObj)
                         if (equipInBuildingList.size>0){
                             val hashMap = equipInBuildingList[0]
-                            if (hashMap.containsKey("objTo")){
-                                space.buildingId = hashMap["objTo"].toString()
+                            if (hashMap.containsKey("objFrom")){
+                                space.buildingId = hashMap["objFrom"].toString()
                             }
                         }
+                        val toJsonObj02 = Configure.toJsonObj("ArchSubset", "Fl2Sp", null, message.targetId)
                         /** 查询空间和楼层关系 */
-                        val equipInFloorList = EquipApi.equipInFloor(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        val equipInFloorList = EquipApi.queryRelation(dictProject.groupCode!!, message.projectId!!, toJsonObj02)
                         if (equipInFloorList.size>0){
                             val hashMap = equipInFloorList[0]
-                            if (hashMap.containsKey("objTo")){
-                                space.floorId = hashMap["objTo"].toString()
+                            if (hashMap.containsKey("objFrom")){
+                                space.floorId = hashMap["objFrom"].toString()
                             }
                         }
 
@@ -117,6 +123,8 @@ class RwdSpace {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
+
+
                         spaceService.update(space)
                         message.state = 0
                     } else {