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