ソースを参照

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

zhangweixin 4 年 前
コミット
6131246977

+ 2 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointImage.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
+import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
@@ -45,6 +46,7 @@ class PointImage : SBaseEntity() {
     @Schema(description =" 图片key")
     @Id
     @Column(name = "id")
+    @JSONField(name = "key")
     var id: String? = null
 
     /** 图片类型 */

+ 3 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt

@@ -135,6 +135,9 @@ open class Equipment : BaseInfo() {
     @Schema(description = "设备类型code")
     @Column(name = "class_code")
     var classCode: String? = null
+    set(value) {
+        field = value?.trim()
+    }
 
     /** 设备所在建筑id */
     @Schema(description = "设备所在建筑id")

+ 2 - 4
datacenter/src/main/kotlin/com/persagy/server/jms/TopicReceiver.kt

@@ -32,8 +32,6 @@ import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SJsonUtil
-import org.springframework.amqp.rabbit.annotation.RabbitHandler
-import org.springframework.amqp.rabbit.annotation.RabbitListener
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
 import java.util.*
@@ -63,8 +61,8 @@ class TopicReceiver {
      *
      * @param
      */
-    @RabbitListener(queues = ["queue-center-adm"])
-    @RabbitHandler
+//    @RabbitListener(queues = ["queue-center-adm"])
+//    @RabbitHandler
     fun receiveMessage(message: String) {
         try {
             println("接收数据中心消息 , $message")

+ 4 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt

@@ -62,7 +62,7 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
         logger.debug("创建的点位=${entity.toJson()}")
         val projectId = SPageContext.getHeader("projectId")
         if (entity.id.isNullOrEmpty()) {
-            return false
+            entity.id = IdUtils.ptIdCreate()
         }
         if (entity.imageList != null && entity.imageList!!.isNotEmpty()) {
             for (image in entity.imageList!!) {
@@ -129,6 +129,9 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
             for (image in entity.imageList!!) {
                 try {
                     image.objectId = entity.id
+                    if (image.id.isNullOrEmpty()) {
+                        image.id = IdUtils.uuidCreate()
+                    }
                     pointImageService.replace(image)
                 } catch (e: Exception) {
                     e.printStackTrace()

+ 1 - 3
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt

@@ -26,7 +26,6 @@
 
 package com.persagy.server.services.relation_calc
 
-import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
@@ -48,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 
 /**
  * 自动关系计算
@@ -1284,7 +1282,7 @@ open class RelationCalcService {
                 /** 处理关系 */
                 val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId),
                         SFilter.inList("classCode",
-                                arrayListOf("ATIO", "VTIO","ACATFC","ACVTAC"))).exec()
+                                arrayListOf("ACATIO", "ACVTIO","ACATFC","ACVTAC"))).exec()
                 if (equipmentList.size > 0) {
                     var listId = ArrayList<String>()
                     for (equipment in equipmentList) {

+ 14 - 0
datacenter/src/main/kotlin/com/persagy/server/utils/IdUtils.kt

@@ -212,6 +212,20 @@ object IdUtils {
     } // Function peIdCreate
 
     /**
+     * 生成点位编码Id
+     *
+     * @return              设备点位编码id
+     */
+    fun ptIdCreate(): String {
+        val bdid = "Pt"
+        val sb = StringBuilder()
+        val uuid = UUID.randomUUID().toString()
+        val uuId = uuid.replace("-", "")
+        val peId = sb.append(bdid).append(uuId)
+        return peId.toString()
+    } // Function peIdCreate
+
+    /**
      * 生成竖井Id
      *
      * @param   projectId   项目id

+ 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

+ 9 - 9
datacenter/src/main/resources/application-prod.yml

@@ -31,20 +31,20 @@ 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!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-  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
 
   servlet:
     multipart:

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt

@@ -46,7 +46,7 @@ object ModelScanTaskQueryService : RService<ModelScanTaskQuery>(SMybatisDao(Mode
     fun pageQuerys(request: SQueryRequest): SQueryResponse<ModelScanTaskQuery> {
         val withFilterList = ArrayList<SFilter>()
         withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
-        withFilterList.add(SFilter.lt(SLength("category"), 6))
+        withFilterList.add(SFilter.lt(SLength("classCode"), 6))
         val pageQuery = pageQuery(request, withFilterList)
         if (!pageQuery.content.isNullOrEmpty()&&pageQuery.content!!.size>0){
             for (content in pageQuery.content!!){