QGIS的docker管理

app/api/qgis_map_export.py

@@ -175,10 +175,15 @@ def _build_qgis_config(batch_folder: str) -> dict:
         is_docker = False
 
     if is_docker:
-        # GPKG 目录：容器内路径 = 项目挂载目录 + GPKG 子目录
-        project_dir = get_docker_project_dir()
-        gpkg_subdir = getattr(settings, "QGIS_GPKG_DIR", "app/data/gpkg")
-        gpkg_dir = f"{project_dir}/{gpkg_subdir}"
+        # GPKG 目录：优先使用容器内本地路径（预拷贝后绕过 WSL2 9P）
+        # 需先执行 python script/copy_gpkg_to_container.py
+        gpkg_dir = getattr(settings, "QGIS_DOCKER_GPKG_DIR", "") or ""
+        if not gpkg_dir:
+            # fallback: 使用挂载路径（性能差）
+            project_dir = get_docker_project_dir()
+            gpkg_subdir = getattr(settings, "QGIS_GPKG_DIR", "app/data/gpkg")
+            gpkg_dir = f"{project_dir}/{gpkg_subdir}"
+            logger.warning(f"GPKG 将从挂载目录读取（慢），建议执行 copy_gpkg_to_container.py")
         # batch_folder：主机路径 → 容器路径
         host_fs = get_host_file_store().rstrip("/")
         container_fs = get_container_file_store().rstrip("/")
@@ -365,7 +370,7 @@ def _generate_batch_maps(models: list, config: dict, batch_key: str,
     import json, math, concurrent.futures, subprocess, tempfile, threading
     from app.services.qgis.qgis_env import (
         get_docker_project_dir, get_container_python_path, build_docker_exec_cmd,
-        map_host_to_container, map_container_to_host,
+        map_host_to_container, map_container_to_host, map_template_to_container,
     )
 
     max_workers = getattr(settings, "QGIS_PARALLEL_WORKERS", 4)
@@ -397,9 +402,9 @@ def _generate_batch_maps(models: list, config: dict, batch_key: str,
             cm = dict(m)
             if "outFile" in cm:
                 cm["outFile"] = map_host_to_container(cm["outFile"])
-            # 模板 path 也需要映射：Windows主机路径 → 容器内路径
+            # 模板 path 映射到容器本地路径（预拷贝后绕过 9P）
             if "path" in cm:
-                cm["path"] = map_host_to_container(cm["path"])
+                cm["path"] = map_template_to_container(cm["path"])
             container_models.append(cm)
 
         request = json.dumps({"config": config, "models": container_models}, ensure_ascii=False)

app/script/copy_data_to_container.py

@@ -0,0 +1,159 @@
+"""
+将主机端 GPKG 和模板文件预拷贝到 Docker 容器本地文件系统。
+
+WSL2 9P 文件系统随机读取极慢（GPKG 62MB 耗时 6-10s，模板 ZIP 也慢），
+拷贝到容器内 /data/ 后读取仅需 ~0.5s。
+
+用法：
+  python app/script/copy_data_to_container.py [--container qgis-server] [--dry-run] [--only gpkg|template]
+
+前置条件：
+  Docker 容器已启动（docker start qgis-server）
+"""
+import argparse
+import os
+import subprocess
+import sys
+import time
+from pathlib import Path
+
+PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
+
+
+def _load_config():
+    """从 settings.toml 读取配置"""
+    try:
+        from config import settings
+        return {
+            "gpkg_subdir": getattr(settings, "QGIS_GPKG_DIR", "app/data/gpkg"),
+            "template_subdir": "app/data/template",
+            "container": getattr(settings, "QGIS_DOCKER_CONTAINER", "qgis-server"),
+            "container_gpkg": getattr(settings, "QGIS_DOCKER_GPKG_DIR", "/data/gpkg"),
+            "container_template": getattr(settings, "QGIS_DOCKER_TEMPLATE_DIR", "/data/template"),
+        }
+    except ImportError:
+        pass
+
+    # fallback: 解析 TOML
+    cfg = {
+        "gpkg_subdir": "app/data/gpkg",
+        "template_subdir": "app/data/template",
+        "container": "qgis-server",
+        "container_gpkg": "/data/gpkg",
+        "container_template": "/data/template",
+    }
+    toml_path = PROJECT_ROOT / "settings.toml"
+    if toml_path.exists():
+        for line in toml_path.read_text(encoding="utf-8").splitlines():
+            line = line.strip()
+            for key, prefix in [
+                ("gpkg_subdir", "QGIS_GPKG_DIR"),
+                ("container", "QGIS_DOCKER_CONTAINER"),
+                ("container_gpkg", "QGIS_DOCKER_GPKG_DIR"),
+                ("container_template", "QGIS_DOCKER_TEMPLATE_DIR"),
+            ]:
+                if line.startswith(prefix) and "=" in line:
+                    cfg[key] = line.split("=", 1)[1].strip().strip('"').strip("'")
+    return cfg
+
+
+def _run(cmd, timeout=10, **kwargs):
+    """subprocess.run 封装，统一 UTF-8 编码，避免 Windows GBK 报错"""
+    result = subprocess.run(
+        cmd, capture_output=True, timeout=timeout,
+        encoding="utf-8", errors="replace", **kwargs,
+    )
+    return result
+
+
+def _check_container(container: str):
+    """检查容器是否运行"""
+    result = _run(["docker", "inspect", "--format={{.State.Running}}", container], timeout=5)
+    if (result.stdout or "").strip() != "true":
+        raise RuntimeError(f"容器 {container} 未运行，请先 docker start {container}")
+
+
+def _copy_dir_to_container(host_dir: Path, container: str, container_dest: str, label: str, dry_run: bool):
+    """拷贝单个目录到容器"""
+    if not host_dir.is_dir():
+        print(f"  [{label}] 目录不存在，跳过: {host_dir}")
+        return 0
+
+    files = list(host_dir.rglob("*"))
+    files = [f for f in files if f.is_file()]
+    if not files:
+        print(f"  [{label}] 目录为空，跳过: {host_dir}")
+        return 0
+
+    total_size = sum(f.stat().st_size for f in files)
+    print(f"  [{label}] 主机目录: {host_dir}")
+    print(f"           文件数: {len(files)}, 总大小: {total_size / 1024 / 1024:.1f} MB")
+    print(f"           容器目标: {container}:{container_dest}")
+
+    if dry_run:
+        print(f"           [dry-run] 跳过")
+        return 0
+
+    # 确保目标目录存在
+    parent_dir = container_dest.rsplit("/", 1)[0]
+    _run(["docker", "exec", container, "mkdir", "-p", parent_dir])
+
+    # 清理旧目录
+    _run(["docker", "exec", container, "rm", "-rf", container_dest])
+
+    # docker cp
+    t0 = time.time()
+    result = _run(["docker", "cp", str(host_dir), f"{container}:{container_dest}"], timeout=120)
+    elapsed = time.time() - t0
+
+    if result.returncode != 0:
+        raise RuntimeError(f"[{label}] docker cp 失败: {result.stderr}")
+
+    # 验证
+    verify = _run(["docker", "exec", container, "find", container_dest, "-type", "f"])
+    stdout = (verify.stdout or "").strip()
+    count = len([l for l in stdout.splitlines() if l.strip()])
+    print(f"           拷贝完成: {elapsed:.1f}s, 容器内 {count} 个文件")
+    return elapsed
+
+
+def copy_to_container(container: str = None, dry_run: bool = False, only: str = None):
+    """将 GPKG 和模板拷贝到容器本地文件系统"""
+    cfg = _load_config()
+    if container is None:
+        container = cfg["container"]
+
+    _check_container(container)
+
+    t_total = time.time()
+    print(f"=== 预拷贝静态数据到容器 {container} ===\n")
+
+    if only != "template":
+        host_gpkg = PROJECT_ROOT / cfg["gpkg_subdir"]
+        _copy_dir_to_container(host_gpkg, container, cfg["container_gpkg"], "GPKG", dry_run)
+        print()
+
+    if only != "gpkg":
+        host_template = PROJECT_ROOT / cfg["template_subdir"]
+        _copy_dir_to_container(host_template, container, cfg["container_template"], "模板", dry_run)
+
+    elapsed = time.time() - t_total
+    print(f"\n=== 总耗时: {elapsed:.1f}s ===")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="将 GPKG 和模板预拷贝到 Docker 容器本地 FS")
+    parser.add_argument("--container", default=None, help="Docker 容器名称")
+    parser.add_argument("--dry-run", action="store_true", help="仅显示信息，不实际拷贝")
+    parser.add_argument("--only", choices=["gpkg", "template"], help="只拷贝指定类型")
+    args = parser.parse_args()
+
+    try:
+        copy_to_container(container=args.container, dry_run=args.dry_run, only=args.only)
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

app/services/qgis/qgis_env.py

@@ -167,6 +167,33 @@ def map_container_to_host(path: str) -> str:
     return path
 
 
+def map_template_to_container(host_path: str) -> str:
+    """将主机端模板路径映射到容器内本地路径（预拷贝后绕过 9P）。
+
+    主机: F:/project/xian/xian_algorithm_new/app/data/template/rainfall/xxx.qgz
+    容器: /data/template/rainfall/xxx.qgz
+    """
+    try:
+        from config import settings
+        container_tpl = getattr(settings, "QGIS_DOCKER_TEMPLATE_DIR", "") or ""
+    except Exception:
+        container_tpl = ""
+
+    if not container_tpl:
+        # fallback: 用通用映射（走 9P，慢）
+        return map_host_to_container(host_path)
+
+    normalized = host_path.replace("\\", "/").lower()
+    # 找 "app/data/template/" 后面的部分
+    marker = "app/data/template/"
+    idx = normalized.find(marker)
+    if idx >= 0:
+        relative = host_path.replace("\\", "/")[idx + len(marker):]
+        return f"{container_tpl.rstrip('/')}/{relative}"
+
+    return map_host_to_container(host_path)
+
+
 def build_docker_volume_mounts() -> list:
     """
     构建 Docker 卷挂载参数列表（用于 docker run）。