|
@@ -28,9 +28,12 @@ def get_project_models(project_id,building_id):
|
|
"id,name,local_id,local_name,sequence_id,model_id,building_id,project_id " \
|
|
"id,name,local_id,local_name,sequence_id,model_id,building_id,project_id " \
|
|
"from floor " \
|
|
"from floor " \
|
|
"where project_id='%s' " \
|
|
"where project_id='%s' " \
|
|
- "and ('%s' is null or building_id='%s') " \
|
|
|
|
"order by sequence_id desc"\
|
|
"order by sequence_id desc"\
|
|
- %(project_id,building_id,building_id)
|
|
|
|
|
|
+ %(project_id)
|
|
|
|
+
|
|
|
|
+ #"and ('%s' is null or building_id='%s') " \
|
|
|
|
+ # "order by sequence_id desc"\
|
|
|
|
+ # %(project_id,building_id,building_id)
|
|
COMPONENT_KEYS = [
|
|
COMPONENT_KEYS = [
|
|
'id',
|
|
'id',
|
|
'name',
|
|
'name',
|
|
@@ -111,6 +114,22 @@ def get_element_data(model_id):
|
|
]
|
|
]
|
|
element_data.extend(get_dicdata(other_sql,OTHER_KEYS))
|
|
element_data.extend(get_dicdata(other_sql,OTHER_KEYS))
|
|
|
|
|
|
|
|
+ other_sql = "select * from revit.join_object where model_id='%s'" % (model_id)
|
|
|
|
+ OTHER_KEYS = [
|
|
|
|
+ 'id',
|
|
|
|
+ 'model_id',
|
|
|
|
+ 'connected_ids',
|
|
|
|
+ 'source_id',
|
|
|
|
+ 'name',
|
|
|
|
+ 'revit_id',
|
|
|
|
+ 'type',
|
|
|
|
+ 'create_time',
|
|
|
|
+ 'last_update',
|
|
|
|
+ 'location',
|
|
|
|
+ 'outline'
|
|
|
|
+ ]
|
|
|
|
+ element_data.extend(get_dicdata(other_sql, OTHER_KEYS))
|
|
|
|
+
|
|
pipe_sql = "select * from revit.pipe where model_id='%s'" % (model_id)
|
|
pipe_sql = "select * from revit.pipe where model_id='%s'" % (model_id)
|
|
PIPE_KEYS = [
|
|
PIPE_KEYS = [
|
|
'id',
|
|
'id',
|