From c4679d4c2bc8250efd48c934455f8c36ecdc65e1 Mon Sep 17 00:00:00 2001
From: hekaiyu <13673834656@163.com>
Date: Fri, 24 Oct 2025 14:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0ncep=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/WeatherPrefixConstants.java      |  1 +
 .../constant/WeatherSuffixConstants.java      |  1 +
 .../constant/enums/WeatherDataTypeEnum.java   |  3 +-
 .../enums/WeatherVariableNameEnum.java        |  7 ++-
 .../properties/SystemStorageProperties.java   |  5 +++
 .../service/impl/WeatherDataServiceImpl.java  | 43 ++++++++++++++++---
 6 files changed, 52 insertions(+), 8 deletions(-)

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 d01267f..a59732b 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
@@ -4,4 +4,5 @@ public class WeatherPrefixConstants {
 
     public static final String PANGU_PREFIX = "panguweather_";
     public static final String CRA40_PREFIX = "CRA40_";
+    public static final String NCEP_PREFIX = "cdas1";
 }
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherSuffixConstants.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherSuffixConstants.java
index 22c1786..13ad22f 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherSuffixConstants.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WeatherSuffixConstants.java
@@ -3,4 +3,5 @@ package org.jeecg.common.constant;
 public class WeatherSuffixConstants {
 
     public static final String CRA40_SUFFIX = "_GLB_0P25_HOUR_V1_0_0";
+    public static final String NCEP_SUFFIX = "pgrbh";
 }
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherDataTypeEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherDataTypeEnum.java
index 2bc4570..618c26b 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherDataTypeEnum.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/WeatherDataTypeEnum.java
@@ -7,7 +7,8 @@ public enum WeatherDataTypeEnum {
 
 
     PANGU(0, "PANGU"),
-    CRA40(1, "CRA40");
+    CRA40(1, "CRA40"),
+    NCEP(2, "NCEP");
 
     private Integer key;
 
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 78a66f6..88be404 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
@@ -15,7 +15,12 @@ public enum WeatherVariableNameEnum {
     CRA40_P(1, 1, "Vertical_velocity_pressure_isobaric"),
     CRA40_H(1, 2, "Relative_humidity_isobaric"),
     CRA40_U(1, 3, "u-component_of_wind_isobaric"),
-    CRA40_V(1, 4, "v-component_of_wind_isobaric");
+    CRA40_V(1, 4, "v-component_of_wind_isobaric"),
+    NCEP_T(2, 0, "Temperature_height_above_ground"),
+    NCEP_P(2, 1, "Pressure_msl"),
+    NCEP_H(2, 2, "Relative_humidity_height_above_ground"),
+    NCEP_U(2, 3, "u-component_of_wind_height_above_ground"),
+    NCEP_V(2, 4, "v-component_of_wind_height_above_ground");
 
     private Integer type;
 
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SystemStorageProperties.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SystemStorageProperties.java
index 3832354..2e1d273 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SystemStorageProperties.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SystemStorageProperties.java
@@ -24,6 +24,11 @@ public class SystemStorageProperties {
      */
     private String cra40;
 
+    /**
+     * NCEP CFSv2数据存储路径
+     */
+    private String ncep;
+
     /**
      * graphcast模型预测数据存储路径
      */
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 150e048..9ccb4b7 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
@@ -77,8 +77,10 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
         try {
             if (WeatherDataTypeEnum.PANGU.getKey() == dataType) {
                 return processWeatherData(weatherType, targetTime, WeatherDataTypeEnum.PANGU);
-            } else {
+            } else if (WeatherDataTypeEnum.CRA40.getKey() == dataType){
                 return processWeatherData(weatherType, targetTime, WeatherDataTypeEnum.CRA40);
+            } else if (WeatherDataTypeEnum.NCEP.getKey() == dataType){
+                return processWeatherData(weatherType, targetTime, WeatherDataTypeEnum.NCEP);
             }
         } catch (JeecgBootException e) {
             throw e;
@@ -86,11 +88,12 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
             log.error("处理天气数据失败", e);
             throw new JeecgBootException("处理天气数据失败", e);
         }
+        throw new JeecgBootException("没有该类型的气象数据！");
     }
 
     /**
-     * 获取时间序列天气数据（兼容PANGU和CRA40两种气象类型）
-     * @param dataType 气象数据类型（PANGU/CRA40）
+     * 获取时间序列天气数据
+     * @param dataType 气象数据类型
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @param longitude 经度
@@ -115,7 +118,7 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
 
         // 获取网格索引
         int[] gridIndex = getGridIndex(latitude, longitude);
-        int hourInterval = 6; // PANGU每小时，CRA40每6小时
+        int hourInterval = 6;
 
         // 循环处理每个时间点的数据
         LocalDateTime currentTime = startTime;
@@ -520,12 +523,18 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
             variables.put("humidity", WeatherVariableNameEnum.PANGU_H.getValue());
             variables.put("windU", WeatherVariableNameEnum.PANGU_U.getValue());
             variables.put("windV", WeatherVariableNameEnum.PANGU_V.getValue());
-        } else {
+        } else if (WeatherDataTypeEnum.CRA40.getKey() == dataType){
             variables.put("temperature", WeatherVariableNameEnum.CRA40_T.getValue());
             variables.put("pressure", WeatherVariableNameEnum.CRA40_P.getValue());
             variables.put("humidity", WeatherVariableNameEnum.CRA40_H.getValue());
             variables.put("windU", WeatherVariableNameEnum.CRA40_U.getValue());
             variables.put("windV", WeatherVariableNameEnum.CRA40_V.getValue());
+        } else if (WeatherDataTypeEnum.NCEP.getKey() == dataType){
+            variables.put("temperature", WeatherVariableNameEnum.NCEP_T.getValue());
+            variables.put("pressure", WeatherVariableNameEnum.NCEP_P.getValue());
+            variables.put("humidity", WeatherVariableNameEnum.NCEP_H.getValue());
+            variables.put("windU", WeatherVariableNameEnum.NCEP_U.getValue());
+            variables.put("windV", WeatherVariableNameEnum.NCEP_V.getValue());
         }
         return variables;
     }
@@ -754,7 +763,7 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
                     .append(targetTime.format(DateTimeFormatter.ofPattern("yyyyMMddHH")))
                     .append(".")
                     .append(WeatherFileSuffixEnum.GRIB.getValue());
-        } else {
+        } else if (WeatherDataTypeEnum.CRA40.equals(dataTypeEnum)) {
             storagePath.append(systemStorageProperties.getCra40())
                     .append(File.separator)
                     .append(WeatherPrefixConstants.CRA40_PREFIX)
@@ -764,10 +773,32 @@ public class WeatherDataServiceImpl extends ServiceImpl<WeatherDataMapper, Weath
                     .append(WeatherSuffixConstants.CRA40_SUFFIX)
                     .append(".")
                     .append(WeatherFileSuffixEnum.GRIB2.getValue());
+        } else if (WeatherDataTypeEnum.NCEP.equals(dataTypeEnum)) {
+            storagePath.append(systemStorageProperties.getNcep())
+                    .append(File.separator)
+                    .append(targetTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")))
+                    .append(".")
+                    .append(WeatherPrefixConstants.NCEP_PREFIX)
+                    .append(".")
+                    .append(minus6HoursAndFormat(targetTime))
+                    .append(".")
+                    .append(WeatherSuffixConstants.NCEP_SUFFIX)
+                    .append(".")
+                    .append(WeatherFileSuffixEnum.GRIB2.getValue());
         }
         return storagePath.toString();
     }
 
+    /**
+     * 减六小时取yyyyMMddHH
+     * @param targetTime
+     * @return
+     */
+    public String minus6HoursAndFormat(LocalDateTime targetTime) {
+        LocalDateTime minus6Hours = targetTime.minusHours(6);
+        return minus6Hours.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+    }
+
     /**
      * 处理结果数据
      */