From a127ddfeba8328e2b35d3c7395780b4eb1c185b6 Mon Sep 17 00:00:00 2001
From: yarnom <admin@yarnom.com>
Date: Wed, 24 Sep 2025 10:50:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B5=B7=E7=8F=A0?=
 =?UTF-8?q?=E5=92=8C=E7=95=AA=E7=A6=BA=E6=B0=94=E8=B1=A1=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/server/gin.go         | 24 ++++++++++++++++++++++++
 templates/_header.html         |  2 ++
 templates/radar_guangzhou.html | 20 +++++++++++++++++---
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/internal/server/gin.go b/internal/server/gin.go
index 9fc19a4..5ba03f0 100644
--- a/internal/server/gin.go
+++ b/internal/server/gin.go
@@ -31,6 +31,8 @@ func StartGinServer() error {
 	r.GET("/", indexHandler)
 	r.GET("/radar/nanning", radarNanningHandler)
 	r.GET("/radar/guangzhou", radarGuangzhouHandler)
+	r.GET("/radar/panyu", radarPanyuHandler)
+	r.GET("/radar/haizhu", radarHaizhuHandler)
 
 	// API路由组
 	api := r.Group("/api")
@@ -90,6 +92,28 @@ func radarGuangzhouHandler(c *gin.Context) {
 	c.HTML(http.StatusOK, "radar_guangzhou.html", data)
 }
 
+// radarHaizhuHandler 海珠雷达站占位页
+func radarHaizhuHandler(c *gin.Context) {
+	data := types.PageData{
+		Title:         "海珠雷达站",
+		ServerTime:    time.Now().Format("2006-01-02 15:04:05"),
+		OnlineDevices: database.GetOnlineDevicesCount(database.GetDB()),
+		TiandituKey:   "0c260b8a094a4e0bc507808812cefdac",
+	}
+	c.HTML(http.StatusOK, "radar_haizhu.html", data)
+}
+
+// radarPanyuHandler 番禺雷达站占位页
+func radarPanyuHandler(c *gin.Context) {
+	data := types.PageData{
+		Title:         "番禺雷达站",
+		ServerTime:    time.Now().Format("2006-01-02 15:04:05"),
+		OnlineDevices: database.GetOnlineDevicesCount(database.GetDB()),
+		TiandituKey:   "0c260b8a094a4e0bc507808812cefdac",
+	}
+	c.HTML(http.StatusOK, "radar_panyu.html", data)
+}
+
 // systemStatusHandler 处理系统状态API请求
 func systemStatusHandler(c *gin.Context) {
 	status := types.SystemStatus{
diff --git a/templates/_header.html b/templates/_header.html
index 60aef2b..0fa79cf 100644
--- a/templates/_header.html
+++ b/templates/_header.html
@@ -6,6 +6,8 @@
             <a href="/" class="text-blue-600 hover:text-blue-700">首页</a>
             <a href="/radar/nanning" class="text-blue-600 hover:text-blue-700">南宁雷达站</a>
             <a href="/radar/guangzhou" class="text-blue-600 hover:text-blue-700">广州雷达站</a>
+            <a href="/radar/panyu" class="text-blue-600 hover:text-blue-700">番禺雷达站</a>
+            <a href="/radar/haizhu" class="text-blue-600 hover:text-blue-700">海珠雷达站</a>
         </nav>
     </div>
     <style>
diff --git a/templates/radar_guangzhou.html b/templates/radar_guangzhou.html
index e3fe1a6..2c83c66 100644
--- a/templates/radar_guangzhou.html
+++ b/templates/radar_guangzhou.html
@@ -222,14 +222,28 @@
       const base = forcedDt ? new Date(forcedDt.replace(/-/g,'/')) : new Date(t.dt.replace(/-/g,'/'));
       // 记录本次瓦片时间供 ETA 使用
       gTileDT = base;
-      const ceil10=new Date(base); const m=base.getMinutes(); const up=(Math.floor(m/10)*10+10)%60; ceil10.setMinutes(up,0,0); if(up===0){ ceil10.setHours(base.getHours()+1); }
-      const pad=(n)=>String(n).padStart(2,'0'); const dtStr=`${ceil10.getFullYear()}-${pad(ceil10.getMonth()+1)}-${pad(ceil10.getDate())} ${pad(ceil10.getHours())}:${pad(ceil10.getMinutes())}:00`;
-      await loadRealtimeAt(dtStr);
+      await fetchRealtimeWithFallback(base);
       maybeCalcSector();
       maybePlotSquare();
     }catch(e){ await loadRealtimeLatest(); maybeCalcSector(); maybePlotSquare(); }
   }
 
+  async function fetchRealtimeWithFallback(base){
+    const pad=(n)=>String(n).padStart(2,'0');
+    // 尝试取下一10分钟整（和雷达瓦片时间对齐）
+    const ceil10=new Date(base); const m=base.getMinutes(); const up=(Math.floor(m/10)*10+10)%60; ceil10.setMinutes(up,0,0); if(up===0){ ceil10.setHours(base.getHours()+1); }
+    let dtStr=`${ceil10.getFullYear()}-${pad(ceil10.getMonth()+1)}-${pad(ceil10.getDate())} ${pad(ceil10.getHours())}:${pad(ceil10.getMinutes())}:00`;
+    let res=await fetch(`/api/radar/weather_at?alias=${encodeURIComponent(ST_ALIAS)}&dt=${encodeURIComponent(dtStr)}`);
+    if(res.ok){ const r=await res.json(); fillRealtime(r); return; }
+    // 若没有10分钟数据，退回到当前小时的整点
+    const hour0=new Date(base); hour0.setMinutes(0,0,0);
+    dtStr=`${hour0.getFullYear()}-${pad(hour0.getMonth()+1)}-${pad(hour0.getDate())} ${pad(hour0.getHours())}:00:00`;
+    res=await fetch(`/api/radar/weather_at?alias=${encodeURIComponent(ST_ALIAS)}&dt=${encodeURIComponent(dtStr)}`);
+    if(res.ok){ const r=await res.json(); fillRealtime(r); return; }
+    // 最后退回最新
+    await loadRealtimeLatest();
+  }
+
   async function loadRealtimeLatest(){
     const res=await fetch(`/api/radar/weather_latest?alias=${encodeURIComponent(ST_ALIAS)}`);
     if(!res.ok) throw new Error('加载实时气象失败');