From 3b3c0d589b727769277af0fdde81129bcded377f Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期二, 10 六月 2025 11:18:43 +0800
Subject: [PATCH] 模拟返回结果增加最大最小水深数据
---
src/main/java/com/se/nsl/service/ResolveService.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 64c27b4..4cd5f04 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -556,17 +556,6 @@
return newLayerJsonName;
}
-// private static void readDemData(File serviceNameDir, LayerDto layerDto) {
-// File dem = new File(serviceNameDir, "DEM.tif");
-// Dataset ds = gdal.Open(dem.getAbsolutePath(), gdalconstConstants.GA_ReadOnly);
-// Band band = ds.GetRasterBand(1);
-// int width = ds.getRasterXSize();
-// int height = ds.getRasterYSize();
-// float[] buffer = new float[width * height];
-// band.ReadRaster(0, 0, width, height, buffer);
-// layerDto.getTerrain().getVals().put(width + "_" + height, buffer);
-// }
-
private static File generateNewZarr2TifJson(File serviceNameDir, long currentTime) throws IOException {
File srcZarr2TifJson = new File(serviceNameDir, "zarr2tif.json");
ObjectMapper mapper = new ObjectMapper();
@@ -574,7 +563,8 @@
//淇敼zarr2tif瀵硅薄涓殑瀛楁
String stamp = TimeFormatUtil.formatTime(currentTime, "yyyy-MM-dd HH:mm:ss");
zarr2Tif.setStart_timestamp(stamp);
- String newZarrPath = serviceNameDir + File.separator + "result_" + currentTime + ".zarr";
+// String newZarrPath = serviceNameDir + File.separator + "result_" + currentTime + ".zarr";
+ String newZarrPath = serviceNameDir + File.separator + "result.zarr";
zarr2Tif.setZarr_file(newZarrPath);
zarr2Tif.setGeotiff_dir(serviceNameDir + File.separator + "depth_" + currentTime);
File newZarr2TifJson = new File(serviceNameDir, "zarr2tif_" + currentTime + ".json");
@@ -584,16 +574,16 @@
private File generateNewZarrConfigFile(File serviceNameDir, String serviceName, long currentTime, File newDatFile) throws IOException {
File configFile = new File(serviceNameDir, serviceName + ".json");
- String str = Files.readAllLines(configFile.toPath()).stream().collect(Collectors.joining());
- ConfigVo configVo = JSON.parseObject(str, ConfigVo.class);
- configVo.setDuration(300); //鍥哄畾涓�5min
+ ObjectMapper mapper = new ObjectMapper();
+ ConfigVo configVo = mapper.readValue(configFile, ConfigVo.class);
+ configVo.setDuration(configVo.getDuration() + 300); //鍥哄畾涓�5min
configVo.getRaingage().set(0, newDatFile.getAbsolutePath()); //raingage file
ResultVo result = configVo.getResult();
result.setSave_interval(60); //60s鐢熸垚涓�甯�
- result.setSave_frames(5); //淇濈暀5甯�
- String newZarrPath = serviceNameDir + File.separator + "result_" + currentTime + ".zarr";
+ result.setSave_frames(result.getSave_frames() + 5); //淇濈暀5甯э紝鍦ㄥ師鏉ョ殑鍩虹涓婂鍔�5甯�
+// String newZarrPath = serviceNameDir + File.separator + "result_" + currentTime + ".zarr";
+ String newZarrPath = serviceNameDir + File.separator + "result.zarr";
result.setSave_name(newZarrPath);
- ObjectMapper mapper = new ObjectMapper();
File newConfigFile = new File(serviceNameDir, currentTime + ".json");
mapper.writeValue(newConfigFile, configVo);
return newConfigFile;
--
Gitblit v1.9.3