From 909c4f9dc4e629fbf974c9cf364d4e92e853bc37 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期三, 07 五月 2025 17:33:19 +0800
Subject: [PATCH] 添加新的配置文件节点
---
src/main/java/com/se/nsl/service/ResolveService.java | 6 ++++--
src/main/java/com/se/nsl/config/PropertiesConfig.java | 20 ++++++++++++++++++++
src/main/resources/application-dev.yml | 3 +++
src/main/java/com/se/nsl/domain/vo/ConfigVo.java | 7 +++++--
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/se/nsl/config/PropertiesConfig.java b/src/main/java/com/se/nsl/config/PropertiesConfig.java
index 86ec0da..48b5b8d 100644
--- a/src/main/java/com/se/nsl/config/PropertiesConfig.java
+++ b/src/main/java/com/se/nsl/config/PropertiesConfig.java
@@ -62,6 +62,8 @@
private String zarr2tifBat;
+ private String createRainfall;
+
private Integer saveFrames;
private List<Integer> sizes;
@@ -83,6 +85,8 @@
private String rainfallTitle;
private String rainfallSite;
+
+ private Integer landuse;
public String getVer() {
return ver;
@@ -383,4 +387,20 @@
public void setRainfallSite(String rainfallSite) {
this.rainfallSite = rainfallSite;
}
+
+ public Integer getLanduse() {
+ return landuse;
+ }
+
+ public void setLanduse(Integer landuse) {
+ this.landuse = landuse;
+ }
+
+ public String getCreateRainfall() {
+ return createRainfall;
+ }
+
+ public void setCreateRainfall(String createRainfall) {
+ this.createRainfall = createRainfall;
+ }
}
diff --git a/src/main/java/com/se/nsl/domain/vo/ConfigVo.java b/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
index 628d7fb..9b843de 100644
--- a/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
+++ b/src/main/java/com/se/nsl/domain/vo/ConfigVo.java
@@ -51,13 +51,16 @@
variable_dt = true;
}
- public ConfigVo(int duration, int frames, String raingage) {
+ public ConfigVo(int duration, int frames, String terrain, String landuse, String station, String raingage) {
this();
this.duration = duration;
this.save_frames = frames;
- this.raingage = raingage;
this.save_interval = this.duration / frames;
+ this.terrain.set(0, terrain); // 鍦板舰楂樼▼鏁版嵁
+ this.landuse.set(0, landuse); // 鍦熷湴鍒╃敤绫诲瀷
+ this.station.set(0, station); // 闆ㄩ噺绔欑储寮�
+ this.raingage = raingage;
}
public List<Object> getTerrain() {
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 67f346b..c521540 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -212,8 +212,10 @@
duration = (int) (Math.abs(data.getRainfalls().get(data.getRainfalls().size() - 1).getTime().getTime() - data.getRainfalls().get(0).getTime().getTime()) / 60);
}
- String rainfallFile = config.getInPath() + File.separator + data.getInPath() + File.separator + "rainfall.dat";
- ConfigVo vo = new ConfigVo(duration, config.getSaveFrames(), rainfallFile);
+ String inPath = config.getInPath() + File.separator + data.getInPath();
+ String terrainFile = (inPath + File.separator + config.getDemFile()).replace("\\", "/");
+ String rainfallFile = (inPath + File.separator + "rainfall.dat").replace("\\", "/");
+ ConfigVo vo = new ConfigVo(duration, config.getSaveFrames(), terrainFile, terrainFile, terrainFile, rainfallFile);
String configFile = config.getInPath() + File.separator + data.getInPath() + File.separator + data.getInPath() + ".json";
ComHelper.writeJson(configFile, JSON.toJSONString(vo));
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 016b1a0..f26a93c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -143,9 +143,12 @@
sww2tifBat: D:\other\simu\uwsolver\sww2tif.bat
uwSolverBat: D:\other\simu\uwsolver\CudaUWSolver.Demo.NoVis.20250430\start.bat
zarr2tifBat: D:\other\simu\uwsolver\zarr2tif1.0\start.bat
+ createRainfall: "C:\Program Files\Python310\python.exe" D:\other\DiZai\zarr\CreatRainfall.py
rainfallTitle: Station Longitude Latitude Year Month Day Hour Minute Intensity
rainfallSite: beijing
saveFrames: 10
+ # 鍦熷湴鍒╃敤锛�1-Cropland,2-Forest,3-Shrub,4-Grassland,5-Water,6-Snow/Ice,7-Barren,8-Impervious,9-Wetland
+ landuse: 2
#sizes: 64,128,256,512,1024,2048,4096
sizes: 1024
# 杈撳嚭鏂囦欢
--
Gitblit v1.9.3