From b86069e44ba560f42acd6a4155350813961f0c65 Mon Sep 17 00:00:00 2001 From: qiushui Date: Thu, 17 Feb 2022 11:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A2=99=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhehekeji/web/controller/RealTimeController.java | 11 +++++++++++ web/src/main/resources/application-dev.yml | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java index 676e7f0..af1c690 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Api(value = "realTime",tags = "实时监控") @@ -39,6 +40,16 @@ public class RealTimeController { return Result.success(cameraService.allCameras()); } + @GetMapping("/wallStyle") + @ApiOperation(value = "视频墙样式") + //@SessionHandler + public Result> wallStyle() { + List styles = new ArrayList<>(2); + styles.add(configProperties.getVideoStyleConfig().getVideoStyleRow()); + styles.add(configProperties.getVideoStyleConfig().getVideoStyleColumn()); + return Result.success(styles); + } + @GetMapping("/videoServer") @ApiOperation(value = "视频服务器地址") public Result getVideoServer(){ diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 09b3800..04157a3 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -46,5 +46,5 @@ ksec: port: 9000 # ------------ 实时视频流 全部页面的格式 行列数量 videoStyleConfig: - videoStyleRow: 4 - videoStyleColumn: 3 + videoStyleRow: 2 + videoStyleColumn: 2