Bladeren bron

mxg:rename build_id to building_id

mengxiangge 5 jaren geleden
bovenliggende
commit
2051f4c204
2 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
  1. 8 8
      src/system_relation/systemdatautils.py
  2. 2 2
      src/system_relation/test_flowdirection.py

+ 8 - 8
src/system_relation/systemdatautils.py

@@ -183,23 +183,23 @@ def get_connectors_data(model_id, system_name, domain):
 	connector_data=list(map(systemutils.dic2obj, connector_data))
 	return connector_data
 
-def save_project_data(project_graph,system_name,domain,build_id):
+def save_project_data(project_graph,system_name,domain,building_id):
 	"""
 	Sava project graph data.
 	:param floor_graph:
 	:return:
 	"""
-	del_project_data(project_graph.project_id,system_name,domain,build_id)
+	del_project_data(project_graph.project_id,system_name,domain,building_id)
 	# Create
 	block_id=0
 	for g in project_graph.groupedsystemgraphs:
 		for s in g.systemgraphs:
 			for e in s.system_edges:
-				save_edge_data(e, block_id,build_id)
+				save_edge_data(e, block_id,building_id)
 		for e in g.connectedges:
-			save_edge_data(e,block_id,build_id)
+			save_edge_data(e,block_id,building_id)
 		block_id+=1
-def save_edge_data(edge,block_id,build_id):
+def save_edge_data(edge,block_id,building_id):
 	"""
 	Save edge info using sql
 	:param edge:
@@ -218,7 +218,7 @@ def save_edge_data(edge,block_id,build_id):
 		sql="insert into revit_calc.connected_block" \
 			"(id1,type1,model_id1,id2,type2,model_id2,block_id,project_id,mep_system_type,domain,building_id) values " \
 			"('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')"\
-			%(c1.id,c1.type,model1.model_id,c2.id,c2.type,model2.model_id,block_id,model1.project_id,floor1.system_name,floor1.domain,build_id)
+			%(c1.id,c1.type,model1.model_id,c2.id,c2.type,model2.model_id,block_id,model1.project_id,floor1.system_name,floor1.domain,building_id)
 		data = test.save_data(sql)
 	except Exception as e:
 		print(e)
@@ -235,7 +235,7 @@ def del_project_data(project_id,system_name,domain,building_id):
 		  "and ('%s' is null or building_id='%s')" \
 		  % (project_id,system_name,domain,building_id,building_id)
 	test.save_data(sql)
-def get_connected_block_data(project_id,block_id,system_name,domain,building_id):
+def get_connected_block_data(project_id,building_id,block_id,system_name,domain):
 	'''
 	Get all the connected_block .
 	:param project_id:
@@ -270,7 +270,7 @@ def get_connected_block_data(project_id,block_id,system_name,domain,building_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,system_name,domain,building_id):
+def get_connected_block_source_data(project_id,building_id,block_id,system_name,domain):
 	'''
 	Get all the connected_block source .
 	:param project_id:

+ 2 - 2
src/system_relation/test_flowdirection.py

@@ -7,8 +7,8 @@ if __name__=="__main__":
 	system_name = "冷冻水供水管"
 	domain = "DomainPiping"
 	building_id = 'Bd11010100153c05821ed8fd11e9b8f2d79d0a5b4bf6'
-	block_datas= systemdatautils.get_connected_block_data(project_id, block_id,system_name,domain,building_id)
-	source_datas= systemdatautils.get_connected_block_source_data(project_id, block_id,system_name,domain,building_id)
+	block_datas= systemdatautils.get_connected_block_data(project_id,building_id, block_id,system_name,domain)
+	source_datas= systemdatautils.get_connected_block_source_data(project_id,building_id, block_id,system_name,domain)
 	block_datas= calc_flowdirection.calc(block_datas, source_datas)
 	systemdatautils.update_connected_block_data(block_datas)
 	systemgraph_display.show_connected_block(block_datas)