Browse Source

********************WX***********************
同步关系

zhangweixin 4 năm trước cách đây
mục cha
commit
e99f2c3ead

+ 4 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt

@@ -223,11 +223,11 @@ open class DefFuncId: Serializable {
     @Schema(description = "路径")
     var path: String? = null
         get() {
-            return if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
-                code
-            } else if (code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"){
+            return if ( code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"){
                 "infos.$code"
-            } else {
+            } else if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
+                code
+            }  else {
                 "infos.$code"
             }
         }

+ 3 - 2
datacenter/src/main/kotlin/com/persagy/server/controllers/graphtype/GraphicTypeController.kt

@@ -38,6 +38,7 @@ import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
 import javax.servlet.http.HttpServletResponse
@@ -104,8 +105,8 @@ open class GraphicTypeController {
      * @return  导入状态
      */
     @Operation(summary = "导入excel", description = "")
-    @PostMapping("/import")
-    fun importExcel(@RequestParam("file") file: MultipartFile, @RequestParam relType: String, @RequestParam zoneType: String? = null) : SBaseResponse {
+    @PostMapping("/import",consumes = [MediaType.MULTIPART_FORM_DATA_VALUE])
+    fun importExcel(@RequestPart("file") file: MultipartFile, @RequestParam relType: String, @RequestParam zoneType: String? = null) : SBaseResponse {
         try {
             RelationTypeProjectService.importExcel(file, relType, zoneType)
         }catch (e : Exception){

+ 4 - 1
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -271,7 +271,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
 
             // 填写识别码对应
             val code = sheet.getRow(2).getCell(1).toString()
-
+            logger.debug("识别编码:${code}  ******************************************")
             preExcelRelation(sheet, projectId!!, relType, code, zoneType)
 
             readExcelRelation(sheet, projectId, relType, zoneType)
@@ -309,6 +309,8 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 }
                 val idCode1ColValue = row.getCell(idCode1Col).toString()
                 val idCode2ColValue = row.getCell(idCode2Col).toString()
+                logger.debug("idCode1ColValue=${idCode1ColValue}")
+                logger.debug("idCode2ColValue=${idCode2ColValue}")
                 // 主对象识别码为空,则不能导入数据
                 if (idCode1ColValue.isEmpty() || idCode2ColValue.isEmpty()) {
                     row.createCell(stateCol).setCellValue("失败,主对象or从对象的识别编码为空")
@@ -317,6 +319,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 }
 
                 if (code.compareTo("对象ID", true) == 0) {
+
                     row.createCell(id1Col).setCellValue(idCode1ColValue)
                     row.createCell(id2Col).setCellValue(idCode2ColValue)
                 } else  {

+ 7 - 7
datacenter/src/main/resources/application-dev.yml

@@ -45,13 +45,13 @@ spring:
       max-file-size:                   500MB        # 限制单个文件的最大值
 
     #配置rabbitMq 服务器
-#  rabbitmq:
-#    host: 39.102.43.179
-#    port: 9936
-#    username: admin
-#    password: brzj123456
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /test
+  rabbitmq:
+    host: 39.102.43.179
+    port: 9936
+    username: admin
+    password: brzj123456
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /test
 
 mqtopid: # 消息
   exchange:                           exchange-dmp

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

@@ -417,6 +417,7 @@ class ObjectFromToControllers {
                                         floorService.select(SFilter.eq("id", spaceInFloor["objFrom"].toString())).entity()
                                     val rSpinFl = RSpinFl()
                                     spaceDataConversion.floorId = spaceInFloor["objFrom"].toString()
+
                                     rSpinFl.buildingId = floor?.buildingId
                                     rSpinFl.floorId = spaceInFloor["objFrom"].toString()
                                     rSpinFl.objectType = spaceDataConversion.classCode
@@ -425,10 +426,19 @@ class ObjectFromToControllers {
                                     rSpinFl.spaceId = spaceDataConversion.id
                                     logger.debug("空間和楼层关系 = ${rSpinFl.toJson()} *************************************************************************************************************")
                                     rSpinFlService.replace(rSpinFl)
+                                    if (spaceDataConversion.buildingId.isNullOrEmpty()) {
+                                        spaceDataConversion.buildingId = floor?.buildingId
+                                        val rSpinBd = RSpinBd()
+                                        rSpinBd.buildingId = spaceDataConversion.buildingId
+                                        rSpinBd.projectId = projectId
+                                        rSpinBd.sign = 1
+                                        rSpinBd.spaceId = spaceDataConversion.id
+                                        rSpinBd.objectType = spaceDataConversion.classCode
+                                        rSpinBdService.replace(rSpinBd)
+                                    }
                                 }
                             }
 
-
                             val containsKey = spaceSyn.containsKey("outline")
                             if (containsKey){
                                 val id = spaceDataConversion.id

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

@@ -179,7 +179,6 @@ class ObjectToFromController {
                         logger.debug("设备和楼层的关系失败:${equip.toJson()}")
                     }
                 }
-
             }
             return SBaseResponse(SResponseType.success)
         } catch (e: Exception) {
@@ -258,10 +257,10 @@ class ObjectToFromController {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
             if (spaceList.size>0){
                 for (space in spaceList){
-                    val spaceOutline = spaceOutlineService.select(SFilter.eq("id", space.id!!)).entity()
-                    if (spaceOutline!=null){
-                        space.outline = spaceOutline.outline
-                    }
+//                    val spaceOutline = spaceOutlineService.select(SFilter.eq("id", space.id!!)).entity()
+//                    if (spaceOutline!=null){
+//                        space.outline = spaceOutline.outline
+//                    }
                     val createObj =
                         EquipApi.createObj(dictProject!!.groupCode!!, projectId,SpaceUtil.spaceTools(projectId, space))
                     if (!createObj) {

+ 1 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/jms/DataCenterSync.kt

@@ -3,7 +3,6 @@ package com.persagy.server.syn.jms
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.server.syn.Configure
@@ -236,7 +235,6 @@ class DataCenterSync {
 
                                 equipInSpaceSync.addRelSuperpositionFan(message,ids,"MechInArch","Sy2Sp")
                             }
-
                         }
                         "14" ->{
                             if (message.fromId!!.startsWith("Sy")) {
@@ -244,7 +242,7 @@ class DataCenterSync {
                                 equipInSpaceSync.equipInSpaceCreate(message,"MechInArch","Sy2Sp",ids)
                             } else if (message.fromId!!.startsWith("Sp")){
                                 var ids=  Gson().fromJson<ArrayList<String>>(message.toId,type)
-                                /******************************************************************************/
+                                equipInSpaceSync.equipInSpaceCreateTwo(message,"MechInArch","Sy2Sp",ids)
                             }
                         }
                     }

+ 2 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/models/api/obj/EquipApi.kt

@@ -213,6 +213,8 @@ object EquipApi {
 
     fun delRel(groupCode: String, projectId: String, jsonObject: JSONObject): Boolean {
         val url = "${opts.dataPlatform}/rwd/instance/relation/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+        logger.debug("url = ${url}")
+        logger.debug("boby= ${jsonObject.toJson()}")
         val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
         if (postObject.result == "success") {
             return true

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/rel/EquipinSpaceSync.kt

@@ -51,7 +51,7 @@ class EquipinSpaceSync {
                             SFilter.eq("projectId", synchronousMessageRel.projectId!!),
                             SFilter.eq("id", synchronousMessageRel.fromId!!)
                         ).entity()
-                        toJsonObjArray= Configure.toJsonObjFromList(graphCode, relCode, fromIds, synchronousMessageRel.fromId!!,zoneSpace?.classCode)
+                        toJsonObjArray= Configure.toJsonObjList(graphCode, relCode, synchronousMessageRel.fromId!!,fromIds,zoneSpace?.classCode)
                 } else {
                         val zoneSpace = zoneSpaceService.select(
                             SFilter.eq("projectId", synchronousMessageRel.projectId!!),

+ 2 - 2
equip-component/src/main/resources/application-prod.yml

@@ -19,8 +19,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
-#    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#