From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index a07ae5a..dfa9c37 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -177,6 +177,10 @@
List<AttResWithRainfall> attResWithRainfallList = new ArrayList<>();
for (AttResBase attResBase : attResBases) {
+ if (null == attResBase.getCenterLat() || attResBase.getCenterLong() == null) {
+ log.warn("过滤掉经度或者纬度为空的水库，水库名称:{}", attResBase.getName());
+ continue;
+ }
// 横向索引（lonIndex）：(站点的经度 - 网格最小经度) / 每个网格单元的经度跨度
int lonIndex = (int) ((Double.parseDouble(attResBase.getCenterLong()) - lonMin) / lonSpan);
// 纵向索引（latIndex）：(站点的纬度 - 网格最小纬度) / 每个网格单元的纬度跨度
@@ -197,7 +201,7 @@
attResWithRainfall.setFileName(fileName);
attResWithRainfallList.add(attResWithRainfall);
} else {
- log.warn("AttRes {} is out of the grid range. centerLong: {}, centerLat: {}", attResBase.getName(),
+ log.warn("水库 {} 超出栅格范围. 中心点经度: {}, 中心点纬度: {}", attResBase.getName(),
attResBase.getCenterLong(), attResBase.getCenterLat());
}
}
--
Gitblit v1.9.3