Bläddra i källkod

+ 去除已经关闭的session从sessionMap 中移除的bug

chen.cheng 6 månader sedan
förälder
incheckning
061f622300

+ 1 - 0
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/VideoTrailEngine.java

@@ -133,6 +133,7 @@ public class VideoTrailEngine extends EvtFusionEngine {
                 video = new HashMap<>();
                 video.put("cameraName", fenceInfo.getCameraName());
                 video.put("cameraStream", fenceInfo.getCameraStream());
+                video.put("cameraLive", fenceInfo.getLiveStream());
                 location.put("video", video);
                 push(location);
                 break;

+ 2 - 1
bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdCameraInfoMapper.xml

@@ -42,7 +42,8 @@
                fence.defence_name,
                ST_AsText(poly) poly,
                camera.camera_name,
-               camera.camera_stream
+               camera.camera_stream,
+               camera.live_stream
         FROM bd_fence_info fence
                  INNER JOIN bd_camera_info camera ON fence.location_id = camera.id
             AND fence.fence_type = 3

+ 10 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/VideoFence.java

@@ -15,6 +15,8 @@ public class VideoFence implements Serializable {
 
     private String cameraStream;
 
+    private String liveStream;
+
     public Long getId() {
         return id;
     }
@@ -54,4 +56,12 @@ public class VideoFence implements Serializable {
     public void setCameraStream(String cameraStream) {
         this.cameraStream = cameraStream;
     }
+
+    public String getLiveStream() {
+        return liveStream;
+    }
+
+    public void setLiveStream(String liveStream) {
+        this.liveStream = liveStream;
+    }
 }