hexiao 1 year ago
parent
commit
fb5c6697fd
1 changed files with 14 additions and 5 deletions
  1. 14 5
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 14 - 5
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -188,9 +188,13 @@ public class CameraUtil {
                     String substring1 = substring.substring(0, substring.indexOf("-"));
                     String[] s2 = substring1.split("_");
                     if (!ObjectUtils.isEmpty(s2)) {
+
                         String s3 = s2[0] + s2[1];
                         String s4 = s2[0] + s2[2];
                         Date sdate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s3);
+                        if (s2[1].startsWith("23") && s2[2].startsWith("00")) {
+                            sdate = DateUtils.addDays(sdate, -1);
+                        }
                         Date edate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s4);
                         /*     sdate  |startTm|  edate     |endTm| */
                         if (startTm.compareTo(sdate) >= 0
@@ -542,10 +546,15 @@ public class CameraUtil {
     public static void main(String[] args) throws InterruptedException, ParseException, IOException {
 //        CameraUtil cameraUtil = new CameraUtil();
 //        cameraUtil.closeRecording();
-        String s = "/opt/streams/record/flv/42010001541320001116/20230403_235506_000506-22e1523b-d170-11ed-8a42-fa163e4e1e9f.flv";
-        String fileStr = s.substring(s.lastIndexOf("/") + 1, s.length());
-        String pathStr = s.substring(0, s.lastIndexOf("/"));
-        System.out.println(fileStr);
-        System.out.println(pathStr);
+//        String s = "/opt/streams/record/flv/42010001541320001116/20230403_235506_000506-22e1523b-d170-11ed-8a42-fa163e4e1e9f.flv";
+//        String fileStr = s.substring(s.lastIndexOf("/") + 1, s.length());
+//        String pathStr = s.substring(0, s.lastIndexOf("/"));
+//        System.out.println(fileStr);
+//        System.out.println(pathStr);
+
+        String s = "20230403235512";
+        Date sdate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s);
+        sdate = DateUtils.addDays(sdate, -1);
+        System.out.println(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, sdate));
     }
 }