From 3570bc18d5daed8079dd67891062ad8585a4e696 Mon Sep 17 00:00:00 2001
From: zhangk <zhangk@gisuni.com>
Date: Sat, 22 Jun 2024 19:20:44 +0800
Subject: [PATCH] 修改监测水库降雨模型
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 6 +++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java | 8 ++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java
index 7c6e899..103ef92 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/StResRainfall.java
@@ -1,12 +1,15 @@
package cn.gistack.sm.sjztmd.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("\"st_res_rainfall\"")
@@ -19,8 +22,9 @@
* id
*/
@ApiModelProperty(value = "id")
- @TableField("\"id\"")
+ @TableId(value = "\"id\"",type = IdType.NONE)
private String id;
+
/**
* 水库编码
@@ -41,7 +45,7 @@
*/
@ApiModelProperty(value = "入库时间")
@TableField("\"create_time\"")
- private Long createTime;
+ private Date createTime;
/**
* 预报的时段
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());
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
index 9d31569..0e25681 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -630,7 +630,7 @@
stResRainfall.setDrp(attResWithRainfall.getRainfall());
stResRainfall.setFileName(attResWithRainfall.getFileName());
stResRainfall.setDayIndex(dayIndex);
- stResRainfall.setCreateTime(System.currentTimeMillis());
+ stResRainfall.setCreateTime(new Date());
stResRainfalls.add(stResRainfall);
}
}
--
Gitblit v1.9.3