From 1ac7844c36bb1993f1025a7d47441e8851fde452 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 6 Jan 2023 09:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../leaper/web/controller/RealTimeController.java   |  8 ++++++++
 web/src/main/java/com/leaper/web/entity/Street.java |  5 +++++
 .../java/com/leaper/web/pojo/camera/AreaCamera.java | 13 +++++++++++++
 .../com/leaper/web/service/RealTimeService.java     | 11 +++++++----
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 web/src/main/java/com/leaper/web/pojo/camera/AreaCamera.java

diff --git a/web/src/main/java/com/leaper/web/controller/RealTimeController.java b/web/src/main/java/com/leaper/web/controller/RealTimeController.java
index 789ad03..b95e2f3 100644
--- a/web/src/main/java/com/leaper/web/controller/RealTimeController.java
+++ b/web/src/main/java/com/leaper/web/controller/RealTimeController.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 @Api(value = "realTime",tags = "实时监控")
 @RestController
@@ -40,6 +41,13 @@ public class RealTimeController {
         return Result.success(cameraService.allCameras());
     }
 
+    @GetMapping("/allAreas")
+    @ApiOperation(value = "全部库区")
+    //@SessionHandler
+    public Result<Set<String>> allAreas() {
+        return Result.success(realTimeService.allAreas());
+    }
+
     @GetMapping("/wallStyle")
     @ApiOperation(value = "视频墙样式")
     //@SessionHandler
diff --git a/web/src/main/java/com/leaper/web/entity/Street.java b/web/src/main/java/com/leaper/web/entity/Street.java
index cf8e9f5..3fa1534 100644
--- a/web/src/main/java/com/leaper/web/entity/Street.java
+++ b/web/src/main/java/com/leaper/web/entity/Street.java
@@ -57,4 +57,9 @@ public class Street {
     private Integer videoStyleRow;
 
     private Integer videoStyleColumn;
+
+    /**
+     * 库区
+     */
+    private String area;
 }
diff --git a/web/src/main/java/com/leaper/web/pojo/camera/AreaCamera.java b/web/src/main/java/com/leaper/web/pojo/camera/AreaCamera.java
new file mode 100644
index 0000000..accfcd2
--- /dev/null
+++ b/web/src/main/java/com/leaper/web/pojo/camera/AreaCamera.java
@@ -0,0 +1,13 @@
+package com.leaper.web.pojo.camera;
+
+import lombok.Data;
+
+@Data
+public class AreaCamera {
+
+    private Integer id;
+
+    private String rtcServer;
+
+    private Integer rtcServerPort;
+}
diff --git a/web/src/main/java/com/leaper/web/service/RealTimeService.java b/web/src/main/java/com/leaper/web/service/RealTimeService.java
index 2d01868..675d945 100644
--- a/web/src/main/java/com/leaper/web/service/RealTimeService.java
+++ b/web/src/main/java/com/leaper/web/service/RealTimeService.java
@@ -10,10 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 实时视频流
@@ -64,5 +62,10 @@ public class RealTimeService {
 
     }
 
+    public Set<String> allAreas(){
+        List<Street> streets = streetMapper.selectByMap(new HashMap<>());
+        return streets.stream().collect(Collectors.groupingBy(Street::getArea)).keySet();
+    }
+
 
 }