添加栅格生成逻辑

app/core/launcher.py

@@ -8,11 +8,13 @@ from app.core.env_checker import check_environment
 from app.core.venv_manager import check_virtualenv
 from app.core.dependency_manager import check_dependencies
 from app.utils.logger import get_logger
+from app.utils.thread_pool_manager import block_main_thread, thread_pool_manager
+from app.core.rainfall_manager import rainfall_manager
 
 
 class AppLauncher:
     """应用启动器"""
-    
+
     def __init__(self, project_root: Path):
         """
         初始化启动器
@@ -22,32 +24,39 @@ class AppLauncher:
         """
         self.project_root = project_root
         self.logger = get_logger()
-    
+
     def run(self):
         """执行完整的启动流程"""
         try:
             # 检查系统和Python版本
             if not check_environment():
                 sys.exit(1)
-            
+
             # 检查虚拟环境
             check_virtualenv(self.project_root)
-            
+
             # 检查安装依赖
             check_dependencies(self.project_root)
-            
+
             # 启动应用
             print("\n" + "=" * 50)
             print("✓ 所有检查通过，准备启动应用...")
             print("=" * 50)
             self.logger.info("系统环境检查通过，开始执行主程序...")
-            self.start()
-            
+            start()
+
         except Exception as e:
             self.logger.error(f"启动失败: {e}")
             sys.exit(1)
 
-    def start(self):
-        """启动应用"""
-        self.logger.info("启动应用...")
-        print("启动成功！")
+
+def start():
+    """启动应用服务"""
+    logger = get_logger()
+    
+    # 启动降雨站点监测
+    logger.info("启动降雨站点监测服务...")
+    rainfall_manager.monitoring_rainfall_station_id('2025-08-20 12:00:00')
+    
+    # 阻塞主线程，防止程序立即退出
+    block_main_thread()

app/core/rainfall_manager.py

@@ -0,0 +1,120 @@
+"""
+降雨管理器
+负责降雨监测调度和任务编排
+"""
+import time
+from datetime import datetime
+from typing import Optional
+
+from app.utils import thread_pool_manager
+from app.utils.logger import get_logger
+from app.repositories.rainfall_repository import rainfall_repository
+from app.services.rainfall_grid_service import rainfall_grid_service
+
+
+class RainfallManager:
+    """降雨管理器 - 负责监测调度"""
+    
+    def __init__(self):
+        """初始化降雨管理器"""
+        self.logger = get_logger()
+        self.last_max_id = None  # 记录上次查询的最大ID
+    
+    def monitoring_rainfall_station_id(self, query_time: Optional[datetime] = None):
+        """
+        启动监测线程，定期检查数据库中最大ID是否改变
+        
+        Args:
+            query_time: 查询时间，默认为当前时间
+        """
+        if query_time is None:
+            query_time = datetime.now()
+        
+        self.logger.info(f"启动降雨站点监测，查询时间: {query_time}")
+        
+        # 提交监测任务到线程池
+        thread_pool_manager.submit_task(
+            self._monitoring_loop,
+            query_time,
+            task_name="降雨站点ID监测"
+        )
+    
+    def _monitoring_loop(self, initial_query_time: datetime):
+        """
+        监测循环，定期检查最大ID是否改变
+        
+        Args:
+            initial_query_time: 初始查询时间
+        """
+        query_time = initial_query_time
+        
+        while True:
+            try:
+                # 查询当前时间窗口内的最大ID
+                max_id = rainfall_repository.get_max_rainfall_id(query_time)
+                
+                # 如果ID为空（刚启动）或者改变，则生成降雨栅格
+                if self.last_max_id is None or max_id != self.last_max_id:
+                    self.logger.info(f"检测到数据更新，旧ID: {self.last_max_id}, 新ID: {max_id}")
+                    
+                    # 提交栅格生成任务
+                    thread_pool_manager.submit_task(
+                        self._generate_rainfall_grid_task,
+                        query_time,
+                        max_id,
+                        task_name=f"降雨栅格生成_{max_id}"
+                    )
+                    
+                    # 更新最后记录的ID
+                    self.last_max_id = max_id
+                
+                # 等待一段时间后再次检查（例如每5分钟）
+                time.sleep(300)
+                
+                # 更新查询时间为当前时间
+                query_time = datetime.now()
+                
+            except Exception as e:
+                self.logger.error(f"监测循环出错: {e}", exc_info=True)
+                time.sleep(60)  # 出错后等待1分钟再继续
+    
+    def _generate_rainfall_grid_task(self, query_time: datetime, max_id: int):
+        """
+        生成降雨栅格的任务函数
+        
+        Args:
+            query_time: 查询时间
+            max_id: 最大ID
+        """
+        try:
+            self.logger.info(f"开始生成降雨栅格，查询时间: {query_time}, ID: {max_id}")
+            
+            # 1. 查询雨量站点数据
+            station_data = rainfall_repository.get_rainfall_stations_data(query_time)
+            
+            if not station_data:
+                self.logger.warning(f"未查询到降雨站点数据，时间: {query_time}")
+                return
+            
+            self.logger.info(f"查询到 {len(station_data)} 个站点数据")
+            
+            # 2. 执行插值算法（已包含边缘优化）
+            grid_data = rainfall_grid_service.interpolate_rainfall(station_data)
+            
+            # 3. 生成PNG图片
+            png_path = rainfall_grid_service.save_rainfall_grid_png(grid_data, max_id)
+            
+            if png_path:
+                # 5. 存储信息到Redis
+                rainfall_grid_service.store_to_redis(png_path, max_id, query_time, station_data)
+                
+                self.logger.info(f"降雨栅格生成完成，路径: {png_path}")
+            else:
+                self.logger.error("降雨栅格生成失败")
+                
+        except Exception as e:
+            self.logger.error(f"生成降雨栅格任务出错: {e}", exc_info=True)
+
+
+# 创建全局实例
+rainfall_manager = RainfallManager()