From 59c5cf61a2ba9b6083e2beb9f4a3035bcba76f93 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期四, 08 五月 2025 09:58:53 +0800
Subject: [PATCH] 开发生成降雨文件功能
---
src/main/java/com/se/nsl/controller/TestController.java | 8 ++++++++
src/main/java/com/se/nsl/service/ResolveService.java | 7 +++++++
src/main/resources/application-dev.yml | 7 ++++---
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/TestController.java b/src/main/java/com/se/nsl/controller/TestController.java
index 876f6f1..192fefc 100644
--- a/src/main/java/com/se/nsl/controller/TestController.java
+++ b/src/main/java/com/se/nsl/controller/TestController.java
@@ -65,6 +65,9 @@
@Resource
PropertiesConfig config;
+ @Resource
+ ResolveService resolveService;
+
@ApiOperation(value = "01.insertRegion <")
@GetMapping("/insertRegion")
@ApiImplicitParams({
@@ -311,6 +314,11 @@
@ApiOperation(value = "10.褰撳墠鏃堕棿 *")
@GetMapping("/getTime")
public Object getTime() {
+ String rs = resolveService.createRainfallCsv("D:\\360\\zt.csv", "姝ｆ�佸垎甯�", 100, 10, 1);
+ rs = resolveService.createRainfallCsv("D:\\360\\pj.csv", "骞冲潎鍒嗗竷", 100, 10, 1);
+ rs = resolveService.createRainfallCsv("D:\\360\\bdpj.csv", "娉㈠姩骞冲潎鍒嗗竷", 100, 10, 1);
+ rs = resolveService.createRainfallCsv("D:\\360\\cxss.csv", "鎸佺画涓婂崌", 100, 10, 1);
+
return (Object) System.currentTimeMillis();
}
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index c521540..1234ecf 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -293,4 +293,11 @@
file.delete();
}
}
+
+ public String createRainfallCsv(String csvPath, String type, double total, double intensity, int hours) {
+ // python 鑴氭湰鍚�.py <鍙傛暟1-csv鏂囦欢鍚�> <鍙傛暟2-闄嶉洦妯″紡:姝ｆ�佸垎甯億骞冲潎鍒嗗竷|娉㈠姩骞冲潎鍒嗗竷|鎸佺画涓婂崌> <鍙傛暟3-闄嶉洦鎬婚噺> <鍙傛暟4-鏈�澶ч洦寮�> <鍙傛暟5-闄嶉洦鏃堕棿(鍒嗛挓)>
+ String cmd = String.format("%s \"%s\" \"%s\" %f %f %d", config.getCreateRainfall(), csvPath, type, total, intensity, hours * 60);
+
+ return callBat(cmd);
+ }
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f26a93c..299141b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -141,9 +141,10 @@
flowUnits: CMS
solverBat: D:\other\simu\uwsolver\run_solver.bat
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
+ uwSolverBat: D:\other\simu\CudaUWSolver.Demo.NoVis.20250430\start.bat
+ zarr2tifBat: D:\other\simu\zarr2tif1.0\start.bat
+ #zarr2tifBat: D:\other\simu\zarr2tif-2.0-mkl\start.bat
+ createRainfall: '"C:\Program Files\Python310\python.exe" D:\terrait\NslServer\data\CreatRainfall.py'
rainfallTitle: Station Longitude Latitude Year Month Day Hour Minute Intensity
rainfallSite: beijing
saveFrames: 10
--
Gitblit v1.9.3