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 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

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();
 

--
Gitblit v1.9.3