OrgTJWater/TJWaterServerBinary
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一scheme_name命名规则

Browse Source
This commit is contained in:
Jiang
2026-02-05 10:47:38 +08:00
parent 4c208abe55
commit 2794114000
9 changed files with 215 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/main.py
View File

@@ -3233,7 +3233,7 @@ async def fastapi_query_all_scheme_all_records(
return loaded_dict
results = influxdb_api.query_scheme_all_record(
scheme_Type=schemetype, scheme_Name=schemename, query_date=querydate
scheme_Type=schemetype, scheme_name=schemename, query_date=querydate
)
packed = msgpack.packb(results, default=encode_datetime)
redis_client.set(cache_key, packed)
@@ -3257,7 +3257,7 @@ async def fastapi_query_all_scheme_all_records_property(
all_results = msgpack.unpackb(data, object_hook=decode_datetime)
else:
all_results = influxdb_api.query_scheme_all_record(
scheme_Type=schemetype, scheme_Name=schemename, query_date=querydate
scheme_Type=schemetype, scheme_name=schemename, query_date=querydate
)
packed = msgpack.packb(all_results, default=encode_datetime)
redis_client.set(cache_key, packed)
@@ -3585,7 +3585,7 @@ class BurstAnalysis(BaseModel):
modify_fixed_pump_pattern: Optional[dict[str, list]] = None
modify_variable_pump_pattern: Optional[dict[str, list]] = None
modify_valve_opening: Optional[dict[str, float]] = None
scheme_Name: Optional[str] = None
scheme_name: Optional[str] = None
@app.post("/burst_analysis/")
@@ -3608,7 +3608,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
modify_fixed_pump_pattern=item["modify_fixed_pump_pattern"],
modify_variable_pump_pattern=item["modify_variable_pump_pattern"],
modify_valve_opening=item["modify_valve_opening"],
scheme_Name=item["scheme_Name"],
scheme_name=item["scheme_name"],
)
# os.rename(filename2, filename)
@@ -3616,7 +3616,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
# 将 时间转换成日期，然后缓存这个计算结果
# 缓存key: burst_analysis_<name>_<modify_pattern_start_time>
global redis_client
schemename = data.scheme_Name
schemename = data.scheme_name
print(data.modify_pattern_start_time)
@@ -3627,7 +3627,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
cache_key = f"queryallschemeallrecords_burst_Analysis_{schemename}_{querydate}"
data = redis_client.get(cache_key)
if not data:
results = influxdb_api.query_scheme_all_record("burst_Analysis", scheme_Name=schemename, query_date=querydate)
results = influxdb_api.query_scheme_all_record("burst_Analysis", scheme_name=schemename, query_date=querydate)
packed = msgpack.packb(results, default=encode_datetime)
redis_client.set(cache_key, packed)
"""
@@ -3712,7 +3712,7 @@ async def fastapi_contaminant_simulation(
concentration: float,
duration: int,
pattern: str = None,
scheme_Name: str = None,
scheme_name: str = None,
) -> str:
filename = "c:/lock.simulation"
filename2 = "c:/lock.simulation2"