Bladeren bron

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

zhangweixin 4 jaren geleden
bovenliggende
commit
e146222bed

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

@@ -754,7 +754,7 @@ class RelToFromController {
 
                     for (rSy2Sp in rSy2SpList) {
                         if (isDel) {
-                            val toJsonObj = Configure.toJsonObj(graphCode, type, rSy2Sp.id1!!, null)
+                            val toJsonObj = Configure.toJsonObj(graphCode, type, rSy2Sp.id1!!, rSy2Sp.id2)
                             EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                         }
                         val toJsonObjArray =

+ 14 - 6
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/EquipApi.kt

@@ -70,7 +70,7 @@ object EquipApi {
         jsonObject["size"] = 1000
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject
@@ -100,7 +100,7 @@ object EquipApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject
@@ -133,7 +133,7 @@ object EquipApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!
@@ -166,7 +166,7 @@ object EquipApi {
 
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
             logger.debug("设备建筑url = ${url}")
             logger.debug("设备建筑boby= ${jsonObject.toJson()}")
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
@@ -195,7 +195,7 @@ object EquipApi {
     fun queryRelation(groupCode: String,projectId: String,jsonObject: JSONObject): ArrayList<HashMap<String, Any?>> {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!
@@ -221,7 +221,9 @@ object EquipApi {
     fun  createObj(groupCode: String,projectId: String, listObj: ArrayList<HashMap<String,Any?>>): Boolean {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            val url = "${opts.data_rwd}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            logger.debug("url=${url}")
+            logger.debug("boby=${listObj.toJson()}")
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listObj)
             if (postObject.result == "success") {
                 return true
@@ -282,6 +284,8 @@ object EquipApi {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
             val url = "${opts.data_rwd}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            logger.debug("url=${url}")
+            logger.debug("boby=${listId.toJson()}")
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listId)
             if (postObject.result == "success") {
                 return true
@@ -305,6 +309,8 @@ object EquipApi {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
             val url = "${opts.data_rwd}/rwd/instance/relation/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            logger.debug("url=${url}")
+            logger.debug("boby=${jsonArray}")
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonArray)
             if (postObject.result == "success") {
                 return true
@@ -324,6 +330,8 @@ object EquipApi {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
             val url = "${opts.data_rwd}/rwd/instance/relation/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            logger.debug("url=${url}")
+            logger.debug("boby=${jsonObject}")
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success") {
                 return true

+ 3 - 3
datasyn/src/main/resources/application-prod.yml

@@ -33,9 +33,9 @@ eureka:
 
 saga:
   dataPlatform:                        http://39.102.40.239:9970
-  data_org:                            http://172.172.173.22:8080
-  data_rwd:                            http://172.172.173.12:9932
-  data_dic:                            http://172.172.173.21:8080
+  data_org:                            http://192.168.100.33:9909/dmp-org
+  data_rwd:                            http://192.168.100.33:9909/dmp-rwd
+  data_dic:                            http://192.168.100.33:9909/dmp-dic
 mqtopid:
   exchange:                           exchange-dmp
   routingKey: