jxing 5 yıl önce
ebeveyn
işleme
f017827893

+ 18 - 18
src/affected_space/affected_space.py

@@ -6,7 +6,7 @@ import json
 column_space_id = 'space_id'
 column_outline = 'outline'
 column_floor_id = 'floor_id'
-column_revit_id = 'revit_id'
+column_source_id = 'source_id'
 
 
 # 获取Polygon对象
@@ -66,33 +66,33 @@ def build_rel_space_ispace(space_data, ispace_data):
                 if space_id not in rel_dict:
                     rel_dict[space_id] = set()
                 revit_set = rel_dict.get(space_id)
-                revit_set.add(ispace.get(column_revit_id))
+                revit_set.add(ispace.get(column_source_id))
     return rel_dict
 
-# 返回被删除的元空间的revit_id
-def get_deleted_ispace_revit_id(new_ispace_data, prev_ispace_data):
+# 返回被删除的元空间的source_id
+def get_deleted_ispace_source_id(new_ispace_data, prev_ispace_data):
     deleted = []
-    prev_ispace_revit_id_set = set()
+    prev_ispace_source_id_set = set()
     for prev_ispace in prev_ispace_data:
-        prev_ispace_revit_id_set.add(prev_ispace.get(column_revit_id))
+        prev_ispace_source_id_set.add(prev_ispace.get(column_source_id))
     for new_ispace in new_ispace_data:
-        prev_id = new_ispace.get(column_revit_id)
-        if prev_id in prev_ispace_revit_id_set:
-            prev_ispace_revit_id_set.remove(prev_id)
-    deleted.extend(prev_ispace_revit_id_set)
+        prev_id = new_ispace.get(column_source_id)
+        if prev_id in prev_ispace_source_id_set:
+            prev_ispace_source_id_set.remove(prev_id)
+    deleted.extend(prev_ispace_source_id_set)
     return deleted
 
-# 返回被修改的元空间的revit_id
-def get_updated_ispace_revit_id(new_ispace_data, prev_ispace_data):
+# 返回被修改的元空间的source_id
+def get_updated_ispace_source_id(new_ispace_data, prev_ispace_data):
     updated = []
     new_ispace_dict = {}
     prev_ispace_dict = {}
     for prev_ispace in prev_ispace_data:
-        prev_id = prev_ispace.get(column_revit_id)
+        prev_id = prev_ispace.get(column_source_id)
         prev_outline = json.loads(prev_ispace.get(column_outline))
         prev_ispace_dict[prev_id] = prev_outline
     for new_ispace in new_ispace_data:
-        new_id = new_ispace.get(column_revit_id)
+        new_id = new_ispace.get(column_source_id)
         new_outline = json.loads(new_ispace.get(column_outline))
         new_ispace_dict[new_id] = new_outline
     for prev_id, prev_outline in prev_ispace_dict.items():
@@ -109,11 +109,11 @@ def get_updated_ispace_revit_id(new_ispace_data, prev_ispace_data):
 def get_affected_spaced(space_data, new_ispace_data, prev_ispace_data):
     affected_spaces = []
     space_ispace_rel = build_rel_space_ispace(space_data, prev_ispace_data)
-    affected_ispace_revit_id = get_deleted_ispace_revit_id(new_ispace_data, prev_ispace_data)
-    affected_ispace_revit_id.extend(get_updated_ispace_revit_id(new_ispace_data, prev_ispace_data))
+    affected_ispace_source_id = get_deleted_ispace_source_id(new_ispace_data, prev_ispace_data)
+    affected_ispace_source_id.extend(get_updated_ispace_source_id(new_ispace_data, prev_ispace_data))
     for space_id, ispace_id_dict in space_ispace_rel.items():
-        for revit_id in affected_ispace_revit_id:
-            if revit_id in ispace_id_dict:
+        for source_id in affected_ispace_source_id:
+            if source_id in ispace_id_dict:
                 affected_spaces.append(space_id)
                 break
     return affected_spaces

+ 2 - 2
src/affected_space/function.py

@@ -37,11 +37,11 @@ if len(space_data) == 0:
 plpy.info(space_data)
 plpy.info(len(space_data))
 # 获取新模型的元空间
-new_ispace_plan = plpy.prepare("select revit_id, outline where model_id = $1", ["text"])
+new_ispace_plan = plpy.prepare("select source_id, outline where model_id = $1", ["text"])
 new_ispace_data = new_ispace_plan.execute([model_data[0]['id']])
 
 # 获取旧模型的所有元空间
-prev_ispace_plan = plpy.prepare("select revit_id, outline where model_id = $1", ["text"])
+prev_ispace_plan = plpy.prepare("select source_id, outline where model_id = $1", ["text"])
 prev_ispace_data = prev_ispace_plan.execute([model_data[1]['id']])
 
 affected_space_ids = get_affected_spaced(space_data, new_ispace_data, prev_ispace_data)

+ 3 - 3
src/affected_space/test.py

@@ -25,7 +25,7 @@ floor_keys = [
 ]
 
 ispace_keys = [
-    'revit_id',
+    'source_id',
     'outline'
 ]
 
@@ -121,8 +121,8 @@ if __name__ == '__main__':
         print("no space")
         sys.exit(0)
 
-    new_ispace_str = "select revit_id, outline from revit.space where model_id = '{0}'".format(model_list[0]['id'])
-    prev_ispace_str = "select revit_id, outline from revit.space where model_id = '" + model_list[1]['id'] + "'"
+    new_ispace_str = "select source_id, outline from revit.space where model_id = '{0}'".format(model_list[0]['id'])
+    prev_ispace_str = "select source_id, outline from revit.space where model_id = '" + model_list[1]['id'] + "'"
 
     new_ispace_data = get_data(new_ispace_str)
     prev_ispace_data = get_data(prev_ispace_str)