From 94bc1777d6005c380278de054a68bfceac92636b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 十月 2024 15:00:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/config/PropertiesConfig.java | 10 +++++-----
src/main/java/com/se/simu/service/SimuService.java | 6 +++---
src/main/java/com/se/simu/service/UwService.java | 26 ++++++++------------------
src/main/resources/application.yml | 2 +-
src/main/java/com/se/simu/controller/SimuController.java | 10 ++++++----
5 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/se/simu/config/PropertiesConfig.java b/src/main/java/com/se/simu/config/PropertiesConfig.java
index a584e83..e951a2c 100644
--- a/src/main/java/com/se/simu/config/PropertiesConfig.java
+++ b/src/main/java/com/se/simu/config/PropertiesConfig.java
@@ -62,7 +62,7 @@
private String solverBat;
- private String keyFrameBat;
+ private String sww2tifBat;
private List<Integer> sizes;
@@ -298,11 +298,11 @@
this.flowPath = flowPath;
}
- public String getKeyFrameBat() {
- return keyFrameBat;
+ public String getSww2tifBat() {
+ return sww2tifBat;
}
- public void setKeyFrameBat(String keyFrameBat) {
- this.keyFrameBat = keyFrameBat;
+ public void setSww2tifBat(String sww2tifBat) {
+ this.sww2tifBat = sww2tifBat;
}
}
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index cff90ca..0d3bf9d 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -170,14 +170,16 @@
}
}
- @ApiOperation(value = "testKeyFrame *")
- @GetMapping("/testKeyFrame")
- public R<Object> testKeyFrame() {
+ @ApiOperation(value = "testSww2Tif *")
+ @GetMapping("/testSww2Tif")
+ public R<Object> testSww2Tif() {
try {
DataPo data = new DataPo();
+ data.setEpsg(4548);
data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
- Object rs = uwService.getKeyFrame(data);
+ Object rs = uwService.copeDrainFiles(data);
return success(rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index 65ef931..4a1b312 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -207,12 +207,12 @@
//uwService.copeWaterFiles();
update(simu, 8, null);
- uwService.copeDrainFiles();
+ uwService.copeDrainFiles(data);
update(simu, 9, null);
- //resultService.process(data);
+ resultService.process(data);
- //update(simu, 10, "瀹屾垚");
+ update(simu, 10, "瀹屾垚");
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
update(simu, -10, ex.getMessage());
diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java
index 634489b..d4a9c44 100644
--- a/src/main/java/com/se/simu/service/UwService.java
+++ b/src/main/java/com/se/simu/service/UwService.java
@@ -124,27 +124,17 @@
}
}
- public String getKeyFrame(DataPo data) throws Exception {
- String cmd = config.getKeyFrameBat() + " " + config.getInPath() + File.separator + data.getInPath() + File.separator + ".save" + File.separator + data.getInPath() + ".sww";
-
- String str = exec(cmd);
- if (StringHelper.isEmpty(str) || !str.contains("[")) {
- throw new Exception("鐢熸垚鍏抽敭甯у嚭閿�");
- }
-
- String rs = str.split("\\[", 2)[1].replace("]", "").replace(" ", "");
- if (StringHelper.isEmpty(rs)) {
- throw new Exception("鍏抽敭甯т负绌�");
- }
-
- return rs;
- }
-
public void copeWaterFiles() {
//
}
- public void copeDrainFiles() {
- //
+ public String copeDrainFiles(DataPo data) throws Exception {
+ String time = StringHelper.YMDHMS_FORMAT.format(data.getStartTime());
+ String inPath = config.getInPath() + File.separator + data.getInPath();
+ String sww = inPath + File.separator + ".save" + File.separator + data.getInPath() + ".sww";
+
+ String cmd = config.getSww2tifBat() + " " + sww + " '" + time + "' " + data.getEpsg() + " " + inPath;
+
+ return exec(cmd);
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65b9f4f..b5f4c13 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -122,7 +122,7 @@
# 娴侀噺鍗曚綅锛孡PS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)
flowUnits: CMS
solverBat: D:\simu\uwsolver\run_solver.bat
- keyFrameBat: D:\simu\uwsolver\keyFrame.bat
+ sww2tifBat: D:\simu\uwsolver\sww2tif.bat
sizes: 64,128,256,512,1024,2048
# 杈撳嚭鏂囦欢
terrainFile: terrain.tif
--
Gitblit v1.9.3