From d745e6f01185bfd8bcad736a513b845fb852d623 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Wed, 13 Aug 2025 18:01:37 +0800 Subject: [PATCH] Update Online_Analysis --- main.py | 1 + online_Analysis.py | 21 +++++++++++---------- project_info.py | 8 +------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/main.py b/main.py index 02e3f85..4997ace 100644 --- a/main.py +++ b/main.py @@ -35,6 +35,7 @@ from fastapi import FastAPI, APIRouter, Depends, HTTPException, status, Request from fastapi.security import OAuth2PasswordBearer from fastapi import FastAPI, Depends, HTTPException, Header from typing import Annotated +import project_info JUNCTION = 0 RESERVOIR = 1 diff --git a/online_Analysis.py b/online_Analysis.py index 8a76b85..0139d9b 100644 --- a/online_Analysis.py +++ b/online_Analysis.py @@ -1082,10 +1082,10 @@ if __name__ == '__main__': # f.write(str_dump) # 更新inp文件，并插入history_patterns_flows - network_update('suzhouhe-202505.inp') + network_update('fx0217-mass injection.inp') # 更新scada_info文件 - # submit_scada_info('bb', '4490') + submit_scada_info(project_info.name, '4490') # 示例：scheme_name_exists # if scheme_name_exists(name='bb', scheme_name='burst_scheme'): @@ -1098,24 +1098,25 @@ if __name__ == '__main__': # burst_ID='GSD230112144241FA18292A84CB', burst_size=400, modify_total_duration=1800, scheme_Name='GSD230112144241FA18292A84CB_400') # 示例：create_user - create_user(name='szh', username='admin', password='123456') + create_user(name=project_info.name, username='admin', password='123456') # 示例：delete_user - # delete_user(name='bb', username='admin_test') + delete_user(name=project_info.name, username='admin_test') # 示例：query_scheme_list - # result = query_scheme_list(name='bb') - # print(result) + result = query_scheme_list(name=project_info.name) + print(result) # 示例：delete_scheme_info - # delete_scheme_info(name='bb', scheme_name='burst_scheme') + delete_scheme_info(name=project_info.name, scheme_name='burst_scheme') # 示例：upload_shp_to_pg - upload_shp_to_pg(name='bb', table_name='GIS_pipe', role='86158', shp_file_path='市政管线.shp') + # 这里的role是 电脑的用户名，服务器上是 Administrator + upload_shp_to_pg(name=project_info.name, table_name='GIS_pipe', role='Administrator', shp_file_path='市政管线.shp') # 示例：submit_risk_probability_result - # submit_risk_probability_result(name='bb', result_file_path='./北碚市政管线风险评价结果.xlsx') + submit_risk_probability_result(name=project_info.name, result_file_path='./北碚市政管线风险评价结果.xlsx') # 示例：pressure_sensor_placement_sensitivity - # pressure_sensor_placement_sensitivity(name='bb', scheme_name='20250517', sensor_number=10, min_diameter=300, username='admin') + pressure_sensor_placement_sensitivity(name=project_info.name, scheme_name='20250517', sensor_number=10, min_diameter=300, username='admin') diff --git a/project_info.py b/project_info.py index 186a11b..a5555d1 100644 --- a/project_info.py +++ b/project_info.py @@ -1,7 +1 @@ - -# influxdb数据库连接信息 -url = "http://localhost:8086" # 替换为你的InfluxDB实例地址 -token = "Vq8F5tzxqmjH6JYPBP5xqwo6nJbzRqCnahlcoMVyZGMPm3H92swD08VX-5lTH1laN_JG1x7EZ80WOQoycanmBw==" # 替换为你的InfluxDB Token -# _ENCODED_TOKEN = "eEdETTVSWnFSSkF1ekFHUy1vdFhVZEMyTkZkWTc1cUpBalJMcUFCNHA1V2NJSUFsSVVwT3BUOF95QTE2QU9IbUpXZXJ3UV8wOGd3Yjg0c3k0MmpuWlE9PQ==" -# token = base64.b64decode(_ENCODED_TOKEN).decode("utf-8") -org = "TJWATERORG" # 替换为你的Organization名称 +name='szh' \ No newline at end of file