Przeglądaj źródła

工具类修改

gao.qiang 6 miesięcy temu
rodzic
commit
7279b7ee4e

+ 23 - 6
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -2,6 +2,8 @@ package com.ozs.web.core.util;
 
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ozs.common.config.BaseConfig;
@@ -1006,11 +1008,26 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 //
 //        List<String> ones = one.stream().filter(o -> !other.contains(o)).collect(Collectors.toList());
 //            System.out.println("ArrayList 1: " + one + " ; isRetainAll:" + ones);
-        long dades = System.currentTimeMillis();
-        System.out.println(new Date(dades));
-        long time2 = dades - 60000L;
-        System.out.println(dades);
-        System.out.println(time2);
-        System.out.println(new Date(time2));
+//        long dades = System.currentTimeMillis();
+//        System.out.println(new Date(dades));
+//        long time2 = dades - 60000L;
+//        System.out.println(dades);
+//        System.out.println(time2);
+//        System.out.println(new Date(time2));
+        // 视频拼接
+        String streamPath = "42010001541320000023/42010001541320000023";
+        String date="2024-03-11";
+        String param = "{\n" +
+                "    \"streamPath\":\"" + streamPath + "\",\n" +
+                "    \"date\":\""+date+"\"\n" +
+                "}";
+
+        String jsonStr = HttpUtils.sendPost("http://124.70.58.209:9080" + "/recordpro/api/query/records", param);
+        JSONObject jsonObj = JSON.parseObject(jsonStr);
+        JSONArray resultArray = jsonObj.getJSONArray("result");
+        JSONObject resultObj = resultArray.getJSONObject(0);
+        String path = resultObj.getString("Path");
+        System.out.println("Path: " + path);
+      
     }
 }

+ 1 - 1
hazard-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ base:
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/record/flv/
-  webUrl: http://124.70.58.209:18812
+  webUrl: http://124.70.58.209:9080
   bakUrl: http://124.70.58.209:18891
   wsUrl: ws://124.70.58.209:9080
   defaultPassword: yn5aq5Mt.106.tky