From fc98146d74aad6caf4ab95a5932b5a8a355a94a3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 十月 2024 10:17:27 +0800
Subject: [PATCH] 1

---
 src/main/java/com/se/simu/service/ResultService.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index 428d3f6..8e4da70 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -6,6 +6,7 @@
 import com.se.simu.domain.dto.ExtensionDto;
 import com.se.simu.domain.dto.LayerDto;
 import com.se.simu.domain.dto.ResultDto;
+import com.se.simu.domain.po.DataPo;
 import com.se.simu.helper.GdalHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.gdal.gdal.Band;
@@ -48,14 +49,28 @@
                 "D:\\simu\\input\\flows",
                 "D:\\simu\\out",
                 "");
-        process(dto);
+        LayerDto layer = new LayerDto(config.getVer(), 4528, config.getSizes());
+        process(dto, layer);
 
         return "OK";
     }
 
-    public void process(ResultDto dto) throws Exception {
+    public void process(DataPo data) throws Exception {
+        String basePath = config.getInPath() + File.separator + data.getInPath() + File.separator;
+        ResultDto dto = new ResultDto(
+                data.getInPath(),
+                basePath + config.getTerrainFile(),
+                basePath + config.getBuildingFile(),
+                basePath + config.getWaterPath(),
+                basePath + config.getFlowPath(),
+                config.getOutPath(),
+                "");
+        LayerDto layer = new LayerDto(config.getVer(), data.getEpsg(), config.getSizes());
+        process(dto, layer);
+    }
+
+    private void process(ResultDto dto, LayerDto layer) throws Exception {
         try {
-            LayerDto layer = new LayerDto(config.getVer(), 4528, config.getSizes());
 
             copeTerrain(dto, layer);
             copeBuilding(dto, layer);

--
Gitblit v1.9.3