|
@@ -56,7 +56,6 @@ def get_project_models(project_id):
|
|
|
element_data.extend(get_dicdata(sql, COMPONENT_KEYS))
|
|
|
element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
return element_data
|
|
|
-
|
|
|
def get_element_data(model_id):
|
|
|
"""
|
|
|
Cache all Element from Db
|
|
@@ -167,6 +166,7 @@ def get_element_data(model_id):
|
|
|
element_data=list(map(systemutils.dic2obj, element_data))
|
|
|
return element_data
|
|
|
|
|
|
+
|
|
|
def get_connectors_data(model_id, system_name, domain):
|
|
|
"""Cache all connector from Db。"""
|
|
|
connector_data=[]
|
|
@@ -224,7 +224,7 @@ def save_edge_data(edge,block_id):
|
|
|
c2=vertex2.system_data
|
|
|
model1=systemutils.get_specify_type_parent(vertex1,graph_model.FloorGraph).model
|
|
|
model2 = systemutils.get_specify_type_parent(vertex2, graph_model.FloorGraph).model
|
|
|
- sql="insert into revit.connected_block" \
|
|
|
+ sql="insert into revit_calc.connected_block" \
|
|
|
"(id1,type1,model_id1,id2,type2,model_id2,block_id,project_id) values " \
|
|
|
"('%s','%s','%s','%s','%s','%s','%s','%s')"\
|
|
|
%(c1.id,c1.type,model1.file_id,c2.id,c2.type,model2.file_id,block_id,model1.project_id)
|
|
@@ -235,8 +235,71 @@ def del_project_data(project_id):
|
|
|
:param project_id:
|
|
|
:return:
|
|
|
"""
|
|
|
- sql = "delete from revit.connected_block where project_id='%s'"% (project_id)
|
|
|
+ sql = "delete from revit_calc.connected_block where project_id='%s'"% (project_id)
|
|
|
data = test.save_data(sql)
|
|
|
+def get_connected_block_data(project_id,block_id):
|
|
|
+ '''
|
|
|
+ Get all the connected_block .
|
|
|
+ :param project_id:
|
|
|
+ :param block_id:
|
|
|
+ :return:
|
|
|
+ '''
|
|
|
+ element_data = []
|
|
|
+ sql = "select * from revit_calc.connected_block " \
|
|
|
+ "where project_id='%s'" \
|
|
|
+ "and block_id='%s'" \
|
|
|
+ % (project_id,block_id)
|
|
|
+ sql = "select * from revit_calc.connected_block " \
|
|
|
+ "where project_id='%s'" \
|
|
|
+ "order by cast(block_id as int) asc"\
|
|
|
+ % (project_id)
|
|
|
+ KEYS = [
|
|
|
+ 'id',
|
|
|
+ 'id1',
|
|
|
+ 'type1',
|
|
|
+ 'model_id1',
|
|
|
+ 'id2',
|
|
|
+ 'type2',
|
|
|
+ 'model_id2',
|
|
|
+ 'direction',
|
|
|
+ 'block_id',
|
|
|
+ 'project_id',
|
|
|
+ ]
|
|
|
+ element_data.extend(get_dicdata(sql, KEYS))
|
|
|
+ element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
+ return element_data
|
|
|
+def get_connected_block_source_data(project_id,block_id):
|
|
|
+ '''
|
|
|
+ Get all the connected_block source .
|
|
|
+ :param project_id:
|
|
|
+ :param block_id:
|
|
|
+ :return:
|
|
|
+ '''
|
|
|
+ element_data = []
|
|
|
+ sql = "select * from revit_calc.connected_block_source " \
|
|
|
+ "where project_id='%s'" \
|
|
|
+ "and block_id='%s'" \
|
|
|
+ % (project_id,block_id)
|
|
|
+ KEYS = [
|
|
|
+ 'id',
|
|
|
+ 'project_id',
|
|
|
+ 'block_id',
|
|
|
+ 'source_id',
|
|
|
+ ]
|
|
|
+ element_data.extend(get_dicdata(sql, KEYS))
|
|
|
+ element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
+ return element_data
|
|
|
+def update_connected_block_data(block_datas):
|
|
|
+ '''
|
|
|
+ update connected_block direction by id.
|
|
|
+ :param block_datas:
|
|
|
+ :return:
|
|
|
+ '''
|
|
|
+ for block_data in block_datas:
|
|
|
+ sql="update revit_calc.connected_block set direction='%s' ,block_id='%s' where id='%s'"%(block_data.direction,block_data.block_id,block_data.id)
|
|
|
+ data = test.save_data(sql)
|
|
|
+
|
|
|
+
|
|
|
if '__main__'==__name__:
|
|
|
# model_id="cf4e11a0e25811e999b6dbc4c75fa946"
|
|
|
# system_name="喷淋管"
|