From 26a04387f9aa299c6e6af5476b195b307f068743 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 十月 2024 16:32:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/service/UwService.java | 22 ++++++++++++++++------
src/main/resources/application.yml | 11 +++++++----
src/main/java/com/se/simu/controller/SimuController.java | 15 +++++++++++++++
3 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index e36c989..b270954 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -155,6 +155,21 @@
return System.currentTimeMillis();
}
+ @ApiOperation(value = "testCallExe *")
+ @GetMapping("/testCallExe")
+ public R<Object> testCallExe() {
+ try {
+ DataPo data = new DataPo();
+ data.setInPath("20241010095328");
+
+ String str = uwService.callExe(data);
+
+ return success(str);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
@ApiOperation(value = "testResuslt *")
@GetMapping("/testResuslt")
public R<Object> testResuslt() {
diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java
index 52f68a2..ff3ecfc 100644
--- a/src/main/java/com/se/simu/service/UwService.java
+++ b/src/main/java/com/se/simu/service/UwService.java
@@ -26,6 +26,16 @@
@Resource
PropertiesConfig config;
+ static Rainfall _rainfall = null;
+
+ public static Rainfall getTainfall() throws Exception {
+ if (null == _rainfall) {
+ _rainfall = new Rainfall();
+ }
+
+ return _rainfall;
+ }
+
/**
* 鍒涘缓闄嶉洦鏂囦欢
* <p>
@@ -40,7 +50,7 @@
//MWCharArray station = new MWCharArray(config.getRainStation());
//MWCharArray time = new MWCharArray(startTime);
- Rainfall rainfall = new Rainfall();
+ Rainfall rainfall = getTainfall();
//rainfall('D:\simu\in\RainGage.dat','Tongzhou','2024-09-29 00:00:00',60,0.5,10)
Object[] rs = rainfall.rainfall(filePath, config.getRainStation(), startTime,
Double.valueOf(data.getDuration()), 0.5, config.getRainPeriod());
@@ -80,17 +90,17 @@
nr = new BufferedReader(new InputStreamReader(process.getInputStream(), "GBK"));
er = new BufferedReader(new InputStreamReader(process.getErrorStream(), "GBK"));
- String errorLine;
- while ((errorLine = er.readLine()) != null) {
- log.warn(errorLine);
- }
-
String line;
StringBuilder sb = new StringBuilder();
while ((line = nr.readLine()) != null) {
sb.append(line);
}
+ String errorLine;
+ while ((errorLine = er.readLine()) != null) {
+ log.warn(errorLine);
+ }
+
// 绛夊緟绋嬪簭鎵ц缁撴潫骞惰緭鍑虹姸鎬�
int exitCode = process.waitFor();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d15e7c3..090c255 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -98,10 +98,13 @@
#inPath: D:\simu\in
inPath: D:\simu\uwsolver
outPath: D:\simu\out
- host: http://106.120.22.26:8013/
- user: WUWEIWEI
- pwd: WUWEIWEI
- dbName: 閫氬窞姘村埄浠跨湡
+ host: http://106.120.22.26:8024/
+ user: admin
+ pwd: admin
+# host: http://106.120.22.26:8013/
+# user: WUWEIWEI
+# pwd: WUWEIWEI
+ dbName: 閫氬窞姘村埄
pageSize: 2000
layerNames: 绠＄偣,绠＄嚎,寤虹瓚鐗�
shpNames:
--
Gitblit v1.9.3