专题图修改

app/services/qgis/qgis_env.py

@@ -74,16 +74,9 @@ def get_qgis_python_path(qgis_root: str = None) -> str | None:
 
 def build_qgis_command(qgis_root: str = None) -> list[str]:
     """
-    构建通过 .bat 包装器启动 QGIS 子进程的命令列表。
-    设置环境变量并启动 QGIS Python 3.12。
+    构建 QGIS 子进程启动命令（直接调用 Python，不经过 bat 包装器）。
+    环境变量通过 build_qgis_env() 构建后传给 subprocess.run(env=...)。
     """
-    import platform
-    if platform.system() != "Windows":
-        python_path = get_qgis_python_path(qgis_root)
-        if not python_path:
-            raise RuntimeError("未找到 QGIS Python 解释器")
-        return [python_path, get_runner_script()]
-
     if qgis_root is None:
         qgis_root = _detect_qgis_root() or "D:/QGIS"
 
@@ -95,8 +88,76 @@ def build_qgis_command(qgis_root: str = None) -> list[str]:
     if not os.path.isfile(runner_script):
         raise RuntimeError(f"QGIS Runner 脚本不存在: {runner_script}")
 
-    bat_path = _generate_bat_wrapper(qgis_root, python_path, runner_script)
-    return ["cmd.exe", "/c", bat_path]
+    return [python_path, runner_script]
+
+
+def build_qgis_env(qgis_root: str = None) -> dict:
+    """
+    构建 QGIS 子进程所需的完整环境变量字典。
+
+    基于当前进程环境继承，设置 QGIS 所需的 PYTHONPATH、PATH、
+    GDAL_DATA、PROJ_DATA 等变量。调用方直接传给 subprocess.run(env=...)。
+    """
+    import platform
+
+    if qgis_root is None:
+        qgis_root = _detect_qgis_root() or "D:/QGIS"
+
+    env = dict(os.environ)
+
+    if platform.system() != "Windows":
+        return env
+
+    # --- 检测 QGIS 应用目录 ---
+    qgis_app_dir = os.path.join(qgis_root, "apps", "qgis-ltr")
+    if not os.path.isdir(qgis_app_dir):
+        qgis_app_dir = os.path.join(qgis_root, "apps", "qgis")
+    if not os.path.isdir(qgis_app_dir):
+        raise RuntimeError(f"未找到 QGIS 应用目录: {qgis_root}\\apps\\qgis-ltr 或 qgis")
+
+    # --- 检测 Python 目录 ---
+    python_dir = os.path.join(qgis_root, "apps", "Python312")
+    if not os.path.isdir(python_dir):
+        for name in ("Python39", "Python310", "Python311"):
+            candidate = os.path.join(qgis_root, "apps", name)
+            if os.path.isdir(candidate):
+                python_dir = candidate
+                break
+
+    # --- 核心路径 ---
+    qtplugins = os.path.join(qgis_app_dir, "qtplugins")
+    qt5_plugins = os.path.join(qgis_root, "apps", "Qt5", "plugins")
+    gdal_data = os.path.join(qgis_root, "apps", "gdal", "share", "gdal")
+    qgis_python = os.path.join(qgis_app_dir, "python")
+    qgis_bin = os.path.join(qgis_app_dir, "bin")
+    qt5_bin = os.path.join(qgis_root, "apps", "Qt5", "bin")
+    gdal_lib = os.path.join(qgis_root, "apps", "gdal", "lib")
+
+    env["PYTHONPATH"] = qgis_python
+    env["QGIS_PREFIX_PATH"] = qgis_app_dir
+    env["QT_PLUGIN_PATH"] = f"{qtplugins};{qt5_plugins}"
+    env["GDAL_DATA"] = gdal_data
+    env["PYTHONUTF8"] = "1"
+    env["GDAL_FILENAME_IS_UTF8"] = "YES"
+    env["VSI_CACHE"] = "TRUE"
+    env["VSI_CACHE_SIZE"] = "1000000"
+
+    # --- PROJ 数据目录 ---
+    for pd in [
+        os.path.join(qgis_app_dir, "share", "proj"),
+        os.path.join(qgis_root, "share", "proj"),
+        os.path.join(qgis_root, "apps", "gdal", "share", "proj"),
+    ]:
+        if os.path.isfile(os.path.join(pd, "proj.db")):
+            env["PROJ_DATA"] = pd
+            break
+
+    # --- PATH：前置 QGIS 二进制目录 ---
+    prepend = f"{qgis_bin};{qt5_bin};{gdal_lib}"
+    env["PATH"] = f"{prepend};{env.get('PATH', '')}"
+
+    logger.debug(f"QGIS env built: QGIS_ROOT={qgis_root}, QGIS_APP={qgis_app_dir}")
+    return env
 
 
 def is_qgis_available(qgis_root: str = None) -> bool: