diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/LatLonSizeConstants.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/LatLonSizeConstants.java index 56a16d3..edf2c54 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/LatLonSizeConstants.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/LatLonSizeConstants.java @@ -4,6 +4,8 @@ public class LatLonSizeConstants { // 网格参数 public static final int LAT_SIZE = 721; // 纬度方向网格数 public static final int LON_SIZE = 1440; // 经度方向网格数 + public static final int LAT_SIZE_181 = 181; // 纬度方向网格数 + public static final int LON_SIZE_360 = 360; // 经度方向网格数 public static final double LAT_START = 90.0; // 纬度起始值(北纬) public static final double LAT_END = -90.0; // 纬度结束值(南纬) public static final double LON_START = 0.0; // 经度起始值 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExecutePyUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExecutePyUtils.java index 62f4e57..9fcad2c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExecutePyUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExecutePyUtils.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeoutException; @Slf4j public class ExecutePyUtils { - private static final int PROCESS_TIMEOUT_SECONDS = 3600; // 30分钟超时 + private static final int PROCESS_TIMEOUT_SECONDS = 36000; /** * 执行Python进程 */ 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 df2c46b..302310c 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 @@ -166,7 +166,7 @@ public class WeatherDataServiceImpl extends ServiceImpl windSpeedList = new ArrayList<>(); // 获取网格索引 - int[] gridIndex = getGridIndex(latitude, longitude); + int[] gridIndex = null; int hourInterval = 6; // 循环处理每个时间点的数据 @@ -175,6 +175,9 @@ public class WeatherDataServiceImpl extends ServiceImpl variables = getVariableNames(dataType); List uValues = new ArrayList<>(); List vValues = new ArrayList<>(); @@ -263,6 +266,9 @@ public class WeatherDataServiceImpl extends ServiceImpl