From acdef18cbaba5a77b40e31ac259845da71a2eaff Mon Sep 17 00:00:00 2001
From: shangxingyu <harston@qq.com>
Date: Sat, 3 Feb 2024 11:21:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index bd212ad7e..46f1e9d53 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -508,6 +508,7 @@ public class DeviceServiceImpl implements IDeviceService {
             }
             deviceChannelMapper.clearPlay(device.getDeviceId());
             inviteStreamService.clearInviteInfo(device.getDeviceId());
+            deviceInStore.setSwitchPrimarySubStream(device.isSwitchPrimarySubStream());
         }
 
         if (!ObjectUtils.isEmpty(device.getName())) {
@@ -597,6 +598,7 @@ public class DeviceServiceImpl implements IDeviceService {
         }
         deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
         deviceMapper.del(deviceId);
+        redisCatchStorage.removeDevice(deviceId);
         return true;
     }
 

From addb6c04593129ce8257c6ffd675238f4be0030d Mon Sep 17 00:00:00 2001
From: shangxingyu <harston@qq.com>
Date: Sat, 3 Feb 2024 11:42:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=92=AD=E6=94=BE=E5=99=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=202.=E5=A4=9A=E5=B1=8F=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=A4=9A=E7=AA=97=E5=8F=A3,=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E5=8F=AA=E6=9C=89=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=89=E6=97=B6=E9=97=B4=E7=9B=91=E5=90=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=203.=E5=9B=9E=E6=94=BE=E7=AA=97=E5=8F=A3=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E6=97=B6=E8=B0=83=E6=95=B4=E4=B8=8B=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/GBRecordDetail.vue   | 24 ++++++---
 web_src/src/components/common/jessibuca.vue | 57 +++++++++++----------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/web_src/src/components/GBRecordDetail.vue b/web_src/src/components/GBRecordDetail.vue
index 37ec377f5..b800e0c1a 100755
--- a/web_src/src/components/GBRecordDetail.vue
+++ b/web_src/src/components/GBRecordDetail.vue
@@ -36,7 +36,6 @@
                   :error="videoError"
                   :message="videoError"
                   :hasAudio="hasAudio"
-                  style="max-height: 100%"
                   fluent autoplay live ></player>
         </div>
         <div class="player-option-box">
@@ -137,8 +136,11 @@
           margin: "10px auto 10px auto"
         },
         playerStyle: {
+          "display": "flex",
+          "justify-content": "center",
+          "align-items": "center",
 			    "margin": "0 auto 20px auto",
-          "height": this.winHeight + "px",
+          "height": this.winHeight + "px"
         },
         winHeight: window.innerHeight - 240,
         playTime: null,
@@ -178,17 +180,25 @@
 
 		},
 		mounted() {
-      this.recordListStyle.height = this.winHeight + "px";
-      this.playerStyle["height"] = this.winHeight + "px";
-      this.chooseDate = moment().format('YYYY-MM-DD')
-      this.dateChange();
-      window.addEventListener('beforeunload', this.stopPlayRecord)
+      this.$nextTick(() => {
+        this.updateWinHeight();
+        this.chooseDate = moment().format('YYYY-MM-DD')
+        this.dateChange();
+        window.addEventListener('resize',this.updateWinHeight)
+        window.addEventListener('beforeunload', this.stopPlayRecord)
+      })
 		},
 		destroyed() {
 			this.$destroy('recordVideoPlayer');
       window.removeEventListener('beforeunload', this.stopPlayRecord)
+      window.removeEventListener('resize',this.updateWinHeight)
 		},
 		methods: {
+      updateWinHeight(){
+        this.winHeight=window.innerHeight - 240;
+        this.recordListStyle.height = this.winHeight + "px";
+        this.playerStyle.height = this.winHeight + "px";
+      },
       dateChange(){
         if (!this.chooseDate) {
           return;
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index 3419bb590..ef79bab76 100755
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -1,23 +1,25 @@
 <template>
-  <div ref="container" @dblclick="fullscreenSwich"
-       style="width:100%;height:518px; min-height: 200px;background-color: #000000;margin:0 auto;position: relative;">
-    <div class="buttons-box" id="buttonsBox">
-      <div class="buttons-box-left">
-        <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
-        <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
-        <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
-        <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
-      </div>
-      <div class="buttons-box-right">
-        <span class="jessibuca-btn">{{ kBps }} kb/s</span>
-        <!--          <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
-        <!--          <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
-        <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="screenshot"
-           style="font-size: 1rem !important"></i>
-        <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
-        <i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i>
+  <div ref="container">
+    <div ref="playerContainer" @dblclick="fullscreenSwich"
+         style="width:100%;height:100%;background-color: #000000;margin:0 auto;position: relative;">
+      <div class="buttons-box" id="buttonsBox">
+        <div class="buttons-box-left">
+          <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
+          <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
+          <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
+          <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
+          <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
+        </div>
+        <div class="buttons-box-right">
+          <span class="jessibuca-btn">{{ kBps }} kb/s</span>
+          <!--          <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
+          <!--          <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
+          <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="screenshot"
+             style="font-size: 1rem !important"></i>
+          <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
+          <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
+          <i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i>
+        </div>
       </div>
     </div>
   </div>
@@ -46,13 +48,11 @@ export default {
     };
   },
   props: ['videoUrl', 'error', 'hasAudio', 'height'],
-  created() {
+  mounted() {
     let paramUrl = decodeURIComponent(this.$route.params.url)
     this.$nextTick(() => {
       this.updatePlayerDomSize()
-      window.onresize = () => {
-        this.updatePlayerDomSize()
-      }
+      window.addEventListener('resize',this.updatePlayerDomSize)
       if (typeof (this.videoUrl) == "undefined") {
         this.videoUrl = paramUrl;
       }
@@ -63,7 +63,10 @@ export default {
     videoUrl: {
       handler(val, _) {
         this.$nextTick(() => {
-          this.play(val);
+          if(val) {
+            this.play(val);
+          }
+          this.updatePlayerDomSize()
         })
       },
       immediate: true
@@ -74,8 +77,7 @@ export default {
       let dom = this.$refs.container;
       let width = dom.parentNode.clientWidth
       let height = (9 / 16) * width
-
-      const clientHeight = Math.min(document.body.clientHeight, document.documentElement.clientHeight)
+      const clientHeight = Math.min(dom.parentNode.clientHeight?dom.parentNode.clientHeight:document.body.clientHeight, document.documentElement.clientHeight)
       if (height > clientHeight) {
         height = clientHeight
         width = (16 / 9) * height
@@ -87,7 +89,7 @@ export default {
     },
     create() {
       let options = {
-        container: this.$refs.container,
+        container: this.$refs.playerContainer,
         autoWasm: true,
         background: "",
         controlAutoHide: false,
@@ -257,6 +259,7 @@ export default {
     this.playing = false;
     this.loaded = false;
     this.performance = "";
+    window.removeEventListener('resize',this.updatePlayerDomSize);
   },
 }
 </script>

From ef07cf3b94f8e8c2cdac77b5a3c3244b0aa2b333 Mon Sep 17 00:00:00 2001
From: shangxingyu <harston@qq.com>
Date: Sat, 3 Feb 2024 12:27:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Swagger=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?access-token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channel/CommonChannelPlatformController.java |  6 ++++--
 .../iot/vmp/vmanager/group/GroupController.java  | 12 +++++++-----
 .../vmp/vmanager/region/RegionController.java    | 16 +++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelPlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelPlatformController.java
index 097b1152f..a9ece055a 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelPlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelPlatformController.java
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.vmanager.channel;
 import com.genersoft.iot.vmp.common.CommonGbChannel;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.genersoft.iot.vmp.service.ICommonGbChannelService;
@@ -17,6 +18,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -56,7 +58,7 @@ public class CommonChannelPlatformController {
     /**
      * 向上级平台添加国标通道
      */
-    @Operation(summary = "向上级平台添加国标通道")
+    @Operation(summary = "向上级平台添加国标通道", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @PostMapping("/add")
     @ResponseBody
     public void addChannelForGB(@RequestBody UpdateChannelParam param) {
@@ -85,7 +87,7 @@ public class CommonChannelPlatformController {
      * @param param 通道关联参数
      * @return
      */
-    @Operation(summary = "从上级平台移除国标通道")
+    @Operation(summary = "从上级平台移除国标通道", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @DeleteMapping("/delete")
     @ResponseBody
     public void delChannelForGB(@RequestBody UpdateChannelParam param) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/group/GroupController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/group/GroupController.java
index da171fbb6..67c6bf661 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/group/GroupController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/group/GroupController.java
@@ -1,12 +1,14 @@
 package com.genersoft.iot.vmp.vmanager.group;
 
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.service.IGroupService;
 import com.genersoft.iot.vmp.service.bean.Group;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.github.pagehelper.PageInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -26,7 +28,7 @@ public class GroupController {
     @Autowired
     private IGroupService groupService;
 
-    @Operation(summary = "添加区域")
+    @Operation(summary = "添加区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "group", description = "Group", required = true)
     @ResponseBody
     @PostMapping("/add")
@@ -34,7 +36,7 @@ public class GroupController {
         groupService.add(group);
     }
 
-    @Operation(summary = "查询区域")
+    @Operation(summary = "查询区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "query", description = "查询内容", required = true)
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
@@ -48,7 +50,7 @@ public class GroupController {
         return groupService.queryGroup(query, page, count);
     }
 
-    @Operation(summary = "更新区域")
+    @Operation(summary = "更新区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "group", description = "Group", required = true)
     @ResponseBody
     @PostMapping("/update")
@@ -56,7 +58,7 @@ public class GroupController {
         groupService.update(group);
     }
 
-    @Operation(summary = "删除区域")
+    @Operation(summary = "删除区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "groupDeviceId", description = "待删除的节点编号", required = true)
     @ResponseBody
     @GetMapping("/delete")
@@ -68,7 +70,7 @@ public class GroupController {
        }
     }
 
-    @Operation(summary = "查询区域的子节点")
+    @Operation(summary = "查询区域的子节点", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "groupParentId", description = "待查询的节点", required = true)
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
index c3d3105fd..909891f7c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.vmanager.region;
 
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.gb28181.bean.Gb28181CodeType;
 import com.genersoft.iot.vmp.service.IRegionService;
 import com.genersoft.iot.vmp.service.bean.Region;
@@ -8,6 +9,7 @@ import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.github.pagehelper.PageInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +29,7 @@ public class RegionController {
     @Autowired
     private IRegionService regionService;
 
-    @Operation(summary = "添加区域")
+    @Operation(summary = "添加区域",security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "region", description = "Region", required = true)
     @ResponseBody
     @PostMapping("/add")
@@ -35,7 +37,7 @@ public class RegionController {
         regionService.add(region);
     }
 
-    @Operation(summary = "查询区域")
+    @Operation(summary = "查询区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "query", description = "要搜索的内容", required = true)
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
@@ -49,7 +51,7 @@ public class RegionController {
         return regionService.query(query, page, count);
     }
 
-    @Operation(summary = "更新区域")
+    @Operation(summary = "更新区域" , security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "region", description = "Region", required = true)
     @ResponseBody
     @PostMapping("/update")
@@ -57,7 +59,7 @@ public class RegionController {
         regionService.update(region);
     }
 
-    @Operation(summary = "删除区域")
+    @Operation(summary = "删除区域" , security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "regionDeviceId", description = "区域编码", required = true)
     @ResponseBody
     @GetMapping("/delete")
@@ -69,7 +71,7 @@ public class RegionController {
         }
     }
 
-    @Operation(summary = "分页区域子节点")
+    @Operation(summary = "分页区域子节点", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "regionParentId", description = "行政区划父节点编号", required = true)
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
@@ -86,7 +88,7 @@ public class RegionController {
         return regionService.queryChildRegionList(regionParentId, page, count);
     }
 
-    @Operation(summary = "根据区域Id查询区域")
+    @Operation(summary = "根据区域Id查询区域", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "regionDeviceId", description = "行政区划节点编号", required = true)
     @ResponseBody
     @GetMapping("/one")
@@ -99,7 +101,7 @@ public class RegionController {
         return regionService.queryRegionByDeviceId(regionDeviceId);
     }
 
-    @Operation(summary = "获取所属的行政区划下的行政区划")
+    @Operation(summary = "获取所属的行政区划下的行政区划", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "parent", description = "所属的行政区划", required = false)
     @ResponseBody
     @GetMapping("/base/child/list")