From 59c16d2a5b1d46e5ed88e43a2065ec39fe649bcf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 30 九月 2024 11:31:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/config/PropertiesConfig.java | 20 ++++++++++++++++++++
src/main/java/com/se/simu/service/UwService.java | 8 ++++++--
src/main/resources/application.yml | 2 ++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/se/simu/config/PropertiesConfig.java b/src/main/java/com/se/simu/config/PropertiesConfig.java
index 060a43c..e774602 100644
--- a/src/main/java/com/se/simu/config/PropertiesConfig.java
+++ b/src/main/java/com/se/simu/config/PropertiesConfig.java
@@ -54,6 +54,10 @@
private String raingage;
+ private String rainStation;
+
+ private Integer rainPeriod;
+
private String flowUnits;
private String solverBat;
@@ -225,4 +229,20 @@
public void setSolverBat(String solverBat) {
this.solverBat = solverBat;
}
+
+ public String getRainStation() {
+ return rainStation;
+ }
+
+ public void setRainStation(String rainStation) {
+ this.rainStation = rainStation;
+ }
+
+ public Integer getRainPeriod() {
+ return rainPeriod;
+ }
+
+ public void setRainPeriod(Integer rainPeriod) {
+ this.rainPeriod = rainPeriod;
+ }
}
diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java
index de946bc..2248c22 100644
--- a/src/main/java/com/se/simu/service/UwService.java
+++ b/src/main/java/com/se/simu/service/UwService.java
@@ -4,6 +4,7 @@
import com.se.simu.config.PropertiesConfig;
import com.se.simu.domain.dto.ConfigDto;
import com.se.simu.domain.po.DataPo;
+import com.se.simu.helper.StringHelper;
import com.se.simu.helper.WebHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,9 +26,12 @@
@Resource
PropertiesConfig config;
- public void createRainFile() throws Exception {
+ public void createRainFile(DataPo data) throws Exception {
+ String filePath = config.getInPath() + File.separator + data.getInPath() + File.separator + config.getRaingage();
+ String startTime = StringHelper.YMDHMS_FORMAT.format(data.getStartTime());
+
Rainfall rainfall = new Rainfall();
- rainfall.rainfall("D:/simu/in/RainGage.dat", "Tongzhou", "2024-09-29 00:00:00", 60, 0.5, 10);
+ rainfall.rainfall(filePath, config.getRainStation(), startTime, data.getDuration(), 0.5, config.getRainPeriod());
}
public void createConfig(DataPo data) throws IOException {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 892c69e..7679885 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -117,6 +117,8 @@
barrierName: barrier.shp
sysFields: _ext_attr,_meta_id,_attach_files,_x,_y,_z,_is_latest,_data_type,operatetime,operator,groupid,id,shape_length,shape_area
raingage: RainGage.dat
+ rainStation: Tongzhou
+ rainPeriod: 10
# 娴侀噺鍗曚綅锛孡PS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)
flowUnits: CMS
solverBat: D:\simu\uwsolver\run_solver.bat
--
Gitblit v1.9.3