From 68372fd1905515c5c8dbb9e3b158241994439e06 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期四, 19 六月 2025 14:18:53 +0800
Subject: [PATCH] 增加生成结果的水深过滤参数

---
 src/main/java/com/se/nsl/service/ResolveService.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index bccb075..9d8cf99 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -201,19 +201,21 @@
         String terrainFile = inPath + File.separator + config.getTerrainFile();
 
         Dataset dsDem = gdal.Open(terrainTif, gdalconstConstants.GA_ReadOnly);
-        ComHelper.Resample(dsDem, null, terrainFile, null, wkt, null, null);
+        ComHelper.cutAndResample(dsDem, null, terrainFile, null, wkt, null, null);
         dsDem.delete();
 
         String landuseFile = inPath + File.separator + config.getLanduseFile();
 
         Dataset dsLanduse = gdal.Open(landuseTif, gdalconstConstants.GA_ReadOnly);
-        ComHelper.Resample(dsLanduse, null, landuseFile, null, wkt, null, null);
+        ComHelper.cutAndResample(dsLanduse, null, landuseFile, null, wkt, null, null);
         dsLanduse.delete();
 
-        String stationFile = inPath + File.separator + "Station.tif";
-        Dataset dsStation = gdal.Open(stationTif, gdalconstConstants.GA_ReadOnly);
-        ComHelper.Resample(dsStation, null, stationFile, null, wkt, null, null);
-        dsStation.delete();
+        if (stationTif != null) {
+            String stationFile = inPath + File.separator + "Station.tif";
+            Dataset dsStation = gdal.Open(stationTif, gdalconstConstants.GA_ReadOnly);
+            ComHelper.cutAndResample(dsStation, null, stationFile, null, wkt, null, null);
+            dsStation.delete();
+        }
     }
 
     public void updateTif(Simu simu, SimuData data2) {
@@ -346,6 +348,7 @@
         String startTime = TimeFormatUtil.formatDate(data.getStartTime());
         ConfigVo vo = new ConfigVo(terrainFile, landuseFile, terrainFile, rainfallFile,
                 saveName, duration, saveFrames, saveMode, startTime);
+        vo.getResult().setSave_filter(config.getSaveFilter());
         String configFile = config.getInPath() + File.separator + data.getInPath() + File.separator + data.getInPath() + ".json";
 //        ComHelper.writeJson(configFile, JSON.toJSONString(vo));
         mapper.writeValue(new File(configFile), vo);

--
Gitblit v1.9.3