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> 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 allAreas(){ + List streets = streetMapper.selectByMap(new HashMap<>()); + return streets.stream().collect(Collectors.groupingBy(Street::getArea)).keySet(); + } + }