From 45a773850057dd90c4292d30715b4f9dfdc86740 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 04 十二月 2023 13:42:20 +0800
Subject: [PATCH] 屏蔽NoData

---
 src/main/java/com/moon/server/service/data/RasterAnalysisService.java |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 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 d881b33..14d2d17 100644
--- a/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
+++ b/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
@@ -74,11 +74,12 @@
             return;
         }
 
-        // for (PublishEntity pub : pubs) {
+        //for (PublishEntity pub : pubs) {
         pubs.parallelStream().forEach(pub -> {
             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()) {
@@ -115,8 +116,9 @@
         String tempPath = pathHelper.getTempPath() + File.separator, guid = StringHelper.getGuid();
         String fileList = tempPath + guid + ".txt";
         FileWriter fw = new FileWriter(fileList);
-        for (MetaEntity meta : metas) {
-            fw.write((basePath + meta.getPath()).toCharArray());
+        for (int i = 0, c = metas.size(); i < c; i++) {
+            String str = (i > 0 ? "\r\n" : "") + basePath + metas.get(i).getPath();
+            fw.write(str.toCharArray());
         }
         fw.close();
 
@@ -135,7 +137,8 @@
         map.put("analysisForPost", entity);
 
         String json = JSONObject.toJSONString(map);
-        // System.out.println(json)
+        //System.out.println(json)
+
         WebSocketService.broadCastInfo(json);
     }
 
@@ -151,26 +154,30 @@
         }
 
         for (PublishEntity pub : pubs) {
-            AnalysisResultEntity entity = new AnalysisResultEntity();
-            entity.setLayerName(pub.getName());
+            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()) {
-                setError(entity, "鎵句笉鍒板彂甯冩暟鎹�");
-                continue;
+                List<MetaEntity> metas = publishService.selectMetasByPubid(pub.getId());
+                if (null == metas || metas.isEmpty()) {
+                    setError(entity, "鎵句笉鍒板彂甯冩暟鎹�");
+                    continue;
+                }
+
+                String filePath = getFilePath(metas);
+                File file = new File(filePath);
+                if (!file.exists() || file.isDirectory()) {
+                    setError(entity, "婧愭暟鎹笉瀛樺湪");
+                    continue;
+                }
+
+                openRaster(entity, filePath, geo, size);
+                rs.add(entity);
+            } catch (Exception ex) {
+                log.error(ex.getMessage(), ex);
             }
-
-            String filePath = pathHelper.getConfig().getUploadPath() + File.separator + metas.get(0).getPath();
-            File file = new File(filePath);
-            if (!file.exists() || file.isDirectory()) {
-                setError(entity, "婧愭暟鎹笉瀛樺湪");
-                continue;
-            }
-
-            openRaster(entity, filePath, geo, size);
-            rs.add(entity);
         }
-
         return rs;
     }
 
@@ -350,7 +357,7 @@
 
         List<Double> list = new ArrayList<>();
         for (double val : pixelValues) {
-            if (!Double.isNaN(val)) {
+            if (!Double.isNaN(val) && val > Integer.MIN_VALUE) {
                 list.add(val);
             }
         }

--
Gitblit v1.9.3