From 97629da6a002b534da10f828187fd6cd65941aa4 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期一, 07 七月 2025 17:14:13 +0800
Subject: [PATCH] 模拟间隔支持毫秒级
---
src/main/java/com/se/nsl/service/ResolveService.java | 137 +++++----------------------------------------
1 files changed, 16 insertions(+), 121 deletions(-)
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 9d8cf99..2df9766 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -11,8 +11,6 @@
import com.se.nsl.domain.po.Simu;
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.ConfigVo;
-import com.se.nsl.domain.vo.RealTimeInput;
-import com.se.nsl.domain.vo.ResultVo;
import com.se.nsl.helper.ComHelper;
import com.se.nsl.helper.GdalHelper;
import com.se.nsl.helper.StringHelper;
@@ -37,7 +35,6 @@
import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -46,7 +43,6 @@
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.Instant;
-import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.concurrent.ExecutorService;
@@ -156,7 +152,7 @@
/**
* 鍒濆鍖栧弬鏁�
*/
- public void initArgs(Simu simu, SimuData data) throws IOException {
+ public void initArgs(Simu simu, SimuData data) {
String inPath = config.getInPath() + File.separator + data.getInPath();
createDir(inPath);
createDir(inPath + File.separator + "depth");
@@ -320,8 +316,6 @@
* 璋冪敤UWSolver
*/
public String callUwSolver(Simu simu, SimuData data) throws Exception {
- File uwBat = new File(config.getUwSolverBat());
-
int duration = 3600 * data.getDuration(); // 绉掓暟
if (null != data.getRainfalls() && data.getRainfalls().size() > 1) {
List<Rainfall> rainfalls = data.getRainfalls();
@@ -340,14 +334,15 @@
String rainfallFile = (inPath + File.separator + "rainfall.dat");
String saveName = inPath + File.separator + "result.zarr";
// ConfigVo vo = new ConfigVo(terrainFile, landuseFile, terrainFile, rainfallFile, saveName, duration, config.getSaveFrames());
- Integer saveFrameInterval = config.getSaveFrameInterval();
- int saveFrames = duration / 60 / saveFrameInterval;
+ Double saveFrameInterval = config.getSaveFrameInterval();
+ int saveFrames = (int) (duration / saveFrameInterval);
Short type = simu.getType();
SimulateType simulateType = SimulateType.of(type);
String saveMode = simulateType.getSaveMode();
String startTime = TimeFormatUtil.formatDate(data.getStartTime());
ConfigVo vo = new ConfigVo(terrainFile, landuseFile, terrainFile, rainfallFile,
saveName, duration, saveFrames, saveMode, startTime);
+ vo.setEvaporation(config.getEvaporation());
vo.getResult().setSave_filter(config.getSaveFilter());
String configFile = config.getInPath() + File.separator + data.getInPath() + File.separator + data.getInPath() + ".json";
// ComHelper.writeJson(configFile, JSON.toJSONString(vo));
@@ -484,11 +479,10 @@
}
private List<Double> getValues(String csvPath) throws Exception {
- if (!new File(csvPath).exists()) return null;
+ if (!new File(csvPath).exists()) return Collections.emptyList();
List<String> list = Files.readAllLines(Paths.get(csvPath));
list.remove(0);
- //list.remove(list.size() - 1);
return list.stream()
.map(s -> new BigDecimal(s).setScale(6, RoundingMode.HALF_DOWN).doubleValue())
@@ -524,116 +518,17 @@
Files.write(Paths.get(dat), list, StandardCharsets.UTF_8);
}
- //瀹炴椂妯℃嫙
- public String realTimeSimulate(RealTimeInput input) throws IOException {
- long currentTime = System.currentTimeMillis();
- //鏍规嵁鏈嶅姟鎵惧埌鎸囧畾鐨勬枃浠跺す
- String serviceName = input.getServiceName();
- File serviceNameDir = new File(config.getInPath(), serviceName);
- //鐢熸垚涓�涓柊鐨勯洦閲忔枃浠�,闇�瑕佸師鍏堥洦閲忔枃浠剁殑涓�浜涗俊鎭紝鎵�浠ラ渶瑕佸厛璇诲彇鏃х殑
- String[] values = readTheOldFirstLineRainfallValue(serviceNameDir);
- File newDatFile = generateNewRainfallFile(input, values, serviceNameDir, currentTime);
-
- //鐢熸垚涓�涓柊鐨勭敓鎴恴arr鐨勯厤缃枃浠�
- File newConfigFile = generateNewZarrConfigFile(serviceNameDir, serviceName, currentTime, newDatFile);
- //鎵ц姹傝В鍣ㄨ繍绠�
- String cmd = String.format("%s \"%s\"", config.getUwSolverBat(), newConfigFile);
- callBat2(cmd);
-
- //鐢熸垚涓�涓柊鐨剒arr杞瑃if鐨刯son鏂囦欢
- File newZarr2TifJson = generateNewZarr2TifJson(serviceNameDir, currentTime);
- //鎵цzarr杞瑃if
- String zarr2TifCmd = String.format("%s \"%s\"", config.getZarr2tifBat(), newZarr2TifJson);
- callBat2(zarr2TifCmd);
- //杩斿洖鏂扮殑layer.json鍚嶇О
- return generateLayerJsonAndPng(serviceName, serviceNameDir, currentTime);
-
- }
-
- private String generateLayerJsonAndPng(String serviceName, File serviceNameDir, long currentTime) throws IOException {
- ResultDto resultDto = new ResultDto();
- resultDto.setServiceName(serviceName);
- File temp = Paths.get(config.getOutPath(), serviceName, "temp").toFile();
- if (!temp.exists()) temp.mkdir();
- resultDto.setTemp(temp.getAbsolutePath());
- resultDto.setOutPath(Paths.get(config.getOutPath(), serviceName).toString());
- File dem = new File(serviceNameDir, "DEM.tif");
- resultDto.setTerrainFile(dem.getAbsolutePath());
- File newDepthDir = new File(serviceNameDir + File.separator + "depth_" + currentTime);
- File[] files = newDepthDir.listFiles();
- resultDto.setWaterPath(newDepthDir.getAbsolutePath());
- LayerDto layerDto = new LayerDto(config.getVer(), 4548, config.getSizes());
- String newLayerJsonName = "layer_" + currentTime + ".json";
- layerDto.setName(newLayerJsonName);
- testService.processRealTime(resultDto, layerDto);
- return newLayerJsonName;
- }
-
- private File generateNewZarr2TifJson(File serviceNameDir, long currentTime) throws IOException {
- File srcZarr2TifJson = new File(serviceNameDir, "zarr2tif.json");
- Zarr2Tif zarr2Tif = mapper.readValue(srcZarr2TifJson, Zarr2Tif.class);
- //淇敼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.zarr";
- zarr2Tif.setZarr_file(newZarrPath);
- zarr2Tif.setGeotiff_dir(serviceNameDir + File.separator + "depth_" + currentTime);
- File newZarr2TifJson = new File(serviceNameDir, "zarr2tif_" + currentTime + ".json");
- mapper.writeValue(newZarr2TifJson, zarr2Tif);
- return newZarr2TifJson;
- }
-
- private File generateNewZarrConfigFile(File serviceNameDir, String serviceName, long currentTime, File newDatFile) throws IOException {
- File configFile = new File(serviceNameDir, serviceName + ".json");
- ConfigVo configVo = mapper.readValue(configFile, ConfigVo.class);
- int simulateTime = 300; //妯℃嫙鏃堕棿锛岄粯璁や负5min锛屽嵆300s
- int intervalTime = 60; //姣忓抚鐨勯棿闅旀椂闂达紝榛樿涓�60s,60s鐢熸垚涓�甯�
- configVo.getRaingage().set(0, newDatFile.getAbsolutePath()); //raingage file
- ResultVo result = configVo.getResult();
- Integer oldDuration = configVo.getDuration();
-// result.setSave_start(oldDuration); //璧峰鏃堕棿瑕佸湪涓婃鏃堕棿鐨勫熀纭�涓婂紑濮�
- configVo.setDuration(oldDuration + simulateTime); //鍥哄畾涓�5min
- result.setSave_interval(intervalTime);
- result.setSave_frames(result.getSave_frames() + (simulateTime / intervalTime)); //淇濈暀5甯э紝鍦ㄥ師鏉ョ殑鍩虹涓婂鍔�5甯�
-// String newZarrPath = serviceNameDir + File.separator + "result_" + currentTime + ".zarr";
- String newZarrPath = serviceNameDir + File.separator + "result.zarr";
- result.setSave_name(newZarrPath);
- File newConfigFile = new File(serviceNameDir, currentTime + ".json");
- mapper.writeValue(newConfigFile, configVo);
- return newConfigFile;
- }
-
- private File generateNewRainfallFile(RealTimeInput input, String[] values, File serviceNameDir, long currentTime) throws IOException {
- String station = values[0];
- double lon = Double.parseDouble(values[1]);
- double lat = Double.parseDouble(values[2]);
- String title = config.getRainfallTitle();
- List<String> newLines = new ArrayList<>();
- newLines.add(title);
- List<RealTimeInput.RealTimeData> data = input.getData();
- for (RealTimeInput.RealTimeData rd : data) {
- LocalDateTime dateTime = rd.getDateTime();
- int year = dateTime.getYear();
- int month = dateTime.getMonthValue();
- int day = dateTime.getDayOfMonth();
- int hour = dateTime.getHour();
- int minute = dateTime.getMinute();
- double intensity = rd.getIntensity(); //淇濈暀鎸囧畾浣嶆暟灏忔暟
- String l = String.format("%s %s %s %s %s %s %s %s %s",
- station, lon, lat, year, month, day, hour, minute, String.format("%.6f", intensity));
- newLines.add(l);
+ public List<String> simulationResults(String serviceName) {
+ String outPath = config.getOutPath();
+ File serviceNameDir = new File(outPath, serviceName);
+ List<String> res = new ArrayList<>();
+ File[] files = serviceNameDir.listFiles();
+ for (File file : files) {
+ String name = file.getName();
+ if (name.startsWith("layer")) {
+ res.add(name);
+ }
}
- File newDatFile = new File(serviceNameDir, "rainfall_" + currentTime + ".dat");
- if (!newDatFile.exists()) newDatFile.createNewFile();
- Files.write(newDatFile.toPath(), newLines, StandardOpenOption.TRUNCATE_EXISTING);
- return newDatFile;
- }
-
- private static String[] readTheOldFirstLineRainfallValue(File serviceNameDir) throws IOException {
- File srcRailfallFile = new File(serviceNameDir, "rainfall.dat");
- List<String> lines = Files.readAllLines(srcRailfallFile.toPath());
- String secondLine = lines.get(1);
- return secondLine.split(" ");
+ return res;
}
}
--
Gitblit v1.9.3