|
@@ -2,8 +2,9 @@
|
|
|
|
|
|
"""
|
|
|
import test
|
|
|
-from systemrelation import systemutils
|
|
|
-from systemrelation import graph_model
|
|
|
+from src.system_relation import systemutils, graph_model
|
|
|
+
|
|
|
+
|
|
|
def get_dicdata(sql,dic):
|
|
|
"""
|
|
|
Request db for data through sql.
|
|
@@ -192,7 +193,7 @@ def get_connectors_data(model_id, system_name, domain):
|
|
|
'connect_id_json'
|
|
|
]
|
|
|
connector_data.extend(get_dicdata(connector_sql, CONNECTOR_KEYS))
|
|
|
- connector_data=list(map(systemutils.dic2obj,connector_data))
|
|
|
+ connector_data=list(map(systemutils.dic2obj, connector_data))
|
|
|
return connector_data
|
|
|
|
|
|
def save_project_data(project_graph,project_id):
|
|
@@ -222,7 +223,7 @@ def save_edge_data(edge,block_id):
|
|
|
vertex2=edge.end_vertex
|
|
|
c1=vertex1.system_data
|
|
|
c2=vertex2.system_data
|
|
|
- model1=systemutils.get_specify_type_parent(vertex1,graph_model.FloorGraph).model
|
|
|
+ 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_calc.connected_block" \
|
|
|
"(id1,type1,model_id1,id2,type2,model_id2,block_id,project_id) values " \
|
|
@@ -248,11 +249,8 @@ def get_connected_block_data(project_id,block_id):
|
|
|
sql = "select * from revit_calc.connected_block " \
|
|
|
"where project_id='%s'" \
|
|
|
"and block_id='%s'" \
|
|
|
+ "order by cast(depth as int) asc"\
|
|
|
% (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',
|
|
@@ -264,6 +262,7 @@ def get_connected_block_data(project_id,block_id):
|
|
|
'direction',
|
|
|
'block_id',
|
|
|
'project_id',
|
|
|
+ 'depth',
|
|
|
]
|
|
|
element_data.extend(get_dicdata(sql, KEYS))
|
|
|
element_data = list(map(systemutils.dic2obj, element_data))
|
|
@@ -296,7 +295,8 @@ def update_connected_block_data(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)
|
|
|
+ sql="update revit_calc.connected_block set direction='%s',depth='%s' where id='%s'"\
|
|
|
+ %(block_data.direction,block_data.depth,block_data.id)
|
|
|
data = test.save_data(sql)
|
|
|
|
|
|
|