浏览代码

Merge remote-tracking branch 'origin/master'

zhangweixin 4 年之前
父节点
当前提交
07908ad645

+ 2 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/jms/bean/SyncRwdDatacenterMessage.kt

@@ -100,5 +100,7 @@ class SyncRwdDatacenterMessage : Serializable {
     @Column(name = "state")
     var state: Int? = null
 
+    @Column(name = "count")
+    var count: Int = 0
 
 } // Class SynchronousMessageObj

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdBuilding.kt

@@ -74,13 +74,15 @@ class RwdBuilding {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
 
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -97,12 +99,14 @@ class RwdBuilding {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
 
             }
             Configure.RWDDELETE -> {
@@ -115,9 +119,10 @@ class RwdBuilding {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
 

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdComponent.kt

@@ -91,12 +91,14 @@ class RwdComponent {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -113,12 +115,14 @@ class RwdComponent {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -130,9 +134,10 @@ class RwdComponent {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
     }

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdEquip.kt

@@ -93,12 +93,14 @@ class RwdEquip {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -115,12 +117,14 @@ class RwdEquip {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -132,9 +136,10 @@ class RwdEquip {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
     }

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdFloor.kt

@@ -82,12 +82,14 @@ class RwdFloor {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -104,12 +106,14 @@ class RwdFloor {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -121,9 +125,10 @@ class RwdFloor {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
 

+ 10 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdShaft.kt

@@ -76,12 +76,14 @@ class RwdShaft {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -98,17 +100,20 @@ class RwdShaft {
                         if (update) {
                             message.state = 0
                         } else {
-                            message.state = 1
+                            message.state = 2
+                            message.count+1
                         }
 
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -120,9 +125,10 @@ class RwdShaft {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
     }

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

@@ -30,9 +30,11 @@ import com.persagy.database.SFilter
 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.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
+import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.server.syn.models.tools.SpaceUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -52,7 +54,8 @@ class RwdSpace {
     var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
     /** 项目所属的集团 */
     private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
-
+    /** 空间所在的建筑 */
+    val rSpinBdService = SObjectService(SMybatisDao(RSpinBd::class.java))
     /**
      * 空间
      *
@@ -72,34 +75,36 @@ class RwdSpace {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-//                        /** 空间的建筑 */
-//                        val equipInBuildingList =
-//                            EquipApi.equipInBuilding(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
-//                        if (equipInBuildingList.size>0){
-//                            val hashMap = equipInBuildingList[0]
-//                            if (hashMap.containsKey("objTo")){
-//                                equipment.buildingId = hashMap["objTo"].toString()
-//                            }
-//                        }
-//                        /** 查询空间和楼层关系 */
-//                        val equipInFloorList = EquipApi.equipInFloor(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
-//                        if (equipInFloorList.size>0){
-//                            val hashMap = equipInFloorList[0]
-//                            if (hashMap.containsKey("objTo")){
-//                                equipment.floorId = hashMap["objTo"].toString()
-//                            }
-//                        }
+                        /** 空间的建筑 */
+                        val equipInBuildingList =
+                            EquipApi.equipInBuilding(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        if (equipInBuildingList.size>0){
+                            val hashMap = equipInBuildingList[0]
+                            if (hashMap.containsKey("objTo")){
+                                space.buildingId = hashMap["objTo"].toString()
+                            }
+                        }
+                        /** 查询空间和楼层关系 */
+                        val equipInFloorList = EquipApi.equipInFloor(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        if (equipInFloorList.size>0){
+                            val hashMap = equipInFloorList[0]
+                            if (hashMap.containsKey("objTo")){
+                                space.floorId = hashMap["objTo"].toString()
+                            }
+                        }
 
                         spaceService.insert(space)
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -116,12 +121,14 @@ class RwdSpace {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -133,9 +140,10 @@ class RwdSpace {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
     }

+ 8 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdSystem.kt

@@ -75,12 +75,14 @@ class RwdSystem {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDUPDATE -> {
                 /** 修改 */
@@ -97,12 +99,14 @@ class RwdSystem {
                         message.state = 0
                     } else {
                         message.state = 2
+                        message.count+1
                     }
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
@@ -114,9 +118,10 @@ class RwdSystem {
                     message.state = 0
                 } else {
                     message.state = 2
+                    message.count+1
                 }
                 /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+                syncRwdMessageService.update(message, arrayListOf("state","count"))
             }
         }
     }