Selaa lähdekoodia

添加视频回放接口

hexiao 2 vuotta sitten
vanhempi
commit
f3b92d94b3

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

@@ -709,6 +709,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
             }
             }
             for (Map<String, Object> map : maps) {
             for (Map<String, Object> map : maps) {
                 Object path = map.get("Path");
                 Object path = map.get("Path");
+                Object size = map.get("Size");
+                Object duration = map.get("Duration");
                 if (!ObjectUtils.isEmpty(path)) {
                 if (!ObjectUtils.isEmpty(path)) {
                     String s1 = path.toString();
                     String s1 = path.toString();
                     String substring = s1.substring(s1.lastIndexOf("/") + 1, s1.length());
                     String substring = s1.substring(s1.lastIndexOf("/") + 1, s1.length());
@@ -729,6 +731,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
                         mo.put("url", webUrl + path.toString());
                         mo.put("url", webUrl + path.toString());
                         mo.put("path", mappingUrl + path.toString());
                         mo.put("path", mappingUrl + path.toString());
                         mo.put("fileName", substring);
                         mo.put("fileName", substring);
+                        mo.put("size", size);
+                        mo.put("duration", duration);
                         /*     sdate  |startTm|  edate     |endTm| */
                         /*     sdate  |startTm|  edate     |endTm| */
                         if (startTm.compareTo(sdate) >= 0
                         if (startTm.compareTo(sdate) >= 0
                                 && startTm.compareTo(edate) <= 0
                                 && startTm.compareTo(edate) <= 0
@@ -759,6 +763,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
 
 
                 rmaps.add(m.get(d));
                 rmaps.add(m.get(d));
             });
             });
+            log.info("rmaps:{}", rmaps);
             return rmaps;
             return rmaps;
         }
         }
         return null;
         return null;