Explorar el Código

添加摄像头类型

523096025 hace 4 años
padre
commit
43c59fb94e

+ 3 - 0
shiwan/video/src/main/java/com/huimv/video/domain/CameraInfo.java

@@ -43,4 +43,7 @@ public class CameraInfo {
 
     @Column(name = "LQID")
     private Integer LQID;
+
+    @Column(name = "stream")
+    private String stream;
 }

+ 3 - 1
shiwan/video/src/main/java/com/huimv/video/service/impl/CameraInfoServiceImpl.java

@@ -38,6 +38,7 @@ public class CameraInfoServiceImpl implements CameraInfoService {
     @Override
     @DS("master")
     public void save(CameraInfo cameraInfo) {
+
         cameraInfoRepo.save(cameraInfo);
     }
 
@@ -133,7 +134,8 @@ public class CameraInfoServiceImpl implements CameraInfoService {
                 String cameraAccount =  cameraInfo.getAccount();
                 String cameraPassword =  cameraInfo.getPassword();
                 String camerIp = cameraInfo.getIp();
-                map.put("wsUrl","ws://" + publicIp + ":10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
+                String stream = cameraInfo.getStream();
+                map.put("wsUrl","ws://" + publicIp + ":10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp+stream);
                 map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp);
                 map.put("areaParentId",pastureArea.getParent());
                 map.put("text",cameraInfo.getName());