yucheng 3 anni fa
parent
commit
491749c00e

+ 3 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/backstage/model/datacenter/DCISpace.kt

@@ -41,6 +41,9 @@ class DCISpace : DCDataBase(){
     @JSONField(name = "modelId")
     var modelId: String? = null
 
+    @JSONField(name = "state")
+    var state: Int? = null
+
     /** 建筑id */
     @JSONField(name = "buildingId")
     var buildingId: String? = null

+ 4 - 3
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/common/utils/SpaceAffectUtil.kt

@@ -111,7 +111,8 @@ class SpaceAffectUtil {
             // 有交集则加入有变化的空间列表
             for(affect in affectList) {
                 if (isGeoContains(polygon, affect!!)) {
-                    // TODO state设置为1
+                    // state设置为1
+                    space.state = 1
                     rsList.add(space)
                     break;
                 }
@@ -164,7 +165,7 @@ class SpaceAffectUtil {
     private fun updateSpaceList(projectId: String, spaces: List<DCISpace?>?) {
         val request = UpdateRequest<DCISpace>()
         request.content = spaces as ArrayList<DCISpace>
-        service!!.iSpaceUpdate(request, projectId)
+        service!!.spaceUpdate(request, projectId)
     }
 
     /**
@@ -187,7 +188,7 @@ class SpaceAffectUtil {
             return null
         }
         val floors = response.content
-        val spaceList: MutableList<DCISpace> = ArrayList<DCISpace>()
+        val spaceList: MutableList<DCISpace> = ArrayList()
         for (floor in floors!!) {
             val spaces: List<DCISpace>? = floor!!.spaceList
             if (CollectionUtils.isEmpty(spaces)) {

+ 1 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/config/DataCenterConfig.kt

@@ -18,6 +18,7 @@ class DataCenterConfig {
     lateinit var ispaceDelete: String
     lateinit var ispaceQuery: String
     lateinit var ispaceUpdate: String
+    lateinit var spaceUpdate: String
     lateinit var componentCreate: String
     lateinit var componentDelete: String
     lateinit var componentQuery: String

+ 13 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/datacenter/DataCenterRequest.kt

@@ -198,6 +198,19 @@ class DataCenterRequest{
     }
 
     /**
+     * 空间更新
+     */
+    fun spaceUpdate(request : UpdateRequest<DCISpace>, projectId : String) : BaseResponse?{
+        try {
+            val postBody = JSON.toJSONString(request)
+            val resultStr = HttpService.sendPostDataCenter(properties.datacenter.spaceUpdate, postBody, projectId)
+            return JSON.parseObject(resultStr, object : TypeReference<BaseResponse>() { })
+        } catch (e: Exception) {
+        }
+        return null
+    }
+
+    /**
      * 楼层查询
      */
     fun floorQuery(request : QueryRequest, projectId : String) : QueryResponse<DCFloor>?{

+ 2 - 0
revit-algorithm/src/main/resources-dev/application.yml

@@ -124,6 +124,8 @@ properties:
     ispaceDelete: ${properties.datacenter.url}object/ispace/delete
     ispaceQuery: ${properties.datacenter.url}object/ispace/query
     ispaceUpdate: ${properties.datacenter.url}object/ispace/update
+    # 空间相关接口
+    spaceUpdate: ${properties.datacenter.url}object/zone/update
     # 部件相关接口
     componentCreate: ${properties.datacenter.url}object/component/create
     componentDelete: ${properties.datacenter.url}object/component/delete