From e07504fe7e2598d66972d659755e89c2e344fdec Mon Sep 17 00:00:00 2001
From: sxh <1632740646@qq.com>
Date: Tue, 16 Nov 2021 10:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF=EF=BC=8C=E5=89=8D=E7=AB=AF=E4=B8=8D=E9=87=8D=E5=AE=9A?=
 =?UTF-8?q?=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/media/zlm/ZLMHttpHookListener.java  | 17 +++++++++++++++--
 .../iot/vmp/media/zlm/ZLMMediaListManager.java  | 14 +++++++++++++-
 .../iot/vmp/media/zlm/dto/StreamPushItem.java   | 13 +++++++++++++
 .../iot/vmp/storager/dao/StreamPushMapper.java  |  4 ++--
 src/main/resources/application-dev.yml          |  4 ++--
 web_src/src/main.js                             |  6 ++++++
 web_src/src/utils/request.js                    |  8 +++-----
 7 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index f74dcfa7..da6b4753 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -297,9 +297,22 @@ public class ZLMHttpHookListener {
 				if (!"rtp".equals(app) ){
 					MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
 					if (regist) {
-						zlmMediaListManager.addMedia(mediaServerItem, app, streamId);
+//						if("qupinwei".equals(app) && streamId.contains("/")){
+//							String[] split = streamId.split("/");
+
+//							if(split.length >2){
+//								logger.error("流地址不符合固定的要求");
+//							}else{
+								zlmMediaListManager.addMedia(mediaServerItem, app,streamId );
+////							}
+//
+//
+//						}else{
+//							logger.error("流地址不符合固定的要求");
+//						}
+
 					}else {
-						zlmMediaListManager.removeMedia( app, streamId);
+						zlmMediaListManager.removeMedia(app, streamId);
 					}
 				}
 			}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index ea1123cb..24c7cccd 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -107,7 +107,19 @@ public class ZLMMediaListManager {
             }
 
             if (streamPushItems != null && streamPushItems.size() == 1) {
-                storager.updateMedia(streamPushItems.get(0));
+                StreamPushItem streamPushItem = streamPushItems.get(0);
+                if("qupinwei".equals(streamPushItem.getApp()) && streamPushItem.getStream().contains("/") && streamPushItem.getStream().split("/").length == 2){
+
+                    String[] split = streamPushItem.getStream().split("/");
+                    streamPushItem.setBasketballId(Integer.parseInt(split[1]));
+
+                    storager.updateMedia(streamPushItem);
+                }else {
+                    logger.error("流地址格式不符合");
+                    removeMedia(app,streamId);
+                }
+
+
             }
         });
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
index 73e162af..19e86b53 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -18,6 +18,11 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
      */
     private String stream;
 
+    /**
+     * 篮球馆ID
+     */
+    private Integer basketballId;
+
     /**
      * 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv
      */
@@ -95,6 +100,14 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
         return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
     }
 
+    public Integer getBasketballId() {
+        return basketballId;
+    }
+
+    public void setBasketballId(Integer basketballId) {
+        this.basketballId = basketballId;
+    }
+
     public static class MediaSchema {
         private String schema;
         private Long bytesSpeed;
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index 41e4c44e..50a63075 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -11,9 +11,9 @@ import java.util.List;
 public interface StreamPushMapper {
 
     @Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
-            "createStamp, aliveSecond, mediaServerId) VALUES" +
+            "createStamp, aliveSecond, mediaServerId,basketballId) VALUES" +
             "('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
-            "'${createStamp}', '${aliveSecond}', '${mediaServerId}' )")
+            "'${createStamp}', '${aliveSecond}', '${mediaServerId}' ,'${basketballId}')")
     int add(StreamPushItem streamPushItem);
 
     @Update("UPDATE stream_push " +
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2d326098..9ce5f47d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -62,9 +62,9 @@ media:
     # [必须修改] zlm服务器的内网IP
     ip: 192.168.1.59
     # [可选] 返回流地址时的ip，置空使用 media.ip
-    stream-ip: 182.119.225.208
+    stream-ip: 182.119.229.87
     # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip
-    sdp-ip: 182.119.225.208
+    sdp-ip: 182.119.229.87
     # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
     hook-ip:
     # [必须修改] zlm服务器的http.port
diff --git a/web_src/src/main.js b/web_src/src/main.js
index e7f49633..f9afb2f1 100644
--- a/web_src/src/main.js
+++ b/web_src/src/main.js
@@ -42,6 +42,9 @@ Fingerprint2.get(components => {
   console.log("浏览器唯一标识码：" + fingerPrint);
 });
 
+
+
+
 Vue.config.productionTip = false
 
 // mount axios to `Vue.$http` and `this.$http`
@@ -62,3 +65,6 @@ new Vue({
   created: bootstrap,
   render: h => h(App)
 }).$mount('#app')
+
+
+
diff --git a/web_src/src/utils/request.js b/web_src/src/utils/request.js
index bcf420ac..d2f1ced7 100644
--- a/web_src/src/utils/request.js
+++ b/web_src/src/utils/request.js
@@ -3,7 +3,7 @@ import store from '@/store'
 import storage from 'store'
 import notification from 'ant-design-vue/es/notification'
 import { VueAxios } from './axios'
-
+import router from '@/router'
 // 创建 axios 实例
 const request = axios.create({
   // API 请求的默认前缀
@@ -13,6 +13,7 @@ const request = axios.create({
 
 // 异常拦截处理器
 const errorHandler = (error) => {
+  debugger;
   if (error.response) {
     const data = error.response.data
     if (error.response.status === 403) {
@@ -22,10 +23,7 @@ const errorHandler = (error) => {
       })
     }
     if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
-      notification.error({
-        message: 'Unauthorized',
-        description: 'Authorization verification failed'
-      })
+      router.push('/login');
     }
   }
   return Promise.reject(error)