|
@@ -1,17 +1,19 @@
|
|
|
package com.persagy.labsl.services.planar
|
|
|
|
|
|
-import com.persagy.labsl.utils.IdUtils
|
|
|
+import com.alibaba.fastjson.JSONArray
|
|
|
+import com.alibaba.fastjson.JSONObject
|
|
|
import com.persagy.base.extensions.toJson
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.labsl.Opts
|
|
|
+import com.persagy.labsl.Opts.groupCode
|
|
|
+import com.persagy.labsl.Opts.projectId
|
|
|
+import com.persagy.labsl.client.DmpRwdClient
|
|
|
import com.persagy.labsl.models.entities.pbs.*
|
|
|
-import com.persagy.labsl.models.entities.tpt.pub.MarkersPub
|
|
|
-import com.persagy.labsl.models.entities.tpt.pub.NodePub
|
|
|
-import com.persagy.labsl.models.entities.tpt.pub.RelationPub
|
|
|
+import com.persagy.labsl.models.request.InstanceUrlParam
|
|
|
+import com.persagy.labsl.models.response.DmpResult
|
|
|
import com.persagy.labsl.models.response.SCommonResponse
|
|
|
-import com.persagy.labsl.services.MarkersService
|
|
|
-import com.persagy.labsl.services.RelationService
|
|
|
-import com.persagy.labsl.services.pub.GraphPubService
|
|
|
+import com.persagy.labsl.utils.AdmEntityTransferUtil
|
|
|
+import com.persagy.labsl.utils.IdUtils
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.service.SObjectService
|
|
|
import com.persagy.service.models.enums.SResponseType
|
|
@@ -21,10 +23,9 @@ import com.persagy.service.models.responses.SBaseResponse
|
|
|
import com.persagy.service.models.responses.SCreateResponse
|
|
|
import com.persagy.service.models.responses.SQueryResponse
|
|
|
import org.slf4j.LoggerFactory
|
|
|
+import org.springframework.beans.factory.annotation.Autowired
|
|
|
import java.text.SimpleDateFormat
|
|
|
import java.util.*
|
|
|
-import kotlin.collections.ArrayList
|
|
|
-import kotlin.collections.HashSet
|
|
|
|
|
|
/**
|
|
|
* 图服务
|
|
@@ -56,9 +57,13 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
/** 已发布 */
|
|
|
val planarGraphPubService = SObjectService(SMybatisDao(PlanarGraphPub::class.java))
|
|
|
/** 建筑 */
|
|
|
- val buildingService = SObjectService(SMybatisDao(Building::class.java))
|
|
|
+ //val buildingService = SObjectService(SMybatisDao(Building::class.java))
|
|
|
/** 楼层 */
|
|
|
- val floorService = SObjectService(SMybatisDao(Floor::class.java))
|
|
|
+ // val floorService = SObjectService(SMybatisDao(Floor::class.java))
|
|
|
+
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private val rwdClient: DmpRwdClient? = null
|
|
|
|
|
|
/**
|
|
|
* 创建图形
|
|
@@ -1184,6 +1189,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
* @param request 查询条件
|
|
|
*/
|
|
|
fun pageQuerysDrafts(request: SQueryRequest): SQueryResponse<Building> {
|
|
|
+ // val projectId = instanceUrlParam.projectId;
|
|
|
val sQueryResponse = SQueryResponse<Building>()
|
|
|
try {
|
|
|
val pageQuery = PlanarGraphService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opts.projectId!!)))
|
|
@@ -1199,9 +1205,14 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
for (content in pageQuery.content!!) {
|
|
|
setFloor.add(content.floorId!!)
|
|
|
}
|
|
|
- val buildingList = buildingService.select(SFilter.inList("id", setBuilding.toList())).exec()
|
|
|
|
|
|
- val floorList = floorService.select(SFilter.inList("id", setFloor.toList())).order("floorSequenceId desc").exec()
|
|
|
+ // val buildingList = buildingService.select(SFilter.inList("id", setBuilding.toList())).exec()
|
|
|
+ var dmpBuildResult = queryDmpObject(SFilter.inList("id", setBuilding.toList()))
|
|
|
+ val buildingList = AdmEntityTransferUtil.toAdmMultiEntity(dmpBuildResult!!.data, null, Building::class.java)
|
|
|
+
|
|
|
+ //val floorList = floorService.select(SFilter.inList("id", setFloor.toList())).order("floorSequenceId desc").exec()
|
|
|
+ var dmpFloorResult = queryDmpObject(SFilter.inList("id", setFloor.toList()))
|
|
|
+ val floorList = AdmEntityTransferUtil.toAdmMultiEntity(dmpFloorResult!!.data, null, Floor::class.java)
|
|
|
for (floor in floorList) {
|
|
|
for (content in pageQuery.content!!) {
|
|
|
if (content.floorId == floor.id) {
|
|
@@ -1239,6 +1250,20 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 查询物理世界对象信息
|
|
|
+ */
|
|
|
+ fun queryDmpObject(id: SFilter): DmpResult<JSONArray?>? {
|
|
|
+ val context = InstanceUrlParam()
|
|
|
+ context.groupCode = groupCode
|
|
|
+ context.projectId = projectId
|
|
|
+ val param = JSONObject()
|
|
|
+ val criteria = JSONObject()
|
|
|
+ criteria["id"] = id
|
|
|
+ param["criteria"] = id
|
|
|
+ return rwdClient?.queryObject(context,criteria)
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 查询已发布平面图
|
|
|
*/
|
|
|
fun pageQuerysPub(request: SQueryRequest): SQueryResponse<Building> {
|
|
@@ -1257,9 +1282,14 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
for (content in pageQuery.content!!) {
|
|
|
setFloor.add(content.floorId!!)
|
|
|
}
|
|
|
- val buildingList = buildingService.select(SFilter.inList("id", setBuilding.toList())).exec()
|
|
|
+ //val buildingList = buildingService.select(SFilter.inList("id", setBuilding.toList())).exec()
|
|
|
+ var dmpBuildResult = queryDmpObject(SFilter.inList("id", setBuilding.toList()))
|
|
|
+ val buildingList = AdmEntityTransferUtil.toAdmMultiEntity(dmpBuildResult!!.data, null, Building::class.java)
|
|
|
+
|
|
|
+ //val floorList = floorService.select(SFilter.inList("id", setFloor.toList())).order("floorSequenceId desc").exec()
|
|
|
+ var dmpFloorResult = queryDmpObject(SFilter.inList("id", setFloor.toList()))
|
|
|
+ val floorList = AdmEntityTransferUtil.toAdmMultiEntity(dmpFloorResult!!.data, null, Floor::class.java)
|
|
|
|
|
|
- val floorList = floorService.select(SFilter.inList("id", setFloor.toList())).order("floorSequenceId desc").exec()
|
|
|
for (floor in floorList) {
|
|
|
for (content in pageQuery.content!!) {
|
|
|
if (content.floorId == floor.id) {
|