From aa23fdacb23b6e7e194d3e02760ab47590345205 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 04 十二月 2023 14:10:24 +0800
Subject: [PATCH] 修订分析的有效值

---
 src/main/java/com/moon/server/service/data/RasterAnalysisService.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moon/server/service/data/RasterAnalysisService.java b/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
index 58db30b..631eac8 100644
--- a/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
+++ b/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
@@ -79,6 +79,7 @@
             try {
                 AnalysisResultEntity entity = new AnalysisResultEntity(token);
                 entity.setLayerName(pub.getName());
+                entity.setUnit(pub.getUnit());
 
                 List<MetaEntity> metas = publishService.selectMetasByPubid(pub.getId());
                 if (null == metas || metas.isEmpty()) {
@@ -136,7 +137,7 @@
         map.put("analysisForPost", entity);
 
         String json = JSONObject.toJSONString(map);
-        // System.out.println(json)
+        //System.out.println(json)
 
         WebSocketService.broadCastInfo(json);
     }
@@ -156,6 +157,7 @@
             try {
                 AnalysisResultEntity entity = new AnalysisResultEntity();
                 entity.setLayerName(pub.getName());
+                entity.setUnit(pub.getUnit());
 
                 List<MetaEntity> metas = publishService.selectMetasByPubid(pub.getId());
                 if (null == metas || metas.isEmpty()) {
@@ -256,7 +258,7 @@
             for (int j = 1; j <= bandCount; j++) {
                 double[] pixelValues = new double[1];
                 ds.GetRasterBand(j).ReadRaster(xPixel, yPixel, 1, 1, pixelValues);
-                if (!Double.isNaN(pixelValues[0])) {
+                if (isValid(pixelValues[0])) {
                     vals.add(WebHelper.round(pixelValues[0], 3));
                 }
             }
@@ -314,7 +316,7 @@
             for (Integer x : xList) {
                 for (Integer y : yList) {
                     ds.GetRasterBand(i).ReadRaster(x, y, 1, 1, pixelValues);
-                    if (!Double.isNaN(pixelValues[0])) {
+                    if (isValid(pixelValues[0])) {
                         list.add(pixelValues[0]);
                     }
                 }
@@ -355,7 +357,7 @@
 
         List<Double> list = new ArrayList<>();
         for (double val : pixelValues) {
-            if (!Double.isNaN(val)) {
+            if (isValid(val)) {
                 list.add(val);
             }
         }
@@ -363,6 +365,13 @@
     }
 
     /**
+     * 鍊兼槸鍚︽湁鏁�
+     */
+    public static boolean isValid(Double val) {
+        return !Double.isNaN(val) && val > Integer.MIN_VALUE;
+    }
+
+    /**
      * 璁剧疆Band鍊�
      */
     private void setBandVals(AnalysisResultEntity entity, List<Double> list) {

--
Gitblit v1.9.3