QGIS完成初步重构

app/api/qgis_map_export.py

@@ -433,16 +433,16 @@ def _generate_batch_maps(models: list, config: dict, disaster_time: str) -> None
                 if line.startswith("{"):
                     output = json.loads(line)
                     batch_results = output.get("results", [])
-                    success_count = sum(1 for r in batch_results if r.get("success"))
+                    success_count = sum(1 for r in batch_results if "error" not in r)
                     fail_count = len(batch_results) - success_count
                     logger.info(
                         f"[批量产图] 完成: 成功={success_count}, 失败={fail_count}"
                     )
                     for r in batch_results:
-                        if r.get("success"):
-                            logger.info(f"  ✓ {r.get('output', 'N/A')}")
+                        if "error" not in r:
+                            logger.info(f"  OK {r.get('output', 'N/A')}")
                         else:
-                            logger.error(f"  ✗ {r.get('error', 'unknown')}")
+                            logger.error(f"  FAIL {r.get('error', 'unknown')}")
                     break
             else:
                 logger.warning("[批量产图] 子进程输出中未找到 JSON 结果")

app/script/run_qgis.bat

@@ -0,0 +1,23 @@
+@echo off
+REM ============================================================
+REM QGIS 子进程启动脚本（Windows）
+REM 需要设置 QGIS_ROOT 环境变量指向 QGIS 安装目录
+REM ============================================================
+if "%QGIS_ROOT%"=="" (
+    echo [ERROR] QGIS_ROOT 环境变量未设置
+    exit /b 1
+)
+
+set "QGIS_APP_DIR=%QGIS_ROOT%\apps\qgis-ltr"
+set "PYTHONHOME=%QGIS_ROOT%\apps\Python312"
+set "PYTHONPATH=%QGIS_APP_DIR%\python"
+set "QGIS_PREFIX_PATH=%QGIS_APP_DIR%"
+set "QT_PLUGIN_PATH=%QGIS_APP_DIR%\qtplugins;%QGIS_ROOT%\apps\Qt5\plugins"
+set "GDAL_DATA=%QGIS_ROOT%\apps\gdal\share\gdal"
+set "PYTHONUTF8=1"
+set "GDAL_FILENAME_IS_UTF8=YES"
+set "VSI_CACHE=TRUE"
+set "VSI_CACHE_SIZE=1000000"
+set "PATH=%QGIS_APP_DIR%\bin;%QGIS_ROOT%\apps\Qt5\bin;%QGIS_ROOT%\apps\gdal\lib;%PATH%"
+
+"%PYTHONHOME%\python3.exe" %*

app/services/qgis/qgis_env.py

@@ -11,7 +11,6 @@ QGIS 环境检测与子进程配置模块。
   - get_runner_script():    获取 qgis_runner.py 的路径
 """
 import os
-import tempfile
 from pathlib import Path
 
 from app.config.paths import get_logger
@@ -74,36 +73,32 @@ def get_qgis_python_path(qgis_root: str = None) -> str | None:
 
 def build_qgis_command(qgis_root: str = None) -> list[str]:
     """
-    构建通过 .bat 包装器启动 QGIS 子进程的命令列表。
+    构建通过静态启动脚本运行 QGIS 子进程的命令列表。
 
-    .bat 文件设置环境变量并启动 QGIS Python 3.12。
-    DLL 加载由 qgis_runner.py 中的 ctypes 预加载机制处理。
-
-    Returns:
-        可直接传给 subprocess.run() 的命令列表
+    Windows: 调用 app/script/run_qgis.bat（通过 QGIS_ROOT 环境变量定位）
+    Linux:   直接调用 QGIS Python 解释器
     """
     import platform
-    if platform.system() != "Windows":
-        # Linux: 直接用 Python，不需要 .bat 包装
-        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"
 
-    python_path = get_qgis_python_path(qgis_root)
-    if not python_path:
-        raise RuntimeError("未找到 QGIS Python 3.12 解释器")
-
     runner_script = get_runner_script()
     if not os.path.isfile(runner_script):
         raise RuntimeError(f"QGIS Runner 脚本不存在: {runner_script}")
 
-    # 生成 .bat 包装脚本
-    bat_path = _generate_bat_wrapper(qgis_root, python_path, runner_script)
-    return ["cmd.exe", "/c", bat_path]
+    if platform.system() == "Windows":
+        script_dir = Path(__file__).parent.parent.parent / "script"
+        bat_path = str(script_dir / "run_qgis.bat")
+        if not os.path.isfile(bat_path):
+            raise RuntimeError(f"QGIS 启动脚本不存在: {bat_path}")
+        # 设置环境变量让 .bat 能找到 QGIS
+        os.environ["QGIS_ROOT"] = qgis_root
+        return ["cmd.exe", "/c", bat_path, runner_script]
+    else:
+        python_path = get_qgis_python_path(qgis_root)
+        if not python_path:
+            raise RuntimeError("未找到 QGIS Python 解释器")
+        return [python_path, runner_script]
 
 
 def is_qgis_available(qgis_root: str = None) -> bool:
@@ -116,49 +111,6 @@ def get_runner_script() -> str:
     return str(Path(__file__).parent / "qgis_runner.py")
 
 
-def _generate_bat_wrapper(qgis_root: str, python_path: str, runner_script: str) -> str:
-    """
-    生成 .bat 包装脚本，设置 QGIS 环境变量并启动 runner。
-
-    .bat 文件通过 cmd.exe 执行，设置必要的环境变量。
-    DLL 加载由 qgis_runner.py 的 ctypes 预加载处理。
-    """
-    qgis_app_dir = os.path.join(qgis_root, "apps", "qgis-ltr").replace("/", "\\")
-    python_dir = os.path.join(qgis_root, "apps", "Python312").replace("/", "\\")
-    qt5_plugins = os.path.join(qgis_root, "apps", "Qt5", "plugins").replace("/", "\\")
-    qtplugins = os.path.join(qgis_app_dir, "qtplugins").replace("/", "\\")
-    gdal_data = os.path.join(qgis_root, "apps", "gdal", "share", "gdal").replace("/", "\\")
-    qgis_python_dir = os.path.join(qgis_app_dir, "python").replace("/", "\\")
-    qgis_bin = os.path.join(qgis_app_dir, "bin").replace("/", "\\")
-    qt5_bin = os.path.join(qgis_root, "apps", "Qt5", "bin").replace("/", "\\")
-    gdal_lib = os.path.join(qgis_root, "apps", "gdal", "lib").replace("/", "\\")
-
-    bat_content = f"""@echo off
-set "PYTHONHOME={python_dir}"
-set "PYTHONPATH={qgis_python_dir}"
-set "QGIS_PREFIX_PATH={qgis_app_dir}"
-set "QT_PLUGIN_PATH={qtplugins};{qt5_plugins}"
-set "GDAL_DATA={gdal_data}"
-set "PYTHONUTF8=1"
-set "GDAL_FILENAME_IS_UTF8=YES"
-set "VSI_CACHE=TRUE"
-set "VSI_CACHE_SIZE=1000000"
-set "PATH={qgis_bin};{qt5_bin};{gdal_lib};%PATH%"
-"{python_path}" "{runner_script}" %*
-"""
-
-    # 写入临时 .bat 文件
-    bat_dir = os.path.join(tempfile.gettempdir(), "qgis_runner")
-    os.makedirs(bat_dir, exist_ok=True)
-    bat_path = os.path.join(bat_dir, "run_qgis.bat")
-
-    with open(bat_path, "w", encoding="utf-8") as f:
-        f.write(bat_content)
-
-    logger.debug(f"生成 QGIS 包装脚本: {bat_path}")
-    return bat_path
-
-
 def _detect_qgis_root() -> str | None:
     """
     自动检测 QGIS 安装根目录。