فهرست منبع

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

zhangweixin 4 سال پیش
والد
کامیت
60b0187141

+ 6 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt

@@ -29,6 +29,7 @@ package com.persagy.server.datacenter.models.entities.objects
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.service.models.SBaseEntity
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -264,11 +265,11 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     @SCascade(table="zone_space_base", idColumn="id", childIdColumn="floor_id")
     var floor: Floor? = null
 
-//    /** 级联-空间类型  */
-//    @Schema(description = "级联-空间类型")
-//    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type")
-//    @JSONField(name = "DClassDef")
-//    var zoneName: DClassDef? = null
+    /** 级联-空间类型  */
+    @Schema(description = "级联-空间类型")
+    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type",self = false)
+    @JSONField(name = "zoneName")
+    var zoneName: ArrayList<DefClass>? = null
 
     /** 级联-建筑 */
     @Schema(description = "级联-建筑")

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

@@ -14,8 +14,8 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
-#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
+    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj