|
@@ -1,11 +1,14 @@
|
|
package com.persagy.labsl.services
|
|
package com.persagy.labsl.services
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil
|
|
|
|
+import com.alibaba.fastjson.JSONArray
|
|
import com.alibaba.fastjson.JSONObject
|
|
import com.alibaba.fastjson.JSONObject
|
|
import com.persagy.labsl.Opts
|
|
import com.persagy.labsl.Opts
|
|
import com.persagy.labsl.client.DmpRwdClient
|
|
import com.persagy.labsl.client.DmpRwdClient
|
|
import com.persagy.labsl.models.entities.pbs.Building
|
|
import com.persagy.labsl.models.entities.pbs.Building
|
|
import com.persagy.labsl.models.entities.pbs.Floor
|
|
import com.persagy.labsl.models.entities.pbs.Floor
|
|
import com.persagy.labsl.models.request.InstanceUrlParam
|
|
import com.persagy.labsl.models.request.InstanceUrlParam
|
|
|
|
+import com.persagy.labsl.models.response.DmpResult
|
|
import com.persagy.labsl.utils.AdmEntityTransferUtil
|
|
import com.persagy.labsl.utils.AdmEntityTransferUtil
|
|
import com.persagy.service.utils.SSpringContextUtil
|
|
import com.persagy.service.utils.SSpringContextUtil
|
|
import org.springframework.stereotype.Service
|
|
import org.springframework.stereotype.Service
|
|
@@ -72,6 +75,38 @@ class DmpBaseService {
|
|
if(dmpResult.data == null){
|
|
if(dmpResult.data == null){
|
|
return ArrayList<Floor>()
|
|
return ArrayList<Floor>()
|
|
}
|
|
}
|
|
- return AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.data, null, Floor::class.java)
|
|
|
|
|
|
+ var floorList = AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.data, null, Floor::class.java)
|
|
|
|
+ if(floorList!=null){
|
|
|
|
+ queryFlInBd(instanceUrlParam,floorList)
|
|
|
|
+ }
|
|
|
|
+ return floorList
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 查询楼层所在建筑
|
|
|
|
+ * @param context
|
|
|
|
+ * @param floorList
|
|
|
|
+ */
|
|
|
|
+ fun queryFlInBd(context: InstanceUrlParam?, floorList: List<Floor>) {
|
|
|
|
+ //查询楼层所在建筑
|
|
|
|
+ for (floor in floorList) {
|
|
|
|
+ val param = JSONObject()
|
|
|
|
+ val criteria = JSONObject()
|
|
|
|
+ criteria["graphCode"] = "ArchSubset"
|
|
|
|
+ criteria["relCode"] = "Bd2Fl"
|
|
|
|
+ criteria["objTo"] = floor.id
|
|
|
|
+ param["criteria"] = criteria
|
|
|
|
+ val dmpResult: DmpResult<JSONArray?>? = rwdClient.queryObjectRelation(context, param)
|
|
|
|
+ val data = dmpResult?.data
|
|
|
|
+ if (CollUtil.isNotEmpty(data)) {
|
|
|
|
+ val build = data!!.getJSONObject(0)
|
|
|
|
+ if (CollUtil.isNotEmpty(build)) {
|
|
|
|
+ floor.buildingId = build.getString("objFrom")
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|