Merge branch 'master' into 重构/1078

2025-05-26 15:07:58 +08:00
parent 420b3889c5 75b1e8deb2
commit 0c29c90d3b
73 changed files with 2135 additions and 1572 deletions
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -208,6 +208,14 @@ public class DateUtil {
        }
        Instant startInstant = Instant.from(formatter.parse(startTime));
        Instant endInstant = Instant.from(formatter.parse(endTime));
-        return ChronoUnit.MILLIS.between(endInstant, startInstant);
+        return ChronoUnit.MILLIS.between(startInstant, endInstant);
    }
+
+
+
+    public static void main(String[] args) {
+        long difference = getDifference("2025-05-21 13:00:00", "2025-05-21 13:30:00")/1000;
+        System.out.println(difference);
+    }
+
 }