hexiao před 1 rokem
rodič
revize
d6be1e3124

+ 1 - 16
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -548,22 +548,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
         }
     }
 
-    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 substring = s.substring(0, s.lastIndexOf("."));
-        System.out.println(substring);
-//        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));
-    }
 
     public static File[] getCurFilesList(String filePath) {
         File path = new File(filePath);
@@ -811,6 +795,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
                         if (!StringUtils.isBlank(cameraChannelByAlarmId)) {
                             log.info("报警UUID:{},相机通道:{},开始时间:{},结束时间:{}", alarmId, cameraChannelByAlarmId, (Date) oTime, date);
                             String url = historyPlayListStr(cameraChannelByAlarmId, (Date) oTime, date);
+
                             redisCache.setCacheObject("STREAMING_ALARM_VIDEO:" + alarmId, url);
                             redisCache.expire("STREAMING_ALARM_VIDEO:" + alarmId, 365L, TimeUnit.DAYS);
                             alarmIdMap.remove(alarmId);