Browse Source

**************************************万达adm*********************************************
添加数据平台地址

zhangweixin 4 years ago
parent
commit
bb063bbd1e

+ 3 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/FloorApi.kt

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.syn.models.api.obj
 
 import com.alibaba.fastjson.JSONObject
+import com.persagy.base.extensions.toJson
 import com.persagy.base.utils.SHttpUtil
 import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.syn.Configure
@@ -94,6 +95,8 @@ object FloorApi {
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
                 val url = "${Configure.opts.data_rwd}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                logger.debug("url= ${url}")
+                logger.debug("boby= ${buildingTools.toJson()}")
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
                 if (postObject.result == "success") {
                     return true

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterBuilding.kt

@@ -109,7 +109,7 @@ class DataCenterBuilding {
                         }else {
                             /** 失败 */
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     }
 
@@ -129,7 +129,7 @@ class DataCenterBuilding {
                 }else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
                 /** 更改标记 */
                 synchronousMessageObjService.update(message)

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterComponent.kt

@@ -82,17 +82,17 @@ class DataCenterComponent {
                                     EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                                 if (!createRel) {
                                     message.sign = 2
-                                    message.count +1
+                                    message.count = message.count +1
                                 }
                             } else {
                                 message.sign = 2
-                                message.count +1
+                                message.count = message.count +1
                             }
                         }
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 }else {
@@ -118,7 +118,7 @@ class DataCenterComponent {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 }else {
@@ -136,7 +136,7 @@ class DataCenterComponent {
                 }else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
                 /** 更改标记 */
                 synchronousMessageObjService.update(message)

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterFloor.kt

@@ -81,7 +81,7 @@ class DataCenterFloor {
                                     val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, ObjArray)
                                     if (!createRel){
                                         message.sign = 2
-                                        message.count +1
+                                        message.count = message.count +1
                                     }
                                 } catch (e: Exception) {
                                     e.printStackTrace()
@@ -89,7 +89,7 @@ class DataCenterFloor {
                         }else {
                             /** 失败 */
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
 
                     }else {
@@ -98,7 +98,7 @@ class DataCenterFloor {
                 } else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
 
                 /** 更改标记 */
@@ -120,7 +120,7 @@ class DataCenterFloor {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 } else {
@@ -138,7 +138,7 @@ class DataCenterFloor {
                 }else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
                 /** 更改标记 */
                 synchronousMessageObjService.update(message)

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

@@ -78,7 +78,7 @@ class DataCenterShaft {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 } else {
                     message.sign = 0
@@ -103,7 +103,7 @@ class DataCenterShaft {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 } else {
                     message.sign = 0
@@ -120,7 +120,7 @@ class DataCenterShaft {
                 }else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
                 /** 更改标记 */
                 synchronousMessageObjService.update(message)

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

@@ -77,7 +77,7 @@ class DataCenterSystem {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 } else {
@@ -103,7 +103,7 @@ class DataCenterSystem {
                     }else {
                         /** 失败 */
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }else {
                     message.sign = 0
@@ -120,7 +120,7 @@ class DataCenterSystem {
                 }else {
                     /** 失败 */
                     message.sign = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
                 /** 更改标记 */
                 synchronousMessageObjService.update(message)

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

@@ -1121,23 +1121,23 @@ class RwdRelationAdd {
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.state = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 }else{
                     message.state = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
 
             }else{
                 message.state = 2
-                message.count +1
+                message.count = message.count +1
             }
             syncRwdMessageService.update(message, arrayListOf("state","count"))
         } catch (e: Exception) {
             e.printStackTrace()
             message.state = 2
-            message.count +1
+            message.count = message.count +1
             syncRwdMessageService.update(message, arrayListOf("state","count"))
         }
     }

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

@@ -1113,23 +1113,23 @@ class RwdRelationDel {
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.state = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 }else{
                     message.state = 2
-                    message.count +1
+                    message.count = message.count +1
                 }
 
             }else{
                 message.state = 2
-                message.count +1
+                message.count = message.count +1
             }
             syncRwdMessageService.update(message, arrayListOf("state","count"))
         } catch (e: Exception) {
             e.printStackTrace()
             message.state = 2
-            message.count +1
+            message.count = message.count +1
             syncRwdMessageService.update(message, arrayListOf("state","count"))
         }
     }

+ 36 - 36
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/AutomaticCalculationSync.kt

@@ -100,13 +100,13 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                            break
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -136,13 +136,13 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                             break
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -171,12 +171,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -205,12 +205,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel) {
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -239,12 +239,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -274,12 +274,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel) {
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -308,12 +308,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -349,12 +349,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -382,12 +382,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
 
                 }
@@ -417,12 +417,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -452,12 +452,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -486,12 +486,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -520,12 +520,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -554,12 +554,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -588,12 +588,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -622,12 +622,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -655,12 +655,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }
@@ -689,12 +689,12 @@ class AutomaticCalculationSync {
                         val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
                         if (!createRel){
                             message.sign = 2
-                            message.count +1
+                            message.count = message.count +1
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
                         message.sign = 2
-                        message.count +1
+                        message.count = message.count +1
                     }
                 }
             }