Bladeren bron

bug修复

linhuili 3 jaren geleden
bovenliggende
commit
8d80697a61

+ 5 - 0
.idea/jarRepositories.xml

@@ -41,5 +41,10 @@
       <option name="name" value="maven4" />
       <option name="url" value="http://47.93.132.139:8081/nexus/content/repositories/persagy/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="http://47.93.132.139:8081/nexus/content/groups/public/" />
+    </remote-repository>
   </component>
 </project>

+ 12 - 3
labsl/src/main/kotlin/com/persagy/labsl/client/DmpRwdClient.kt

@@ -2,13 +2,13 @@ package com.persagy.labsl.client
 
 import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
-import org.springframework.cloud.openfeign.FeignClient
 import com.persagy.dmp.basic.config.DigitalFeignConfig
-import org.springframework.web.bind.annotation.PostMapping
 import com.persagy.labsl.constant.DmpUrlConstant
-import org.springframework.cloud.openfeign.SpringQueryMap
 import com.persagy.labsl.models.request.InstanceUrlParam
 import com.persagy.labsl.models.response.DmpResult
+import org.springframework.cloud.openfeign.FeignClient
+import org.springframework.cloud.openfeign.SpringQueryMap
+import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 
 /**
@@ -26,4 +26,13 @@ interface DmpRwdClient {
      */
     @PostMapping(DmpUrlConstant.OBJECT_QUERY)
     fun queryObject(@SpringQueryMap objectUrlParam: InstanceUrlParam?, @RequestBody criteria: JSONObject?): DmpResult<JSONArray?>?
+
+    /**
+     * @description: 查询对象关系列表
+     * @param: objectUrlParam 对象请求url通用参数
+     * @param: criteria post请求参数
+     * @return: com.persagy.dmp.common.DmpResult
+     */
+    @PostMapping(DmpUrlConstant.RELATION_QUERY)
+    fun queryObjectRelation(@SpringQueryMap objectUrlParam: InstanceUrlParam?, @RequestBody criteria: JSONObject?): DmpResult<JSONArray?>?
 }

+ 36 - 1
labsl/src/main/kotlin/com/persagy/labsl/services/DmpBaseService.kt

@@ -1,11 +1,14 @@
 package com.persagy.labsl.services
 
+import cn.hutool.core.collection.CollUtil
+import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
 import com.persagy.labsl.Opts
 import com.persagy.labsl.client.DmpRwdClient
 import com.persagy.labsl.models.entities.pbs.Building
 import com.persagy.labsl.models.entities.pbs.Floor
 import com.persagy.labsl.models.request.InstanceUrlParam
+import com.persagy.labsl.models.response.DmpResult
 import com.persagy.labsl.utils.AdmEntityTransferUtil
 import com.persagy.service.utils.SSpringContextUtil
 import org.springframework.stereotype.Service
@@ -72,6 +75,38 @@ class DmpBaseService {
         if(dmpResult.data == null){
             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")
+                }
+            }
+        }
+    }
+
+
 }

+ 3 - 2
labsl/src/main/kotlin/com/persagy/labsl/services/planar/PlanarGraphService.kt

@@ -54,9 +54,9 @@ 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 dmpBaseService: DmpBaseService? = DmpBaseService()
@@ -1280,6 +1280,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
     }
 
 
+
     /**
      * 查询已发布平面图
      */