修改默认超时时间

cli/tests/unit/test_tjwater_cli.py

@@ -71,14 +71,14 @@ def test_auth_stdin_can_be_reused_with_runtime_context_cache(monkeypatch):
     def fake_request_json(ctx, **kwargs):
         observed_runtime_ids.append(id(ctx))
         assert ctx.auth.access_token == "token-1"
-        assert kwargs["params"] == {"network": "tjwater", "node": "11"}
-        return {"node": "11"}, 5
+        assert kwargs["params"] == {"network": "tjwater", "junction": "11"}
+        return {"id": "11"}, 5
 
     monkeypatch.setattr(common, "request_json", fake_request_json)
 
     result = runner.invoke(
         app,
-        ["--auth-stdin", "network", "get-node-properties", "--node", "11"],
+        ["--auth-stdin", "network", "get-junction-properties", "--junction", "11"],
         input=json.dumps(
             {
                 "server": "http://server",
@@ -93,37 +93,70 @@ def test_auth_stdin_can_be_reused_with_runtime_context_cache(monkeypatch):
 
     assert result.exit_code == 0
     assert payload["ok"] is True
-    assert payload["data"] == {"node": "11"}
+    assert payload["data"] == {"id": "11"}
     assert len(observed_runtime_ids) == 1
 
 
-def test_network_get_all_junction_properties_uses_network_context(monkeypatch):
+def test_network_get_junction_properties_uses_network_context(monkeypatch):
     captured = {}
 
     def fake_request_json(ctx, **kwargs):
         captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
         captured["params"] = kwargs["params"]
-        return [{"id": "J1"}], 5
+        return {"id": "J1"}, 5
 
     monkeypatch.setenv("TJWATER_SERVER", "http://server")
     monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
     monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
     monkeypatch.setattr(common, "request_json", fake_request_json)
 
-    result = runner.invoke(app, ["network", "get-all-junction-properties"])
+    result = runner.invoke(app, ["network", "get-junction-properties", "--junction", "J1"])
     payload = json.loads(result.stdout)
 
     assert result.exit_code == 0
     assert payload["ok"] is True
-    assert payload["data"] == [{"id": "J1"}]
-    assert captured == {"access_token": "abc", "params": {"network": "tjwater"}}
+    assert payload["data"] == {"id": "J1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getjunctionproperties/",
+        "params": {"network": "tjwater", "junction": "J1"},
+    }
 
 
-def test_network_get_all_pipe_properties_uses_network_context(monkeypatch):
+def test_network_get_pipe_properties_uses_network_context(monkeypatch):
     captured = {}
 
     def fake_request_json(ctx, **kwargs):
         captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return {"id": "P1"}, 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-pipe-properties", "--pipe", "P1"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == {"id": "P1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getpipeproperties/",
+        "params": {"network": "tjwater", "pipe": "P1"},
+    }
+
+
+def test_network_get_all_pipes_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
         captured["params"] = kwargs["params"]
         return [{"id": "P1"}], 5
 
@@ -132,13 +165,233 @@ def test_network_get_all_pipe_properties_uses_network_context(monkeypatch):
     monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
     monkeypatch.setattr(common, "request_json", fake_request_json)
 
-    result = runner.invoke(app, ["network", "get-all-pipe-properties"])
+    result = runner.invoke(app, ["network", "get-all-pipes-properties"])
     payload = json.loads(result.stdout)
 
     assert result.exit_code == 0
     assert payload["ok"] is True
     assert payload["data"] == [{"id": "P1"}]
-    assert captured == {"access_token": "abc", "params": {"network": "tjwater"}}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getallpipeproperties/",
+        "params": {"network": "tjwater"},
+    }
+
+
+def test_network_get_reservoir_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return {"id": "R1"}, 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-reservoir-properties", "--reservoir", "R1"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == {"id": "R1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getreservoirproperties/",
+        "params": {"network": "tjwater", "reservoir": "R1"},
+    }
+
+
+def test_network_get_all_reservoir_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return [{"id": "R1"}], 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-all-reservoirs-properties"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == [{"id": "R1"}]
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getallreservoirproperties/",
+        "params": {"network": "tjwater"},
+    }
+
+
+def test_network_get_tank_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return {"id": "T1"}, 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-tank-properties", "--tank", "T1"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == {"id": "T1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/gettankproperties/",
+        "params": {"network": "tjwater", "tank": "T1"},
+    }
+
+
+def test_network_get_all_tank_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return [{"id": "T1"}], 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-all-tanks-properties"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == [{"id": "T1"}]
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getalltankproperties/",
+        "params": {"network": "tjwater"},
+    }
+
+
+def test_network_get_pump_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return {"id": "PU1"}, 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-pump-properties", "--pump", "PU1"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == {"id": "PU1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getpumpproperties/",
+        "params": {"network": "tjwater", "pump": "PU1"},
+    }
+
+
+def test_network_get_all_pump_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return [{"id": "PU1"}], 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-all-pumps-properties"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == [{"id": "PU1"}]
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getallpumpproperties/",
+        "params": {"network": "tjwater"},
+    }
+
+
+def test_network_get_valve_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return {"id": "V1"}, 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-valve-properties", "--valve", "V1"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == {"id": "V1"}
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getvalveproperties/",
+        "params": {"network": "tjwater", "valve": "V1"},
+    }
+
+
+def test_network_get_all_valve_properties_uses_network_context(monkeypatch):
+    captured = {}
+
+    def fake_request_json(ctx, **kwargs):
+        captured["access_token"] = ctx.auth.access_token
+        captured["path"] = kwargs["path"]
+        captured["params"] = kwargs["params"]
+        return [{"id": "V1"}], 5
+
+    monkeypatch.setenv("TJWATER_SERVER", "http://server")
+    monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
+    monkeypatch.setenv("TJWATER_NETWORK", "tjwater")
+    monkeypatch.setattr(common, "request_json", fake_request_json)
+
+    result = runner.invoke(app, ["network", "get-all-valves-properties"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    assert payload["ok"] is True
+    assert payload["data"] == [{"id": "V1"}]
+    assert captured == {
+        "access_token": "abc",
+        "path": "/getallvalveproperties/",
+        "params": {"network": "tjwater"},
+    }
 
 
 def test_help_outputs_json_lists_commands():
@@ -245,6 +498,33 @@ def test_leaf_help_flag_includes_usage_and_example():
     assert "DURATION" in result.stdout
 
 
+def test_realtime_simulation_help_clarifies_type_values():
+    result = runner.invoke(
+        app,
+        ["data", "timeseries", "realtime", "simulation-by-id-time", "--help"],
+        prog_name="tjwater-cli",
+    )
+
+    assert result.exit_code == 0
+    assert "links/nodes 是子命令" in result.stdout
+    assert "pipe" in result.stdout
+    assert "junction" in result.stdout
+
+
+def test_realtime_property_help_lists_supported_fields():
+    result = runner.invoke(
+        app,
+        ["data", "timeseries", "realtime", "simulation-by-time-property", "--help"],
+        prog_name="tjwater-cli",
+    )
+
+    assert result.exit_code == 0
+    assert "flow" in result.stdout
+    assert "pressure" in result.stdout
+    assert "actual_demand" in result.stdout
+    assert "velocity" in result.stdout
+
+
 def test_analysis_burst_returns_next_step_to_fetch_scheme(monkeypatch, tmp_path: Path):
     monkeypatch.setenv("TJWATER_SERVER", "http://server")
     monkeypatch.setenv("TJWATER_ACCESS_TOKEN", "abc")
@@ -498,6 +778,139 @@ def test_main_missing_option_error_includes_usage_and_next_step(capsys):
     assert '"tjwater-cli help simulation run"' in stdout
 
 
+def test_main_invalid_enum_value_is_rejected_before_request(capsys):
+    exit_code = main(
+        [
+            "data",
+            "timeseries",
+            "realtime",
+            "simulation-by-id-time",
+            "--id",
+            "J1",
+            "--type",
+            "links",
+            "--time",
+            "2025-01-02T03:30:00+08:00",
+        ]
+    )
+    stdout = capsys.readouterr().out
+
+    assert exit_code == 2
+    assert '"summary": "参数无效"' in stdout
+    assert '"code": "INVALID_PARAMETER"' in stdout
+    assert "links" in stdout
+    assert "pipe" in stdout
+    assert "junction" in stdout
+
+
+def test_main_invalid_pipe_property_is_rejected_before_request(capsys):
+    exit_code = main(
+        [
+            "data",
+            "timeseries",
+            "realtime",
+            "simulation-by-time-property",
+            "--type",
+            "pipe",
+            "--time",
+            "2025-01-02T03:30:00+08:00",
+            "--property",
+            "pressure",
+        ]
+    )
+    stdout = capsys.readouterr().out
+
+    assert exit_code == 2
+    assert '"code": "INVALID_PROPERTY"' in stdout
+    assert "flow" in stdout
+    assert "velocity" in stdout
+
+
+def test_main_invalid_scada_field_is_rejected_before_request(capsys):
+    exit_code = main(
+        [
+            "data",
+            "timeseries",
+            "scada",
+            "query",
+            "--device-id",
+            "D1",
+            "--start-time",
+            "2025-01-02T03:00:00+08:00",
+            "--end-time",
+            "2025-01-02T04:00:00+08:00",
+            "--field",
+            "flow",
+        ]
+    )
+    stdout = capsys.readouterr().out
+
+    assert exit_code == 2
+    assert '"code": "INVALID_FIELD"' in stdout
+    assert "monitored_value" in stdout
+    assert "cleaned_value" in stdout
+
+
+def test_data_scada_get_rejects_removed_kind_before_request(capsys):
+    exit_code = main(["data", "scada", "get", "--kind", "device", "--id", "D1"])
+    stdout = capsys.readouterr().out
+
+    assert exit_code == 2
+    assert '"code": "INVALID_PARAMETER"' in stdout
+    assert "device" in stdout
+    assert "info" in stdout
+
+
+def test_data_scada_list_help_only_shows_info_kind():
+    result = runner.invoke(app, ["data", "scada", "list", "--help"])
+
+    assert result.exit_code == 0
+    assert "info" in result.stdout
+    assert "device" not in result.stdout
+    assert "element" not in result.stdout
+
+
+def test_data_scada_help_no_longer_lists_schema():
+    result = runner.invoke(app, ["data", "scada", "help"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    commands = {command["command"] for command in payload["commands"]}
+    assert "data scada get" in commands
+    assert "data scada list" in commands
+    assert "data scada schema" not in commands
+
+
+def test_data_scada_schema_command_is_removed():
+    result = runner.invoke(app, ["data", "scada", "schema", "--kind", "info"])
+
+    assert result.exit_code == 2
+    assert "No such command 'schema'" in result.output
+
+
+def test_data_help_no_longer_lists_extension_or_misc():
+    result = runner.invoke(app, ["data", "help"])
+    payload = json.loads(result.stdout)
+
+    assert result.exit_code == 0
+    commands = {command["command"] for command in payload["commands"]}
+    assert "data timeseries" in commands
+    assert "data scada" in commands
+    assert "data scheme" in commands
+    assert "data extension" not in commands
+    assert "data misc" not in commands
+
+
+def test_removed_data_extension_and_misc_commands_fail():
+    extension_result = runner.invoke(app, ["data", "extension", "list"])
+    misc_result = runner.invoke(app, ["data", "misc", "sensor-placements"])
+
+    assert extension_result.exit_code == 2
+    assert "No such command 'extension'" in extension_result.output
+    assert misc_result.exit_code == 2
+    assert "No such command 'misc'" in misc_result.output
+
+
 def test_main_bare_analysis_returns_typer_help_without_json_error(capsys):
     exit_code = main(["analysis"])
     stdout = capsys.readouterr().out

cli/tjwater_cli/apps.py

@@ -26,8 +26,6 @@ data_timeseries_scada_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
 data_timeseries_composite_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
 data_scada_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
 data_scheme_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
-data_extension_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
-data_misc_app = typer.Typer(no_args_is_help=True, cls=TJWaterGroup)
 
 app.add_typer(network_app, name="network")
 app.add_typer(component_app, name="component")
@@ -50,8 +48,6 @@ data_timeseries_app.add_typer(data_timeseries_scada_app, name="scada")
 data_timeseries_app.add_typer(data_timeseries_composite_app, name="composite")
 data_app.add_typer(data_scada_app, name="scada")
 data_app.add_typer(data_scheme_app, name="scheme")
-data_app.add_typer(data_extension_app, name="extension")
-data_app.add_typer(data_misc_app, name="misc")
 
 GROUP_HELP_APPS: list[tuple[typer.Typer, tuple[str, ...]]] = [
     (network_app, ("network",)),
@@ -75,8 +71,6 @@ GROUP_HELP_APPS: list[tuple[typer.Typer, tuple[str, ...]]] = [
     (data_timeseries_composite_app, ("data", "timeseries", "composite")),
     (data_scada_app, ("data", "scada")),
     (data_scheme_app, ("data", "scheme")),
-    (data_extension_app, ("data", "extension")),
-    (data_misc_app, ("data", "misc")),
 ]
 
 TOP_LEVEL_COMMANDS = {"help", "network", "component", "simulation", "analysis", "data"}

cli/tjwater_cli/commands_analysis.py

@@ -31,6 +31,7 @@ from .core import (
     require_username,
     resolve_scheme,
 )
+from .option_types import DataSource, ValveMode
 
 
 @simulation_app.command("run")
@@ -100,7 +101,7 @@ def analysis_burst(
 @analysis_app.command("valve")
 def analysis_valve(
     ctx: typer.Context,
-    mode: Annotated[str, typer.Option("--mode", help="close|isolation")],
+    mode: Annotated[ValveMode, typer.Option("--mode", help="分析模式，仅支持 close|isolation")],
     start_time: Annotated[str | None, typer.Option("--start-time", help="close 模式需要")] = None,
     valve: Annotated[list[str] | None, typer.Option("--valve", help="阀门 ID，可重复")] = None,
     element: Annotated[list[str] | None, typer.Option("--element", help="isolation 模式的事故元素，可重复")] = None,
@@ -110,7 +111,7 @@ def analysis_valve(
 ) -> None:
     runtime = runtime_context(ctx)
     network = require_network(runtime)
-    if mode == "close":
+    if mode == ValveMode.CLOSE:
         if not start_time or not valve:
             raise CLIError(
                 "CLI 参数错误",
@@ -135,7 +136,7 @@ def analysis_valve(
             require_network_ctx=True,
         )
         return
-    if mode == "isolation":
+    if mode == ValveMode.ISOLATION:
         if not element:
             raise CLIError(
                 "CLI 参数错误",
@@ -156,12 +157,7 @@ def analysis_valve(
             require_network_ctx=True,
         )
         return
-    raise CLIError(
-        "CLI 参数错误",
-        code="INVALID_MODE",
-        message="--mode must be close or isolation",
-        exit_code=2,
-    )
+    raise AssertionError(f"unreachable valve mode: {mode}")
 
 
 @analysis_app.command("flushing")
@@ -397,7 +393,7 @@ def analysis_burst_location_locate(
     end_time: Annotated[str, typer.Option("--end-time", help="RFC3339 结束时间")],
     burst_leakage: Annotated[float, typer.Option("--burst-leakage", help="爆管漏水量")],
     scheme: Annotated[str | None, typer.Option("--scheme", help="方案名称")] = None,
-    data_source: Annotated[str, typer.Option("--data-source", help="monitoring|simulation")] = "monitoring",
+    data_source: Annotated[DataSource, typer.Option("--data-source", help="数据来源，仅支持 monitoring|simulation")] = DataSource.MONITORING,
     pressure_scada_id: Annotated[list[str] | None, typer.Option("--pressure-scada-id", help="压力 SCADA ID，可重复")] = None,
     flow_scada_id: Annotated[list[str] | None, typer.Option("--flow-scada-id", help="流量 SCADA ID，可重复")] = None,
     pressure_file: Annotated[Path | None, typer.Option("--pressure-file", help="包含 burst_pressure/normal_pressure 的 JSON 文件")] = None,
@@ -410,7 +406,7 @@ def analysis_burst_location_locate(
     body = {
         "network": require_network(runtime),
         "scheme_name": resolve_scheme(runtime, scheme, required=True),
-        "data_source": data_source,
+        "data_source": data_source.value,
         "scada_burst_start": parse_time_with_timezone(start_time, option_name="--start-time").isoformat(),
         "scada_burst_end": parse_time_with_timezone(end_time, option_name="--end-time").isoformat(),
         "burst_leakage": burst_leakage,

cli/tjwater_cli/commands_data.py

@@ -5,8 +5,6 @@ from typing import Annotated
 import typer
 
 from .apps import (
-    data_extension_app,
-    data_misc_app,
     data_scada_app,
     data_scheme_app,
     data_timeseries_composite_app,
@@ -16,12 +14,55 @@ from .apps import (
 )
 from .common import emit_api, runtime_context
 from .core import CLIError, parse_time_with_timezone, require_network, resolve_scheme
+from .option_types import (
+    CompositeKind,
+    ElementType,
+    JUNCTION_TIMESERIES_FIELDS,
+    SCADA_TIMESERIES_FIELDS,
+    ScadaListKind,
+    SimulationQuery,
+    timeseries_fields_for_element_type,
+)
 
 
 def _scheme_type_option(scheme_type: str | None) -> str:
     return scheme_type or "simulation"
 
 
+def _validate_element_property(element_type: ElementType, property_name: str, *, option_name: str) -> str:
+    valid_fields = timeseries_fields_for_element_type(element_type)
+    if property_name not in valid_fields:
+        raise CLIError(
+            "CLI 参数错误",
+            code="INVALID_PROPERTY",
+            message=f"{option_name} for --type {element_type.value} must be one of: {', '.join(valid_fields)}",
+            exit_code=2,
+        )
+    return property_name
+
+
+def _validate_node_field(field_name: str, *, option_name: str) -> str:
+    if field_name not in JUNCTION_TIMESERIES_FIELDS:
+        raise CLIError(
+            "CLI 参数错误",
+            code="INVALID_FIELD",
+            message=f"{option_name} must be one of: {', '.join(JUNCTION_TIMESERIES_FIELDS)}",
+            exit_code=2,
+        )
+    return field_name
+
+
+def _validate_scada_field(field_name: str, *, option_name: str) -> str:
+    if field_name not in SCADA_TIMESERIES_FIELDS:
+        raise CLIError(
+            "CLI 参数错误",
+            code="INVALID_FIELD",
+            message=f"{option_name} must be one of: {', '.join(SCADA_TIMESERIES_FIELDS)}",
+            exit_code=2,
+        )
+    return field_name
+
+
 @data_timeseries_realtime_app.command("links")
 def data_realtime_links(
     ctx: typer.Context,
@@ -66,7 +107,7 @@ def data_realtime_nodes(
 def data_realtime_simulation_by_id_time(
     ctx: typer.Context,
     id: Annotated[str, typer.Option("--id", help="元素 ID")],
-    type: Annotated[str, typer.Option("--type", help="pipe|junction")],
+    type: Annotated[ElementType, typer.Option("--type", help="元素类型，仅支持 pipe|junction；links/nodes 是子命令")],
     time: Annotated[str, typer.Option("--time", help="查询时间")],
 ) -> None:
     emit_api(
@@ -76,7 +117,7 @@ def data_realtime_simulation_by_id_time(
         path="/realtime/query/by-id-time",
         params={
             "id": id,
-            "type": type,
+            "type": type.value,
             "query_time": parse_time_with_timezone(time, option_name="--time").isoformat(),
         },
         require_auth=True,
@@ -87,17 +128,18 @@ def data_realtime_simulation_by_id_time(
 @data_timeseries_realtime_app.command("simulation-by-time-property")
 def data_realtime_simulation_by_time_property(
     ctx: typer.Context,
-    type: Annotated[str, typer.Option("--type", help="pipe|junction")],
+    type: Annotated[ElementType, typer.Option("--type", help="元素类型，仅支持 pipe|junction；links/nodes 是子命令")],
     time: Annotated[str, typer.Option("--time", help="查询时间")],
-    property: Annotated[str, typer.Option("--property", help="属性名")],
+    property: Annotated[str, typer.Option("--property", help="属性名；pipe: flow|friction|headloss|quality|reaction|setting|status|velocity；junction: actual_demand|total_head|pressure|quality")],
 ) -> None:
+    property = _validate_element_property(type, property, option_name="--property")
     emit_api(
         ctx,
         summary="读取实时属性聚合数据成功",
         method="GET",
         path="/realtime/query/by-time-property",
         params={
-            "type": type,
+            "type": type.value,
             "query_time": parse_time_with_timezone(time, option_name="--time").isoformat(),
             "property": property,
         },
@@ -135,13 +177,14 @@ def data_scheme_links(
 def data_scheme_node_field(
     ctx: typer.Context,
     node: Annotated[str, typer.Option("--node", help="节点 ID")],
-    field: Annotated[str, typer.Option("--field", help="字段名")],
+    field: Annotated[str, typer.Option("--field", help="字段名，仅支持 actual_demand|total_head|pressure|quality")],
     start_time: Annotated[str, typer.Option("--start-time", help="开始时间")],
     end_time: Annotated[str, typer.Option("--end-time", help="结束时间")],
     scheme: Annotated[str | None, typer.Option("--scheme", help="方案名称")] = None,
     scheme_type: Annotated[str | None, typer.Option("--scheme-type", help="方案类型")] = None,
 ) -> None:
     runtime = runtime_context(ctx)
+    field = _validate_node_field(field, option_name="--field")
     emit_api(
         ctx,
         summary="读取方案节点字段成功",
@@ -162,22 +205,22 @@ def data_scheme_node_field(
 @data_timeseries_scheme_app.command("simulation")
 def data_scheme_simulation(
     ctx: typer.Context,
-    query: Annotated[str, typer.Option("--query", help="by-id-time|by-scheme-time-property")],
+    query: Annotated[SimulationQuery, typer.Option("--query", help="查询模式，仅支持 by-id-time|by-scheme-time-property")],
     scheme: Annotated[str | None, typer.Option("--scheme", help="方案名称")] = None,
     scheme_type: Annotated[str | None, typer.Option("--scheme-type", help="方案类型")] = None,
     id: Annotated[str | None, typer.Option("--id", help="元素 ID")] = None,
     time: Annotated[str, typer.Option("--time", help="查询时间")] = "",
-    type: Annotated[str, typer.Option("--type", help="pipe|junction")] = "pipe",
-    property: Annotated[str | None, typer.Option("--property", help="属性名")] = None,
+    type: Annotated[ElementType, typer.Option("--type", help="元素类型，仅支持 pipe|junction；links/nodes 是子命令")] = ElementType.PIPE,
+    property: Annotated[str | None, typer.Option("--property", help="属性名；pipe: flow|friction|headloss|quality|reaction|setting|status|velocity；junction: actual_demand|total_head|pressure|quality")] = None,
 ) -> None:
     runtime = runtime_context(ctx)
     params = {
         "scheme_name": resolve_scheme(runtime, scheme, required=True),
         "scheme_type": _scheme_type_option(scheme_type),
         "query_time": parse_time_with_timezone(time, option_name="--time").isoformat(),
-        "type": type,
+        "type": type.value,
     }
-    if query == "by-id-time":
+    if query == SimulationQuery.BY_ID_TIME:
         if not id:
             raise CLIError(
                 "CLI 参数错误",
@@ -196,7 +239,7 @@ def data_scheme_simulation(
             require_project=True,
         )
         return
-    if query == "by-scheme-time-property":
+    if query == SimulationQuery.BY_SCHEME_TIME_PROPERTY:
         if not property:
             raise CLIError(
                 "CLI 参数错误",
@@ -204,6 +247,7 @@ def data_scheme_simulation(
                 message="--property is required for --query by-scheme-time-property",
                 exit_code=2,
             )
+        property = _validate_element_property(type, property, option_name="--property")
         params["property"] = property
         emit_api(
             ctx,
@@ -215,12 +259,7 @@ def data_scheme_simulation(
             require_project=True,
         )
         return
-    raise CLIError(
-        "CLI 参数错误",
-        code="INVALID_QUERY",
-        message="--query must be by-id-time or by-scheme-time-property",
-        exit_code=2,
-    )
+    raise AssertionError(f"unreachable query variant: {query}")
 
 
 @data_timeseries_scada_app.command("query")
@@ -229,7 +268,7 @@ def data_scada_query(
     device_id: Annotated[list[str], typer.Option("--device-id", help="设备 ID，可重复")],
     start_time: Annotated[str, typer.Option("--start-time", help="开始时间")],
     end_time: Annotated[str, typer.Option("--end-time", help="结束时间")],
-    field: Annotated[str | None, typer.Option("--field", help="字段名")] = None,
+    field: Annotated[str | None, typer.Option("--field", help="字段名，仅支持 monitored_value|cleaned_value")] = None,
 ) -> None:
     path = "/scada/by-ids-field-time-range" if field else "/scada/by-ids-time-range"
     params = {
@@ -238,6 +277,7 @@ def data_scada_query(
         "end_time": parse_time_with_timezone(end_time, option_name="--end-time").isoformat(),
     }
     if field:
+        field = _validate_scada_field(field, option_name="--field")
         params["field"] = field
     emit_api(
         ctx,
@@ -253,7 +293,7 @@ def data_scada_query(
 @data_timeseries_composite_app.callback(invoke_without_command=True)
 def data_timeseries_composite(
     ctx: typer.Context,
-    kind: Annotated[str | None, typer.Option("--kind", help="scada-simulation|element-simulation|element-scada")] = None,
+    kind: Annotated[CompositeKind | None, typer.Option("--kind", help="复合查询类型，仅支持 scada-simulation|element-simulation|element-scada")] = None,
     feature: Annotated[list[str] | None, typer.Option("--feature", help="特征值，可重复")] = None,
     start_time: Annotated[str | None, typer.Option("--start-time", help="开始时间")] = None,
     end_time: Annotated[str | None, typer.Option("--end-time", help="结束时间")] = None,
@@ -277,7 +317,7 @@ def data_timeseries_composite(
         "start_time": parse_time_with_timezone(start_time, option_name="--start-time").isoformat(),
         "end_time": parse_time_with_timezone(end_time, option_name="--end-time").isoformat(),
     }
-    if kind == "scada-simulation":
+    if kind == CompositeKind.SCADA_SIMULATION:
         if not feature:
             raise CLIError(
                 "CLI 参数错误",
@@ -300,7 +340,7 @@ def data_timeseries_composite(
             require_project=True,
         )
         return
-    if kind == "element-simulation":
+    if kind == CompositeKind.ELEMENT_SIMULATION:
         if not feature:
             raise CLIError(
                 "CLI 参数错误",
@@ -323,7 +363,7 @@ def data_timeseries_composite(
             require_project=True,
         )
         return
-    if kind == "element-scada":
+    if kind == CompositeKind.ELEMENT_SCADA:
         if not feature or len(feature) != 1:
             raise CLIError(
                 "CLI 参数错误",
@@ -343,12 +383,7 @@ def data_timeseries_composite(
             require_project=True,
         )
         return
-    raise CLIError(
-        "CLI 参数错误",
-        code="INVALID_KIND",
-        message="--kind must be scada-simulation, element-simulation, or element-scada",
-        exit_code=2,
-    )
+    raise AssertionError(f"unreachable composite kind: {kind}")
 
 
 @data_timeseries_composite_app.command("pipeline-health")
@@ -376,15 +411,6 @@ def data_composite_pipeline_health(
 
 def _scada_mapping(kind: str, action: str) -> tuple[str, dict[str, str]]:
     mapping = {
-        ("device", "schema"): ("/getscadadeviceschema/", {}),
-        ("device", "get"): ("/getscadadevice/", {"id_param": "id"}),
-        ("device", "list"): ("/getallscadadevices/", {}),
-        ("device-data", "schema"): ("/getscadadevicedataschema/", {}),
-        ("device-data", "get"): ("/getscadadevicedata/", {"id_param": "device_id"}),
-        ("element", "schema"): ("/getscadaelementschema/", {}),
-        ("element", "get"): ("/getscadaelement/", {"id_param": "id"}),
-        ("element", "list"): ("/getscadaelements/", {}),
-        ("info", "schema"): ("/getscadainfoschema/", {}),
         ("info", "get"): ("/getscadainfo/", {"id_param": "id"}),
         ("info", "list"): ("/getallscadainfo/", {}),
     }
@@ -399,32 +425,14 @@ def _scada_mapping(kind: str, action: str) -> tuple[str, dict[str, str]]:
     return result
 
 
-@data_scada_app.command("schema")
-def data_scada_schema(
-    ctx: typer.Context,
-    kind: Annotated[str, typer.Option("--kind", help="device|device-data|element|info")],
-) -> None:
-    runtime = runtime_context(ctx)
-    path, _ = _scada_mapping(kind, "schema")
-    emit_api(
-        ctx,
-        summary="读取 SCADA schema 成功",
-        method="GET",
-        path=path,
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
 @data_scada_app.command("get")
 def data_scada_get(
     ctx: typer.Context,
-    kind: Annotated[str, typer.Option("--kind", help="device|device-data|element|info")],
+    kind: Annotated[ScadaListKind, typer.Option("--kind", help="SCADA 类型，仅支持 info")],
     id: Annotated[str, typer.Option("--id", help="记录 ID")],
 ) -> None:
     runtime = runtime_context(ctx)
-    path, meta = _scada_mapping(kind, "get")
+    path, meta = _scada_mapping(kind.value, "get")
     params = {"network": require_network(runtime), meta["id_param"]: id}
     emit_api(
         ctx,
@@ -440,10 +448,10 @@ def data_scada_get(
 @data_scada_app.command("list")
 def data_scada_list(
     ctx: typer.Context,
-    kind: Annotated[str, typer.Option("--kind", help="device|element|info")],
+    kind: Annotated[ScadaListKind, typer.Option("--kind", help="SCADA 类型，仅支持 info")],
 ) -> None:
     runtime = runtime_context(ctx)
-    path, _ = _scada_mapping(kind, "list")
+    path, _ = _scada_mapping(kind.value, "list")
     emit_api(
         ctx,
         summary="读取 SCADA 列表成功",
@@ -498,76 +506,3 @@ def data_scheme_list(ctx: typer.Context) -> None:
         require_auth=True,
         require_network_ctx=True,
     )
-
-
-@data_extension_app.command("keys")
-def data_extension_keys(ctx: typer.Context) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取扩展数据键成功",
-        method="GET",
-        path="/getallextensiondatakeys/",
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
-@data_extension_app.command("get")
-def data_extension_get(
-    ctx: typer.Context,
-    key: Annotated[str, typer.Option("--key", help="扩展键")],
-) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取扩展数据成功",
-        method="GET",
-        path="/getextensiondata/",
-        params={"network": require_network(runtime), "key": key},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
-@data_extension_app.command("list")
-def data_extension_list(ctx: typer.Context) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取扩展数据列表成功",
-        method="GET",
-        path="/getallextensiondata/",
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
-@data_misc_app.command("sensor-placements")
-def data_misc_sensor_placements(ctx: typer.Context) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取传感器位置成功",
-        method="GET",
-        path="/getallsensorplacements/",
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
-@data_misc_app.command("burst-location-results")
-def data_misc_burst_location_results(ctx: typer.Context) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取爆管定位结果成功",
-        method="GET",
-        path="/getallburstlocateresults/",
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )

cli/tjwater_cli/commands_readonly.py

@@ -7,58 +7,45 @@ import typer
 from .apps import component_option_app, network_app
 from .common import emit_api, runtime_context
 from .core import CLIError, require_network
+from .option_types import ComponentOptionKind
 
 
-@network_app.command("get-node-properties")
-def network_get_node_properties(
+@network_app.command("get-junction-properties")
+def network_get_junction_properties(
     ctx: typer.Context,
-    node: Annotated[str, typer.Option("--node", help="节点 ID")],
+    junction: Annotated[str, typer.Option("--junction", help="节点 ID")],
 ) -> None:
     runtime = runtime_context(ctx)
     emit_api(
         ctx,
         summary="读取节点属性成功",
         method="GET",
-        path="/getnodeproperties/",
-        params={"network": require_network(runtime), "node": node},
+        path="/getjunctionproperties/",
+        params={"network": require_network(runtime), "junction": junction},
         require_auth=True,
         require_network_ctx=True,
     )
 
 
-@network_app.command("get-link-properties")
-def network_get_link_properties(
+@network_app.command("get-pipe-properties")
+def network_get_pipe_properties(
     ctx: typer.Context,
-    link: Annotated[str, typer.Option("--link", help="管线 ID")],
+    pipe: Annotated[str, typer.Option("--pipe", help="管道 ID")],
 ) -> None:
     runtime = runtime_context(ctx)
     emit_api(
         ctx,
-        summary="读取管线属性成功",
+        summary="读取管道属性成功",
         method="GET",
-        path="/getlinkproperties/",
-        params={"network": require_network(runtime), "link": link},
+        path="/getpipeproperties/",
+        params={"network": require_network(runtime), "pipe": pipe},
         require_auth=True,
         require_network_ctx=True,
     )
 
 
-@network_app.command("get-all-junction-properties")
-def network_get_all_junction_properties(ctx: typer.Context) -> None:
-    runtime = runtime_context(ctx)
-    emit_api(
-        ctx,
-        summary="读取全部节点属性成功",
-        method="GET",
-        path="/getalljunctionproperties/",
-        params={"network": require_network(runtime)},
-        require_auth=True,
-        require_network_ctx=True,
-    )
-
-
-@network_app.command("get-all-pipe-properties")
-def network_get_all_pipe_properties(ctx: typer.Context) -> None:
+@network_app.command("get-all-pipes-properties")
+def network_get_all_pipes_properties(ctx: typer.Context) -> None:
     runtime = runtime_context(ctx)
     emit_api(
         ctx,
@@ -71,16 +58,140 @@ def network_get_all_pipe_properties(ctx: typer.Context) -> None:
     )
 
 
+@network_app.command("get-reservoir-properties")
+def network_get_reservoir_properties(
+    ctx: typer.Context,
+    reservoir: Annotated[str, typer.Option("--reservoir", help="水库 ID")],
+) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取水库属性成功",
+        method="GET",
+        path="/getreservoirproperties/",
+        params={"network": require_network(runtime), "reservoir": reservoir},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-all-reservoirs-properties")
+def network_get_all_reservoir_properties(ctx: typer.Context) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取全部水库属性成功",
+        method="GET",
+        path="/getallreservoirproperties/",
+        params={"network": require_network(runtime)},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-tank-properties")
+def network_get_tank_properties(
+    ctx: typer.Context,
+    tank: Annotated[str, typer.Option("--tank", help="水箱 ID")],
+) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取水箱属性成功",
+        method="GET",
+        path="/gettankproperties/",
+        params={"network": require_network(runtime), "tank": tank},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-all-tanks-properties")
+def network_get_all_tank_properties(ctx: typer.Context) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取全部水箱属性成功",
+        method="GET",
+        path="/getalltankproperties/",
+        params={"network": require_network(runtime)},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-pump-properties")
+def network_get_pump_properties(
+    ctx: typer.Context,
+    pump: Annotated[str, typer.Option("--pump", help="水泵 ID")],
+) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取水泵属性成功",
+        method="GET",
+        path="/getpumpproperties/",
+        params={"network": require_network(runtime), "pump": pump},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-all-pumps-properties")
+def network_get_all_pump_properties(ctx: typer.Context) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取全部水泵属性成功",
+        method="GET",
+        path="/getallpumpproperties/",
+        params={"network": require_network(runtime)},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-valve-properties")
+def network_get_valve_properties(
+    ctx: typer.Context,
+    valve: Annotated[str, typer.Option("--valve", help="阀门 ID")],
+) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取阀门属性成功",
+        method="GET",
+        path="/getvalveproperties/",
+        params={"network": require_network(runtime), "valve": valve},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
+@network_app.command("get-all-valves-properties")
+def network_get_all_valve_properties(ctx: typer.Context) -> None:
+    runtime = runtime_context(ctx)
+    emit_api(
+        ctx,
+        summary="读取全部阀门属性成功",
+        method="GET",
+        path="/getallvalveproperties/",
+        params={"network": require_network(runtime)},
+        require_auth=True,
+        require_network_ctx=True,
+    )
+
+
 @component_option_app.command("schema")
 def component_option_schema(
     ctx: typer.Context,
-    kind: Annotated[str, typer.Option("--kind", help="time|energy|pump-energy|network")],
+    kind: Annotated[ComponentOptionKind, typer.Option("--kind", help="选项类型，仅支持 time|energy|pump-energy|network")],
     pump: Annotated[str | None, typer.Option("--pump", help="pump-energy 时需要的泵 ID")] = None,
 ) -> None:
     runtime = runtime_context(ctx)
-    path = _component_option_path(kind, schema=True)
+    path = _component_option_path(kind.value, schema=True)
     params = {"network": require_network(runtime)}
-    if kind == "pump-energy" and pump:
+    if kind == ComponentOptionKind.PUMP_ENERGY and pump:
         params["pump"] = pump
     emit_api(
         ctx,
@@ -96,13 +207,13 @@ def component_option_schema(
 @component_option_app.command("get")
 def component_option_get(
     ctx: typer.Context,
-    kind: Annotated[str, typer.Option("--kind", help="time|energy|pump-energy|network")],
+    kind: Annotated[ComponentOptionKind, typer.Option("--kind", help="选项类型，仅支持 time|energy|pump-energy|network")],
     pump: Annotated[str | None, typer.Option("--pump", help="pump-energy 时需要的泵 ID")] = None,
 ) -> None:
     runtime = runtime_context(ctx)
-    path = _component_option_path(kind, schema=False)
+    path = _component_option_path(kind.value, schema=False)
     params = {"network": require_network(runtime)}
-    if kind == "pump-energy":
+    if kind == ComponentOptionKind.PUMP_ENERGY:
         if not pump:
             raise CLIError(
                 "CLI 参数错误",

cli/tjwater_cli/core.py

@@ -15,7 +15,7 @@ import typer
 
 SCHEMA_VERSION = "tjwater-cli/v1"
 CLI_NAME = "tjwater-cli"
-DEFAULT_TIMEOUT = 60
+DEFAULT_TIMEOUT = 180
 DEFAULT_SERVER = "http://192.168.1.114:8000"
 
 

cli/tjwater_cli/helping.py

@@ -100,9 +100,8 @@ def _sample_option_value(path: tuple[str, ...], option_name: str) -> str:
         (("component", "option", "schema"), "kind"): "time",
         (("component", "option", "get"), "kind"): "time",
         (("data", "timeseries", "composite"), "kind"): "scada-simulation",
-        (("data", "scada", "schema"), "kind"): "device",
-        (("data", "scada", "get"), "kind"): "device",
-        (("data", "scada", "list"), "kind"): "device",
+        (("data", "scada", "get"), "kind"): "info",
+        (("data", "scada", "list"), "kind"): "info",
     }
     if (path, option_name) in path_specific_samples:
         return path_specific_samples[(path, option_name)]

cli/tjwater_cli/option_types.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from enum import Enum
+
+
+class ElementType(str, Enum):
+    PIPE = "pipe"
+    JUNCTION = "junction"
+
+
+class SimulationQuery(str, Enum):
+    BY_ID_TIME = "by-id-time"
+    BY_SCHEME_TIME_PROPERTY = "by-scheme-time-property"
+
+
+class CompositeKind(str, Enum):
+    SCADA_SIMULATION = "scada-simulation"
+    ELEMENT_SIMULATION = "element-simulation"
+    ELEMENT_SCADA = "element-scada"
+
+
+class ComponentOptionKind(str, Enum):
+    TIME = "time"
+    ENERGY = "energy"
+    PUMP_ENERGY = "pump-energy"
+    NETWORK = "network"
+
+
+class ValveMode(str, Enum):
+    CLOSE = "close"
+    ISOLATION = "isolation"
+
+
+class DataSource(str, Enum):
+    MONITORING = "monitoring"
+    SIMULATION = "simulation"
+
+
+class ScadaListKind(str, Enum):
+    INFO = "info"
+
+
+PIPE_TIMESERIES_FIELDS: tuple[str, ...] = (
+    "flow",
+    "friction",
+    "headloss",
+    "quality",
+    "reaction",
+    "setting",
+    "status",
+    "velocity",
+)
+
+JUNCTION_TIMESERIES_FIELDS: tuple[str, ...] = (
+    "actual_demand",
+    "total_head",
+    "pressure",
+    "quality",
+)
+
+SCADA_TIMESERIES_FIELDS: tuple[str, ...] = (
+    "monitored_value",
+    "cleaned_value",
+)
+
+
+def timeseries_fields_for_element_type(element_type: ElementType) -> tuple[str, ...]:
+    if element_type == ElementType.PIPE:
+        return PIPE_TIMESERIES_FIELDS
+    if element_type == ElementType.JUNCTION:
+        return JUNCTION_TIMESERIES_FIELDS
+    raise AssertionError(f"unreachable element type: {element_type}")

cli/tjwater_cli/registry.py

@@ -16,7 +16,7 @@ GROUP_SUMMARIES: dict[tuple[str, ...], str] = {
     ("analysis", "burst-location", "schemes"): "爆管定位方案查询命令。",
     ("analysis", "risk"): "风险分析相关命令。",
     ("analysis", "sensor-placement"): "传感器选址相关命令。",
-    ("data",): "时序、SCADA、方案和扩展数据查询命令。",
+    ("data",): "时序、SCADA 和方案数据查询命令。",
     ("data", "timeseries"): "时序数据查询命令。",
     ("data", "timeseries", "realtime"): "实时模拟时序查询命令。",
     ("data", "timeseries", "scheme"): "方案时序查询命令。",
@@ -24,8 +24,6 @@ GROUP_SUMMARIES: dict[tuple[str, ...], str] = {
     ("data", "timeseries", "composite"): "复合时序查询命令。",
     ("data", "scada"): "SCADA 元数据查询命令。",
     ("data", "scheme"): "方案数据查询命令。",
-    ("data", "extension"): "扩展数据查询命令。",
-    ("data", "misc"): "其他结果数据查询命令。",
 }
 
 HIDDEN_PATH_PREFIXES: tuple[tuple[str, ...], ...] = (
@@ -34,31 +32,77 @@ HIDDEN_PATH_PREFIXES: tuple[tuple[str, ...], ...] = (
 )
 
 COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
-    ("network", "get-node-properties"): CommandDoc(
-        path=("network", "get-node-properties"),
+    ("network", "get-junction-properties"): CommandDoc(
+        path=("network", "get-junction-properties"),
         summary="读取节点属性",
-        description="调用 /getnodeproperties/。",
-        options=(CommandOptionDoc("node", "节点 ID", required=True),),
-        examples=("tjwater-cli network get-node-properties --node J1",),
+        description="调用 /getjunctionproperties/。",
+        options=(CommandOptionDoc("junction", "节点 ID", required=True),),
+        examples=("tjwater-cli network get-junction-properties --junction J1",),
     ),
-    ("network", "get-link-properties"): CommandDoc(
-        path=("network", "get-link-properties"),
-        summary="读取管线属性",
-        description="调用 /getlinkproperties/。",
-        options=(CommandOptionDoc("link", "管线 ID", required=True),),
-        examples=("tjwater-cli network get-link-properties --link P1",),
+    ("network", "get-pipe-properties"): CommandDoc(
+        path=("network", "get-pipe-properties"),
+        summary="读取管道属性",
+        description="调用 /getpipeproperties/。",
+        options=(CommandOptionDoc("pipe", "管道 ID", required=True),),
+        examples=("tjwater-cli network get-pipe-properties --pipe P1",),
     ),
-    ("network", "get-all-junction-properties"): CommandDoc(
-        path=("network", "get-all-junction-properties"),
-        summary="读取全部节点属性",
-        description="调用 /getalljunctionproperties/。",
-        examples=("tjwater-cli network get-all-junction-properties",),
-    ),
-    ("network", "get-all-pipe-properties"): CommandDoc(
-        path=("network", "get-all-pipe-properties"),
+    ("network", "get-all-pipes-properties"): CommandDoc(
+        path=("network", "get-all-pipes-properties"),
         summary="读取全部管道属性",
         description="调用 /getallpipeproperties/。",
-        examples=("tjwater-cli network get-all-pipe-properties",),
+        examples=("tjwater-cli network get-all-pipes-properties",),
+    ),
+    ("network", "get-reservoir-properties"): CommandDoc(
+        path=("network", "get-reservoir-properties"),
+        summary="读取水库属性",
+        description="调用 /getreservoirproperties/。",
+        options=(CommandOptionDoc("reservoir", "水库 ID", required=True),),
+        examples=("tjwater-cli network get-reservoir-properties --reservoir R1",),
+    ),
+    ("network", "get-all-reservoirs-properties"): CommandDoc(
+        path=("network", "get-all-reservoirs-properties"),
+        summary="读取全部水库属性",
+        description="调用 /getallreservoirproperties/。",
+        examples=("tjwater-cli network get-all-reservoirs-properties",),
+    ),
+    ("network", "get-tank-properties"): CommandDoc(
+        path=("network", "get-tank-properties"),
+        summary="读取水箱属性",
+        description="调用 /gettankproperties/。",
+        options=(CommandOptionDoc("tank", "水箱 ID", required=True),),
+        examples=("tjwater-cli network get-tank-properties --tank T1",),
+    ),
+    ("network", "get-all-tanks-properties"): CommandDoc(
+        path=("network", "get-all-tanks-properties"),
+        summary="读取全部水箱属性",
+        description="调用 /getalltankproperties/。",
+        examples=("tjwater-cli network get-all-tanks-properties",),
+    ),
+    ("network", "get-pump-properties"): CommandDoc(
+        path=("network", "get-pump-properties"),
+        summary="读取水泵属性",
+        description="调用 /getpumpproperties/。",
+        options=(CommandOptionDoc("pump", "水泵 ID", required=True),),
+        examples=("tjwater-cli network get-pump-properties --pump PU1",),
+    ),
+    ("network", "get-all-pumps-properties"): CommandDoc(
+        path=("network", "get-all-pumps-properties"),
+        summary="读取全部水泵属性",
+        description="调用 /getallpumpproperties/。",
+        examples=("tjwater-cli network get-all-pumps-properties",),
+    ),
+    ("network", "get-valve-properties"): CommandDoc(
+        path=("network", "get-valve-properties"),
+        summary="读取阀门属性",
+        description="调用 /getvalveproperties/。",
+        options=(CommandOptionDoc("valve", "阀门 ID", required=True),),
+        examples=("tjwater-cli network get-valve-properties --valve V1",),
+    ),
+    ("network", "get-all-valves-properties"): CommandDoc(
+        path=("network", "get-all-valves-properties"),
+        summary="读取全部阀门属性",
+        description="调用 /getallvalveproperties/。",
+        examples=("tjwater-cli network get-all-valves-properties",),
     ),
     ("component", "option", "schema"): CommandDoc(
         path=("component", "option", "schema"),
@@ -314,7 +358,7 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
         description="调用 /realtime/query/by-id-time。",
         options=(
             CommandOptionDoc("id", "元素 ID", required=True),
-            CommandOptionDoc("type", "元素类型：pipe 或 junction", required=True),
+            CommandOptionDoc("type", "元素类型：pipe 或 junction；links/nodes 是独立子命令，不是 type 取值", required=True),
             CommandOptionDoc("time", "显式带时区的查询时间", required=True),
         ),
         examples=(
@@ -325,11 +369,11 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
     ("data", "timeseries", "realtime", "simulation-by-time-property"): CommandDoc(
         path=("data", "timeseries", "realtime", "simulation-by-time-property"),
         summary="按时间和属性查询实时模拟结果",
-        description="调用 /realtime/query/by-time-property。",
+        description="调用 /realtime/query/by-time-property。pipe 属性：flow、friction、headloss、quality、reaction、setting、status、velocity；junction 属性：actual_demand、total_head、pressure、quality。",
         options=(
-            CommandOptionDoc("type", "元素类型：pipe 或 junction", required=True),
+            CommandOptionDoc("type", "元素类型：pipe 或 junction；links/nodes 是独立子命令，不是 type 取值", required=True),
             CommandOptionDoc("time", "显式带时区的查询时间", required=True),
-            CommandOptionDoc("property", "属性名", required=True),
+            CommandOptionDoc("property", "属性名；会按 type 校验可选值", required=True),
         ),
         examples=("tjwater-cli data timeseries realtime simulation-by-time-property --type pipe --time 2025-01-02T03:30:00+08:00 --property flow",),
     ),
@@ -348,10 +392,10 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
     ("data", "timeseries", "scheme", "node-field"): CommandDoc(
         path=("data", "timeseries", "scheme", "node-field"),
         summary="查询方案节点字段时序",
-        description="调用 /scheme/nodes/{node_id}/field。",
+        description="调用 /scheme/nodes/{node_id}/field。field 仅支持 actual_demand、total_head、pressure、quality。",
         options=(
             CommandOptionDoc("node", "节点 ID", required=True),
-            CommandOptionDoc("field", "字段名", required=True),
+            CommandOptionDoc("field", "字段名：actual_demand、total_head、pressure、quality", required=True),
             CommandOptionDoc("start-time", "显式带时区的开始时间", required=True),
             CommandOptionDoc("end-time", "显式带时区的结束时间", required=True),
             CommandOptionDoc("scheme", "方案名称"),
@@ -362,15 +406,15 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
     ("data", "timeseries", "scheme", "simulation"): CommandDoc(
         path=("data", "timeseries", "scheme", "simulation"),
         summary="查询方案模拟数据",
-        description="支持 by-id-time 与 by-scheme-time-property 两种查询。",
+        description="支持 by-id-time 与 by-scheme-time-property 两种查询。pipe 属性：flow、friction、headloss、quality、reaction、setting、status、velocity；junction 属性：actual_demand、total_head、pressure、quality。",
         options=(
             CommandOptionDoc("query", "查询模式：by-id-time 或 by-scheme-time-property", required=True),
             CommandOptionDoc("scheme", "方案名称"),
             CommandOptionDoc("scheme-type", "方案类型"),
             CommandOptionDoc("id", "元素 ID（by-id-time 时必需）"),
             CommandOptionDoc("time", "显式带时区的查询时间", required=True),
-            CommandOptionDoc("type", "元素类型：pipe 或 junction"),
-            CommandOptionDoc("property", "属性名（by-scheme-time-property 时必需）"),
+            CommandOptionDoc("type", "元素类型：pipe 或 junction；links/nodes 是独立子命令，不是 type 取值"),
+            CommandOptionDoc("property", "属性名（by-scheme-time-property 时必需；会按 type 校验可选值）"),
         ),
         examples=(
             "tjwater-cli data timeseries scheme simulation --query by-id-time --id J1 --time 2025-01-02T03:30:00+08:00 --type junction --scheme my_scheme",
@@ -380,16 +424,16 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
     ("data", "timeseries", "scada", "query"): CommandDoc(
         path=("data", "timeseries", "scada", "query"),
         summary="查询 SCADA 时序",
-        description="device-id 会被转换成后端逗号分隔参数。",
+        description="device-id 会被转换成后端逗号分隔参数。field 仅支持 monitored_value、cleaned_value。",
         options=(
             CommandOptionDoc("device-id", "设备 ID（可多次指定）", required=True, repeated=True),
             CommandOptionDoc("start-time", "显式带时区的开始时间", required=True),
             CommandOptionDoc("end-time", "显式带时区的结束时间", required=True),
-            CommandOptionDoc("field", "字段名"),
+            CommandOptionDoc("field", "字段名：monitored_value、cleaned_value"),
         ),
         examples=(
             "tjwater-cli data timeseries scada query --device-id D1 --device-id D2 --start-time 2025-01-02T03:00:00+08:00 --end-time 2025-01-02T04:00:00+08:00",
-            "tjwater-cli data timeseries scada query --device-id D1 --start-time 2025-01-02T03:00:00+08:00 --end-time 2025-01-02T04:00:00+08:00 --field flow",
+            "tjwater-cli data timeseries scada query --device-id D1 --start-time 2025-01-02T03:00:00+08:00 --end-time 2025-01-02T04:00:00+08:00 --field monitored_value",
         ),
     ),
     ("data", "timeseries", "composite"): CommandDoc(
@@ -422,41 +466,22 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
         ),
         examples=("tjwater-cli data timeseries composite pipeline-health --pipe P1 --start-time 2025-01-02T03:00:00+08:00 --end-time 2025-01-02T04:00:00+08:00",),
     ),
-    ("data", "scada", "schema"): CommandDoc(
-        path=("data", "scada", "schema"),
-        summary="读取 SCADA schema",
-        description="kind 支持 device、device-data、element、info。",
-        options=(CommandOptionDoc("kind", "SCADA 数据类型", required=True),),
-        examples=(
-            "tjwater-cli data scada schema --kind device",
-            "tjwater-cli data scada schema --kind device-data",
-            "tjwater-cli data scada schema --kind element",
-            "tjwater-cli data scada schema --kind info",
-        ),
-    ),
     ("data", "scada", "get"): CommandDoc(
         path=("data", "scada", "get"),
         summary="读取单条 SCADA 元数据",
-        description="kind 支持 device、device-data、element、info。",
+        description="kind 仅支持 info。",
         options=(
             CommandOptionDoc("kind", "SCADA 数据类型", required=True),
             CommandOptionDoc("id", "记录 ID", required=True),
         ),
-        examples=(
-            "tjwater-cli data scada get --kind device --id D1",
-            "tjwater-cli data scada get --kind element --id E1",
-        ),
+        examples=("tjwater-cli data scada get --kind info --id SCADA-001",),
     ),
     ("data", "scada", "list"): CommandDoc(
         path=("data", "scada", "list"),
         summary="列出 SCADA 元数据",
-        description="kind 支持 device、element、info；device-data 当前后端无 list 接口。",
+        description="kind 仅支持 info。",
         options=(CommandOptionDoc("kind", "SCADA 数据类型", required=True),),
-        examples=(
-            "tjwater-cli data scada list --kind device",
-            "tjwater-cli data scada list --kind element",
-            "tjwater-cli data scada list --kind info",
-        ),
+        examples=("tjwater-cli data scada list --kind info",),
     ),
     ("data", "scheme", "schema"): CommandDoc(
         path=("data", "scheme", "schema"),
@@ -477,37 +502,6 @@ COMMAND_DOCS: dict[tuple[str, ...], CommandDoc] = {
         description="调用 /getallschemes/。",
         examples=("tjwater-cli data scheme list",),
     ),
-    ("data", "extension", "keys"): CommandDoc(
-        path=("data", "extension", "keys"),
-        summary="列出扩展数据键",
-        description="调用 /getallextensiondatakeys/。",
-        examples=("tjwater-cli data extension keys",),
-    ),
-    ("data", "extension", "get"): CommandDoc(
-        path=("data", "extension", "get"),
-        summary="读取扩展数据",
-        description="调用 /getextensiondata/。",
-        options=(CommandOptionDoc("key", "扩展键", required=True),),
-        examples=("tjwater-cli data extension get --key my_key",),
-    ),
-    ("data", "extension", "list"): CommandDoc(
-        path=("data", "extension", "list"),
-        summary="列出扩展数据",
-        description="调用 /getallextensiondata/。",
-        examples=("tjwater-cli data extension list",),
-    ),
-    ("data", "misc", "sensor-placements"): CommandDoc(
-        path=("data", "misc", "sensor-placements"),
-        summary="列出传感器布置结果",
-        description="调用 /getallsensorplacements/。",
-        examples=("tjwater-cli data misc sensor-placements",),
-    ),
-    ("data", "misc", "burst-location-results"): CommandDoc(
-        path=("data", "misc", "burst-location-results"),
-        summary="列出爆管定位结果",
-        description="调用 /getallburstlocateresults/。",
-        examples=("tjwater-cli data misc burst-location-results",),
-    ),
 }
 
 

cli/tjwater_cli_endpoint_scope.md

@@ -259,12 +259,8 @@ app/api/v1/endpoints/project_data.py
 | `tjwater-cli data timeseries scada query --device-id ID --start-time TIME --end-time TIME [--device-id ID ...] [--field FIELD]` | `GET /scada/by-ids-time-range`、`GET /scada/by-ids-field-time-range` | SCADA 时序；CLI 把重复 `--device-id` 转换为后端逗号分隔参数 |
 | `tjwater-cli data timeseries composite --kind scada-simulation\|element-simulation\|element-scada --feature FEATURE --start-time TIME --end-time TIME` | `GET /composite/*` | 复合查询，`--feature` 可重复 |
 | `tjwater-cli data timeseries composite pipeline-health --pipe PIPE --start-time TIME --end-time TIME` | `GET /composite/pipeline-health-prediction` | 管道健康预测 |
-| `tjwater-cli data scada schema --kind device\|device-data\|element\|info` | `GET /getscada*schema/` | `SCADA` 元数据 `schema` |
-| `tjwater-cli data scada get\|list --kind device\|device-data\|element\|info` | `scada.py` 下 `GET` 查询接口 | `SCADA` 元数据 |
+| `tjwater-cli data scada get\|list --kind info` | `GET /getscadainfo/`、`GET /getallscadainfo/` | `SCADA info` 元数据 |
 | `tjwater-cli data scheme schema\|get\|list` | `schemes.py` 下 `GET` 接口 | 当前 project 方案查询 |
-| `tjwater-cli data extension keys\|get\|list` | `extension.py` 下 `GET` 查询接口 | 当前 project 扩展数据查询 |
-| `tjwater-cli data misc sensor-placements` | `GET /getallsensorplacements/` | 当前 project 传感器位置 |
-| `tjwater-cli data misc burst-location-results` | `GET /getallburstlocateresults/` | 当前 project 爆管定位结果 |
 
 - `realtime` 是首批 simulation 结果的主读取域；CLI 可以按任务语义组合 `links`、`nodes`、`simulation-by-id-time`、`simulation-by-time-property`，但底层数据源仍以 `realtime.py` 为准。
 - `realtime`、`scheme`、`composite` 等时间查询命令面向用户时仍按 **UTC+8** 输入；CLI/服务端负责转换为后端使用的 **UTC0** 条件进行检索。若返回结果直接包含时间戳，必须显式带时区，避免把存储时间和展示时间混淆。

requirements.txt

@@ -168,3 +168,4 @@ zmq==0.0.0
 pymoo==0.6.1.6
 scikit-learn==1.6.1
 scipy==1.15.2
+pyclipper==1.4.0