From f984496e9bb3612ce38040a5dd0be548b181e971 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期四, 22 五月 2025 16:13:54 +0800
Subject: [PATCH] 修复时间轴问题
---
src/main/java/com/se/nsl/service/ResolveService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index 63b3fa5..cfe6efc 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -40,6 +40,8 @@
import java.nio.file.StandardCopyOption;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -273,7 +275,14 @@
int duration = 3600 * data.getDuration(); // 绉掓暟
if (null != data.getRainfalls() && data.getRainfalls().size() > 1) {
- duration = (int) (Math.abs(data.getRainfalls().get(data.getRainfalls().size() - 1).getTime().getTime() - data.getRainfalls().get(0).getTime().getTime()) / 60);
+ List<Rainfall> rainfalls = data.getRainfalls();
+ int size = rainfalls.size();
+ Rainfall last = rainfalls.get(size - 1);
+ Rainfall first = rainfalls.get(0);
+ Instant end = last.getTime().toInstant();
+ Instant start = first.getTime().toInstant();
+ long diff = ChronoUnit.SECONDS.between(end, start);
+ duration = (int) (Math.abs(diff));
}
String inPath = config.getInPath() + File.separator + data.getInPath();
--
Gitblit v1.9.3