Browse Source

******************************************* wx *****************
修改接口

zhangweixin 4 years ago
parent
commit
8c84a7357d

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

@@ -267,9 +267,9 @@ open class ZoneSpace: Serializable, SBaseEntity() {
 
     /** 级联-空间类型  */
     @Schema(description = "级联-空间类型")
-    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="object_type",self = false)
+    @SCascade(table="zone_space_base", idColumn="id", childIdColumn="code",self = false)
     @JSONField(name = "zoneName")
-    var zoneName: ArrayList<DefClass>? = null
+    var zoneName: DefClass? = null
 
     /** 级联-建筑 */
     @Schema(description = "级联-建筑")

+ 5 - 0
equip-component/src/main/kotlin/com/persagy/server/models/planar/PlanarSpace.kt

@@ -59,6 +59,11 @@ class PlanarSpace: Serializable {
     @Column(name = "local_id")
     var localId: String? = null
 
+    /** 空间本地编码 */
+    @Schema(description = "空间本地编码")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
     /** 空间本地名称 */
     @Schema(description = "空间本地名称")
     @Column(name = "local_name")

+ 5 - 0
equip-component/src/main/kotlin/com/persagy/server/service/objects/ZoneSpaceBaseService.kt

@@ -38,12 +38,14 @@ import com.persagy.server.models.planar.PlanarSpace
 import com.persagy.server.models.requests.PlanarEquipRequests
 import com.persagy.server.models.requests.SpatialRelationship
 import com.persagy.server.service.CustomSqlService
+import com.persagy.server.service.base.Service
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SCountResponse
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
+import org.slf4j.LoggerFactory
 
 
 /**
@@ -52,6 +54,8 @@ import com.persagy.service.utils.SSpringContextUtil
  * @author
  */
 object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::class.java)) {
+    /** 日志 */
+    private val logger = LoggerFactory.getLogger(ZoneSpaceBaseService::class.java)
     /** 邻接关系服务 */
     private val rSpatialConnectionService = SObjectService(SMybatisDao(RSpatialConnection::class.java))
     /** 元空间 */
@@ -166,6 +170,7 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
                     }
                 }
                 if (!request.spaceIds.isNullOrEmpty()) {
+                    logger.debug("长度= ${request.spaceIds?.size}")
                     val planarSpaceList = planarSpaceService.select(
                         SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("id", request.spaceIds!!)
                     ).exec()

+ 18 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/ZoneSpaceService.kt

@@ -30,6 +30,7 @@ import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.dao.mappers.ZoneSpaceMapper
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.requests.UpZoneSpaceBaseRequest
 import com.persagy.service.SObjectService
@@ -53,6 +54,8 @@ import org.springframework.web.bind.annotation.RequestBody
 @Service
 open class ZoneSpaceService {
 
+    /** 平台集团对象类型 */
+    private val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
     @Autowired
     lateinit var mapper: ZoneSpaceMapper
     /**
@@ -79,7 +82,21 @@ open class ZoneSpaceService {
             }
             if(idList.size>0){
                 list.add(SFilter.inList("id",idList))
-                return zoneSpaceBaseTableService.pageQuery(request,list)
+
+                val pageQuery = zoneSpaceBaseTableService.pageQuery(request, list)
+                if (!pageQuery.content.isNullOrEmpty()) {
+                    for (content in pageQuery.content!!) {
+                        val entity = defClassService.select(
+                            SFilter.eq("projectId", projectId),
+                            SFilter.eq("code", content.classCode!!)
+                        ).entity()
+                        if (entity!=null){
+                            content.zoneName = entity
+                        }
+                    }
+                }
+
+                return pageQuery
             }else{
                 val sQueryResponse = SQueryResponse<ZoneSpace>(SResponseType.success)
                 sQueryResponse.content = ArrayList<ZoneSpace>()