From 3417cf014a65765e02696c1d121ce58b2b4a8aed Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 四月 2025 15:55:36 +0800
Subject: [PATCH] 修改pom.xml

---
 src/main/java/com/se/simu/service/ResultService.java |  265 ++++++++--------------------------------------------
 1 files changed, 43 insertions(+), 222 deletions(-)

diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index abb97ea..a63cfc6 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -7,6 +7,7 @@
 import com.se.simu.domain.po.DataPo;
 import com.se.simu.domain.po.PondingPo;
 import com.se.simu.domain.vo.BuildingDepthVo;
+import com.se.simu.helper.ComHelper;
 import com.se.simu.helper.GdalHelper;
 import com.se.simu.helper.ShpHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +21,6 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
@@ -51,6 +51,7 @@
                 basePath + config.getBuildingFile(),
                 basePath + config.getWaterPath(),
                 basePath + config.getFlowPath(),
+                config.getInPath(),
                 config.getOutPath(),
                 data.getEpsg());
         LayerDto layer = new LayerDto(config.getVer(), data.getEpsg(), config.getSizes());
@@ -91,10 +92,10 @@
     private void setTerrainInfo(Dataset ds, LayerDto layer) {
         Geometry minPoint = GdalHelper.getMinPoint(ds);
         Geometry maxPoint = GdalHelper.getMaxPoint(ds);
-        double minx = getMinVal(minPoint.GetX(0), 10000000);
-        double miny = getMinVal(minPoint.GetY(0), 10000000);
-        double maxx = getMaxVal(maxPoint.GetX(0) + MAX_X_OFFSET, 10000000);
-        double maxy = getMaxVal(maxPoint.GetY(0), 10000000);
+        double minx = ComHelper.getMinVal(minPoint.GetX(0), 10000000);
+        double miny = ComHelper.getMinVal(minPoint.GetY(0), 10000000);
+        double maxx = ComHelper.getMaxVal(maxPoint.GetX(0) + MAX_X_OFFSET, 10000000);
+        double maxy = ComHelper.getMaxVal(maxPoint.GetY(0), 10000000);
         //layer.setExtension(new ExtensionDto(minx, miny, maxx, maxy, Double.MAX_VALUE, Double.MIN_VALUE));
 
         Band band = ds.GetRasterBand(1);
@@ -104,14 +105,6 @@
         layer.setExtension(new ExtensionDto(minx, miny, maxx, maxy, mm[0], mm[1]));
     }
 
-    private double getMinVal(double val, double radix) {
-        return ((long) Math.floor(val * radix)) / radix;
-    }
-
-    private double getMaxVal(double val, double radix) {
-        return ((long) Math.ceil(val * radix)) / radix;
-    }
-
     private void createTerrainPng(ResultDto dto, Dataset ds, LayerDto layer) {
         String terrainPath = dto.getOutPath() + File.separator + "terrain";
         File f = new File(terrainPath);
@@ -119,38 +112,12 @@
 
         for (int[] sizes : layer.getTerrain().getSize()) {
             String tif = dto.getTemp() + File.separator + "terrain_" + sizes[0] + "_" + sizes[1] + ".tif";
-            Resample(ds, tif, sizes[0], sizes[1], layer);
+            ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
             if (!new File(tif).exists()) continue;
 
             String png = terrainPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
             Terrain2Png(layer, tif, png, sizes[0], sizes[1]);
         }
-    }
-
-    private void Resample(Dataset ds, String dest, int width, int height, LayerDto layer) {
-        Vector<String> vector = new Vector<>();
-        //vector.add("-s_srs");
-        //vector.add("EPSG:" + 4548);
-        //vector.add("-t_srs");
-        //vector.add("EPSG:" + 4326);
-        vector.add("-ts");
-        vector.add("" + width);
-        vector.add("" + height);
-        //vector.add("-te");
-        //vector.add("" + layer.getExtension().getMinx());
-        //vector.add("" + layer.getExtension().getMiny());
-        //vector.add("" + layer.getExtension().getMaxx());
-        //vector.add("" + layer.getExtension().getMaxy());
-        //vector.add("-te_srs");
-        //vector.add("EPSG:" + 4326);
-        vector.add("-r");
-        vector.add("bilinear");
-        vector.add("-of");
-        vector.add("GTiff");
-        WarpOptions warpOptions = new WarpOptions(vector);
-
-        Dataset destDs = gdal.Warp(dest, new Dataset[]{ds}, warpOptions);
-        destDs.delete();
     }
 
     private void Terrain2Png(LayerDto layer, String tif, String png, int width, int height) {
@@ -186,28 +153,9 @@
                     image.setRGB(x, y, color.getRGB());
                 }
             }
-            savePng(image, png);
+            ComHelper.savePng(image, png);
         } finally {
             if (null != ds) ds.delete();
-        }
-    }
-
-    private BufferedImage createImage(int width, int height) {
-        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D graphic = image.createGraphics();
-        Color transparent = new Color(0, 0, 0, 0);
-        graphic.setColor(transparent);
-        graphic.clearRect(0, 0, width, height);
-        graphic.dispose();
-
-        return image;
-    }
-
-    private void savePng(BufferedImage image, String png) {
-        try {
-            ImageIO.write(image, "png", new File(png));
-        } catch (Exception ex) {
-            log.error(ex.getMessage(), ex);
         }
     }
 
@@ -260,31 +208,10 @@
 
     private List<String> getFiles(String path, String suffix) {
         List<String> files = new ArrayList<>();
-        getFiles(files, new File(path), suffix);
+        ComHelper.getFiles(files, new File(path), suffix);
         files.sort((a, b) -> a.compareToIgnoreCase(b));
 
         return files;
-    }
-
-    private void getFiles(List<String> files, File file, String suffix) {
-        if (!file.exists()) return;
-
-        if (file.isDirectory()) {
-            File[] fileList = file.listFiles();
-            for (File f : fileList) {
-                if (f.isDirectory()) {
-                    getFiles(files, f, suffix);
-                } else {
-                    if (f.getName().toLowerCase().endsWith(suffix)) {
-                        files.add(f.getPath());
-                    }
-                }
-            }
-        } else {
-            if (file.getName().toLowerCase().endsWith(suffix)) {
-                files.add(file.getPath());
-            }
-        }
     }
 
     private void setWaterData(LayerDto layer, List<String> files) {
@@ -293,7 +220,7 @@
         calendar.set(Calendar.MILLISECOND, 0);
 
         for (String file : files) {
-            String fileName = getNameWithExt(file);
+            String fileName = ComHelper.getNameWithExt(file);
             int year = Integer.parseInt(fileName.substring(0, 4));
             int month = Integer.parseInt(fileName.substring(4, 6));
             int day = Integer.parseInt(fileName.substring(6, 8));
@@ -334,8 +261,8 @@
         //layer.getWaters().setMinHeight(getMinVal(layer.getWaters().getMinHeight() - 1, 1000));
         //layer.getWaters().setMaxHeight(getMaxVal(layer.getWaters().getMaxHeight() + 1, 1000));
         layer.getExtension().setMaxHeight(layer.getExtension().getMaxHeight() + layer.getWaters().getMaxHeight());
-        layer.getExtension().setMaxHeight(getMaxVal(layer.getExtension().getMaxHeight(), 1000000));
-        layer.getExtension().setMinHeight(getMaxVal(layer.getExtension().getMinHeight(), 1000000));
+        layer.getExtension().setMaxHeight(ComHelper.getMaxVal(layer.getExtension().getMaxHeight(), 1000000));
+        layer.getExtension().setMinHeight(ComHelper.getMaxVal(layer.getExtension().getMinHeight(), 1000000));
         layer.getExtension().setDiffer();
     }
 
@@ -348,7 +275,7 @@
                 if (null == ds.GetSpatialRef()) ds.SetSpatialRef(dto.getSpatialReference());
 
                 createWaterPng(dto, ds, layer, layer.getWaters().getData().get(i));
-                copyWaterTif(dto, ds, layer.getWaters().getData().get(i));
+                if (config.getCopyTif()) copyWaterTif(dto, ds, layer.getWaters().getData().get(i));
                 createVectors(dto, ds, layer, layer.getWaters().getData().get(i));
             } finally {
                 if (null != ds) ds.delete();
@@ -362,57 +289,13 @@
         if (!dir.exists() || !dir.isDirectory()) dir.mkdirs();
 
         for (int[] sizes : layer.getTerrain().getSize()) {
-            String fileName = getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
+            String fileName = ComHelper.getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
             String tif = dto.getTemp() + File.separator + fileName + ".tif";
-            Resample(ds, tif, sizes[0], sizes[1], layer);
+            ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
             if (!new File(tif).exists()) continue;
 
             String png = waterPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
             water2Png(dto, layer, tif, png, sizes[0], sizes[1]);
-        }
-    }
-
-    private String getNameWithExt(String file) {
-        return file.substring(file.lastIndexOf(File.separator) + 1, file.lastIndexOf("."));
-    }
-
-    private void water2Png2(ResultDto dto, LayerDto layer, String tif, String png, int width, int height) {
-        Dataset ds = null;
-        try {
-            ds = gdal.Open(tif, gdalconst.GA_ReadOnly);
-            if (null == ds || 0 == ds.getRasterCount()) return;
-
-            Band band = ds.GetRasterBand(1);
-            float[] buffer = new float[width * height];
-            band.ReadRaster(0, 0, width, height, buffer);
-
-            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-            double differ = layer.getExtension().getDiffer(), maxHeight = layer.getExtension().getMaxHeight(), minHeight = layer.getExtension().getMinHeight();
-            float[] ts = layer.getTerrain().getVals().get(width + "_" + height);
-
-            /*layer.getTerrain().getXyo().get(width + "_" + height).stream().forEach(xyo -> {
-
-            });*/
-            for (XYO xyo : layer.getTerrain().getXyo().get(width + "_" + height)) {
-                float depth = buffer[xyo.getOffset()] + ts[xyo.getOffset()];
-                if (Float.isNaN(depth) || depth < minHeight) continue;
-
-                int r = 0, g, b;
-                if (depth > maxHeight) {
-                    g = b = 255;
-                } else {
-                    int val = (int) ((depth - minHeight) / differ * 65535);
-                    g = val / 256;
-                    b = val % 256;
-                }
-
-                Color color = new Color(r, g, b, 127);
-                image.setRGB(xyo.getX(), xyo.getY(), color.getRGB());
-            }
-
-            savePng(image, png);
-        } finally {
-            if (null != ds) ds.delete();
         }
     }
 
@@ -434,9 +317,8 @@
             for (int x = 0; x < width; x++) {
                 for (int y = 0; y < height; y++) {
                     int offset = x + y * width;
-                    float depth = buffer[offset] + ts[offset];
                     //if (Float.isNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
-                    if (Float.isNaN(depth) || depth < minHeight) continue;
+                    if (Float.isNaN(buffer[offset]) || buffer[offset] <= 0 || Float.isNaN(ts[offset])) continue;
 
                     //double X = transform[0] + x * transform[1] + y * transform[2];
                     //double Y = transform[3] + x * transform[4] + y * transform[5];
@@ -444,10 +326,10 @@
                     //if (null != building) continue;
 
                     int r = 0, g, b;
-                    if (depth > maxHeight) {
+                    if (buffer[offset] + ts[offset] > maxHeight) {
                         g = b = 255;
                     } else {
-                        int val = (int) ((depth - minHeight) / differ * 65535);
+                        int val = (int) ((buffer[offset] + ts[offset] - minHeight) / differ * 65535);
                         g = val / 256;
                         b = val % 256;
                     }
@@ -456,18 +338,10 @@
                     image.setRGB(x, y, color.getRGB());
                 }
             }
-            savePng(image, png);
+            ComHelper.savePng(image, png);
         } finally {
             if (null != ds) ds.delete();
         }
-    }
-
-    private BuildingDto intersects(ResultDto dto, double x, double y) {
-        Geometry p = new Geometry(ogr.wkbPoint);
-        p.AddPoint_2D(x, y);
-        p.AssignSpatialReference(dto.getBuildingList().get(0).getGeom().GetSpatialReference());
-
-        return dto.getBuildingList().parallelStream().filter(b -> b.getGeom().Intersects(p)).findFirst().orElse(null);
     }
 
     private List<BuildingDepthVo> processBuilding(ResultDto dto, List<String> files, LayerDto layer) {
@@ -520,11 +394,7 @@
 
         Double val = Arrays.stream(pixelValues).max().getAsDouble();
 
-        return isValid(val) ? val : null;
-    }
-
-    public boolean isValid(Double val) {
-        return !Double.isNaN(val) && val > Integer.MIN_VALUE;
+        return ComHelper.isValid(val) ? val : null;
     }
 
     private void copyWaterTif(ResultDto dto, Dataset ds, long ticks) {
@@ -545,7 +415,7 @@
 
         try {
             filePath = dto.getOutPath() + File.separator + "waters" + File.separator + ticks + File.separator + "water.json";
-            writeJson(filePath, JSON.toJSONString(list));
+            ComHelper.writeJson(filePath, JSON.toJSONString(list));
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
@@ -588,17 +458,20 @@
 
         List<PondingPo> list = new ArrayList<>();
         for (Geometry geometry : geometries) {
-            List<PointDto> points = getValues(ds, geometry, transform, xSize, ySize);
-            if (CollectionUtils.isEmpty(points)) continue;
+            //List<PointDto> points = getValues(ds, geometry, transform, xSize, ySize);
+            //if (CollectionUtils.isEmpty(points)) continue;
 
-            PointDto point = Collections.max(points);
+            //PointDto point = Collections.max(points);
+            PointDto point = getValues(ds, geometry, transform, xSize, ySize);
+            if (null == point) continue;
+
             list.add(new PondingPo(geometry, point));
         }
 
         return list;
     }
 
-    private List<PointDto> getValues(Dataset ds, Geometry g, double[] transform, int xSize, int ySize) {
+    private PointDto getValues(Dataset ds, Geometry g, double[] transform, int xSize, int ySize) {
         double[] env = new double[4];
         g.GetEnvelope(env);
 
@@ -612,47 +485,14 @@
         if (endY > ds.getRasterYSize()) endY = ds.getRasterYSize();
         if (endX - startX < 1 || endY - startY < 1) return null;
 
-        /*float[] values = new float[1];
-        List<PointDto> points = new ArrayList<>();
-        for (int x = startX; x <= endX; x++) {
-            for (int y = startY; y <= endY; y++) {
-                double X = transform[0] + x * transform[1] + y * transform[2];
-                double Y = transform[3] + x * transform[4] + y * transform[5];
-                ds.GetRasterBand(1).ReadRaster(x, y, 1, 1, values);
+        int width = endX - startX;
+        int height = endY - startY;
+        double[] pixelValues = new double[width * height];
+        ds.GetRasterBand(1).ReadRaster(startX, startY, width, height, pixelValues);
 
-                if (Float.isNaN(values[0]) || values[0] < -999 || !isContains(g, X, Y)) continue;
-                points.add(new PointDto(X, Y, values[0]));
-            }
-        }*/
+        Double val = Arrays.stream(pixelValues).max().getAsDouble();
 
-        List<XYDto> xyList = new ArrayList<>();
-        for (int x = startX; x <= endX; x++) {
-            for (int y = startY; y <= endY; y++) {
-                xyList.add(new XYDto(x, y));
-            }
-        }
-
-        List<PointDto> points = new CopyOnWriteArrayList<>();
-        xyList.stream().forEach(xy -> {
-            double X = transform[0] + xy.getX() * transform[1] + xy.getY() * transform[2];
-            double Y = transform[3] + xy.getX() * transform[4] + xy.getY() * transform[5];
-
-            float[] values = new float[1];
-            ds.GetRasterBand(1).ReadRaster(xy.getX(), xy.getY(), 1, 1, values);
-            if (Float.isNaN(values[0]) || values[0] < -999 || !isContains(g, X, Y)) return;
-
-            points.add(new PointDto(X, Y, values[0]));
-        });
-
-        return points;
-    }
-
-    private boolean isContains(Geometry g, double x, double y) {
-        Geometry p = new Geometry(ogr.wkbPoint);
-        p.AddPoint_2D(x, y);
-        p.AssignSpatialReference(g.GetSpatialReference());
-
-        return g.Contains(p);
+        return new PointDto(g.Centroid().GetX(), g.Centroid().GetY(), ComHelper.isValid(val) ? val : 0.0);
     }
 
     private void copeFlow(ResultDto dto, LayerDto layer) {
@@ -679,9 +519,9 @@
         if (!dir.exists() || !dir.isDirectory()) dir.mkdirs();
 
         for (int[] sizes : layer.getTerrain().getSize()) {
-            String name = getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
+            String name = ComHelper.getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
             String tif = dto.getTemp() + File.separator + name + ".tif";
-            Resample(ds, tif, sizes[0], sizes[1], layer);
+            ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
             if (!new File(tif).exists()) continue;
 
             String png = flowPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
@@ -710,8 +550,8 @@
         for (int x = 0; x < width; x++) {
             for (int y = 0; y < height; y++) {
                 int offset = x + y * width;
-                float fx = getFloatValue(vxBuffer[offset]);
-                float fy = getFloatValue(vyBuffer[offset]);
+                float fx = ComHelper.getFloatValue(vxBuffer[offset]);
+                float fy = ComHelper.getFloatValue(vyBuffer[offset]);
                 if (Float.isNaN(fx) && Float.isNaN(fy) || (fx == 0 && fy == 0)) continue;
 
                 fx = Float.isNaN(fx) ? 0 : fx;
@@ -722,22 +562,11 @@
                 int g = (int) ((fx / dr * 0.5 + 0.5) * 255);
                 int b = (int) ((fy / dr * 0.5 + 0.5) * 255);
 
-                Color color = new Color(getSafeValue(r), getSafeValue(g), getSafeValue(b), 127);
+                Color color = new Color(ComHelper.getSafeValue(r), ComHelper.getSafeValue(g), ComHelper.getSafeValue(b), 127);
                 image.setRGB(x, y, color.getRGB());
             }
         }
-        savePng(image, png);
-    }
-
-    private float getFloatValue(float val) {
-        return (Float.isNaN(val) || val < -999) ? Float.NaN : val;
-    }
-
-    private int getSafeValue(int val) {
-        if (val < 0) return 0;
-        if (val > 255) return 255;
-
-        return val;
+        ComHelper.savePng(image, png);
     }
 
     private void copeLayerJson(ResultDto dto, LayerDto layer) throws IOException {
@@ -749,7 +578,7 @@
         // String json = JSONUtil.toJsonPrettyStr(layer);
         String filePath = dto.getOutPath() + File.separator + "layer.json";
 
-        writeJson(filePath, json);
+        ComHelper.writeJson(filePath, json);
     }
 
     public void copeRainFallJson(ResultDto dto, LayerDto layer) throws IOException, ParseException {
@@ -773,7 +602,7 @@
         fr.close();
 
         String json = JSON.toJSONString(map);
-        writeJson(filePath, json);
+        ComHelper.writeJson(filePath, json);
     }
 
     private void copeBuildingDepthJson(ResultDto dto, List<BuildingDepthVo> list) throws IOException {
@@ -782,14 +611,6 @@
         String json = JSON.toJSONString(list);
         String filePath = dto.getOutPath() + File.separator + "building.json";
 
-        writeJson(filePath, json);
-    }
-
-    private void writeJson(String filePath, String json) throws IOException {
-        FileWriter fw = new FileWriter(filePath);
-        BufferedWriter bw = new BufferedWriter(fw);
-        bw.write(json);
-        bw.close();
-        fw.close();
+        ComHelper.writeJson(filePath, json);
     }
 }

--
Gitblit v1.9.3