m3u8默认配置

web/src/main/java/com/zhehekeji/web/entity/Camera.java

@@ -32,6 +32,11 @@ public class Camera {
     @ApiModelProperty(value = "预置点 增长值",hidden = true)
     private Integer ptzId;
 
+    /**
+     *为空的话 就取默认值
+     */
+    private String m3u8;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 }

web/src/main/java/com/zhehekeji/web/lib/CaptureRunnable.java

@@ -82,6 +82,7 @@ public class CaptureRunnable implements Runnable {
                         } else {
                             stock.setOveroperationPic(path);
                         }
+                        stock.setOrderNum(order.getOrderNum());
                         stockMapper.updateById(stock);
                     }
                     String pics = order.getPicPaths();

web/src/main/java/com/zhehekeji/web/service/RealTimeService.java

@@ -7,6 +7,7 @@ import com.zhehekeji.web.mapper.StreetMapper;
 import com.zhehekeji.web.pojo.realTime.RealTime;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -28,11 +29,18 @@ public class RealTimeService {
     @Value("${videoStyleColumn}")
     private Integer videoStyleColumn;
 
+    @Value("${mediaServer}")
+    private String mediaServer;
+
     public List<RealTime> realTimes(){
         List<Street> streets = streetMapper.selectByMap(new HashMap<>(0));
         List<Camera> cameras = cameraMapper.selectByMap(new HashMap<>(0));
         Map<Integer,Camera> cameraMap = new HashMap<>(cameras.size());
         cameras.forEach(camera -> {
+            if(StringUtils.isEmpty(camera.getM3u8())){
+                String m3u8 = String.format(mediaServer,camera.getId());
+                camera.setM3u8(m3u8);
+            }
             cameraMap.put(camera.getId(),camera);
         });
         List<RealTime> realTimes = new ArrayList<>();

web/src/main/resources/application-dev.yml

@@ -49,5 +49,7 @@ cameraType: 1
 # ------------服务端类型  0：TCP    1:JSON
 serverMode: 1
 # ------------ 实时视频流  全部页面的格式  行列数量
-videoStyleRow : 2
+videoStyleRow: 2
-videoStyleColumn : 2
+videoStyleColumn: 2
+# ------------球机m3u8默认地址 %d是球机数据库id，如果数据库没有，就使用此默认值
+mediaServer: http://127.0.0.1:9080/hls/camera%d.m3u8