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 | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 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..631eac8 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;
}
@@ -251,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));
}
}
@@ -309,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]);
}
}
@@ -350,7 +357,7 @@
List<Double> list = new ArrayList<>();
for (double val : pixelValues) {
- if (!Double.isNaN(val)) {
+ if (isValid(val)) {
list.add(val);
}
}
@@ -358,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