Преглед на файлове

**************************************万达adm**********************************************
首次提交

zhangweixin преди 4 години
родител
ревизия
994545cb8a

+ 3 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/block/RelationAddRequest.kt

@@ -53,4 +53,7 @@ class RelationAddRequest : Serializable {
     @Schema(description = "图类型编码")
     var graphicType: String? = null
 
+    @Schema(description = "空间类型")
+    var zoneType: String? = null
+
 }

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/graphtype/rel/SpaceBaseZone.kt

@@ -79,4 +79,9 @@ open class SpaceBaseZone : Serializable, BaseInfo() {
     @Schema(description = "BIM模型中编码")
     @Column(name = "bim_id")
     var bimId: String? = null
+
+    /** 类型 */
+    @Schema(description = "类型")
+    @Column(name = "object_type")
+    var classCode: String? = null
 }

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/datacenter/models/entities/rel/REq2Sy.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.rel
+package com.persagy.server.datacenter.datacenter.models.entities.rel
 
 import com.persagy.server.datacenter.models.entities.base.RBaseInfo
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -29,6 +29,7 @@ package com.persagy.server.services.graphtype
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
+import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
 import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.graphtype.GraphicType
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
@@ -36,11 +37,7 @@ import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.mappers.IRelationCountMapper
 import com.persagy.server.datacenter.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
-import com.persagy.server.services.objects.FloorService
-import com.persagy.server.services.objects.PropertyService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
-import com.persagy.server.services.rel.RSyEqService
-import com.persagy.server.services.rel.RSyInBdService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType

Файловите разлики са ограничени, защото са твърде много
+ 847 - 2731
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcService.kt


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

@@ -29,6 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
+import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
 import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment

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

@@ -29,6 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sp
+import com.persagy.server.datacenter.datacenter.models.entities.rel.REq2Sy
 import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.wanda.obj.Equipment