From 2913a606f28db4c684dfa3f30652ebd546a93306 Mon Sep 17 00:00:00 2001
From: hekaiyu <13673834656@163.com>
Date: Wed, 12 Nov 2025 14:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0fnl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/WeatherPrefixConstants.java      |  1 +
 .../enums/WeatherVariableNameEnum.java        |  5 +++++
 .../service/impl/WeatherDataServiceImpl.java  | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherPrefixConstants.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherPrefixConstants.java
index f2100a7..b805b22 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherPrefixConstants.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherPrefixConstants.java
@@ -6,4 +6,5 @@ public class WeatherPrefixConstants {
     public static final String CRA40_PREFIX = "CRA40_";
     public static final String NCEP_PREFIX = "cdas1";
     public static final String T1H_PREFIX = "T1H_";
+    public static final String FNL_PREFIX = "fnl_";
 }
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherVariableNameEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherVariableNameEnum.java
index 9fc30a2..f08e2f9 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherVariableNameEnum.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherVariableNameEnum.java
@@ -21,6 +21,11 @@ public enum WeatherVariableNameEnum {
     NCEP_H(WeatherDataSourceEnum.NCEP.getKey(), 2, "Relative_humidity_height_above_ground"),
     NCEP_U(WeatherDataSourceEnum.NCEP.getKey(), 3, "u-component_of_wind_height_above_ground"),
     NCEP_V(WeatherDataSourceEnum.NCEP.getKey(), 4, "v-component_of_wind_height_above_ground"),
+    FNL_T(WeatherDataSourceEnum.FNL.getKey(), 0, "Temperature_height_above_ground"),
+    FNL_P(WeatherDataSourceEnum.FNL.getKey(), 1, "Pressure_height_above_ground"),
+    FNL_H(WeatherDataSourceEnum.FNL.getKey(), 2, "Relative_humidity_height_above_ground"),
+    FNL_U(WeatherDataSourceEnum.FNL.getKey(), 3, "u-component_of_wind_height_above_ground"),
+    FNL_V(WeatherDataSourceEnum.FNL.getKey(), 4, "v-component_of_wind_height_above_ground"),
     T1H_T(WeatherDataSourceEnum.T1H.getKey(), 0, "t2mz"),
     T1H_P(WeatherDataSourceEnum.T1H.getKey(), 1, "psz"),
     T1H_H(WeatherDataSourceEnum.T1H.getKey(), 2, "rh2m"),
diff --git a/jeecg-module-weather/src/main/java/org/jeecg/service/impl/WeatherDataServiceImpl.java b/jeecg-module-weather/src/main/java/org/jeecg/service/impl/WeatherDataServiceImpl.java
index aed44f0..ed1802e 100644
--- a/jeecg-module-weather/src/main/java/org/jeecg/service/impl/WeatherDataServiceImpl.java
+++ b/jeecg-module-weather/src/main/java/org/jeecg/service/impl/WeatherDataServiceImpl.java
@@ -82,6 +82,8 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.CRA40);
             } else if (WeatherDataSourceEnum.NCEP.getKey() == dataType){
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.NCEP);
+            } else if (WeatherDataSourceEnum.FNL.getKey() == dataType){
+                return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.FNL);
             } else if (WeatherDataSourceEnum.T1H.getKey() == dataType){
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.T1H);
             }
@@ -113,6 +115,8 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.CRA40);
             } else if (WeatherDataSourceEnum.NCEP.getKey() == dataType){
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.NCEP);
+            } else if (WeatherDataSourceEnum.FNL.getKey() == dataType){
+                return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.FNL);
             } else if (WeatherDataSourceEnum.T1H.getKey() == dataType){
                 return processWeatherData(weatherType, targetTime, WeatherDataSourceEnum.T1H);
             }
@@ -621,6 +625,8 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
             storagePath.append(this.systemStorageProperties.getCra40());
         } else if (WeatherDataSourceEnum.NCEP.getKey().equals(dataSource)) {
             storagePath.append(this.systemStorageProperties.getNcep());
+        } else if (WeatherDataSourceEnum.FNL.getKey().equals(dataSource)) {
+            storagePath.append(this.systemStorageProperties.getFnl());
         } else if (WeatherDataSourceEnum.T1H.getKey().equals(dataSource)) {
             storagePath.append(this.systemStorageProperties.getT1h());
         }
@@ -718,6 +724,12 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
             variables.put("humidity", WeatherVariableNameEnum.NCEP_H.getValue());
             variables.put("windU", WeatherVariableNameEnum.NCEP_U.getValue());
             variables.put("windV", WeatherVariableNameEnum.NCEP_V.getValue());
+        } else if (WeatherDataSourceEnum.FNL.getKey() == dataType){
+            variables.put("temperature", WeatherVariableNameEnum.FNL_T.getValue());
+            variables.put("pressure", WeatherVariableNameEnum.FNL_P.getValue());
+            variables.put("humidity", WeatherVariableNameEnum.FNL_H.getValue());
+            variables.put("windU", WeatherVariableNameEnum.FNL_U.getValue());
+            variables.put("windV", WeatherVariableNameEnum.FNL_V.getValue());
         } else if (WeatherDataSourceEnum.T1H.getKey() == dataType){
             variables.put("temperature", WeatherVariableNameEnum.T1H_T.getValue());
             variables.put("pressure", WeatherVariableNameEnum.T1H_P.getValue());
@@ -921,6 +933,13 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
                     .append(WeatherSuffixConstants.NCEP_SUFFIX)
                     .append(".")
                     .append(WeatherFileSuffixEnum.GRB2.getValue());
+        } else if (WeatherDataSourceEnum.FNL.equals(dataTypeEnum)) {
+            storagePath.append(systemStorageProperties.getFnl())
+                    .append(File.separator)
+                    .append(WeatherPrefixConstants.FNL_PREFIX)
+                    .append(targetTime.format(DateTimeFormatter.ofPattern("yyyyMMdd_HH_mm")))
+                    .append(".")
+                    .append(WeatherFileSuffixEnum.GRIB2.getValue());
         } else if (WeatherDataSourceEnum.T1H.equals(dataTypeEnum)) {
             storagePath.append(systemStorageProperties.getT1h())
                     .append(File.separator)