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 5fd8d84..49df04c 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -40,6 +40,27 @@ public class RealTimeController { return Result.success(cameraService.allCameras()); } + @GetMapping("/allCameras1") + @ApiOperation(value = "全部球机1") + //@SessionHandler + public Result> allCameras1() { + return Result.success(cameraService.allCameras1()); + } + + @GetMapping("/allCameras2") + @ApiOperation(value = "全部球机2") + //@SessionHandler + public Result> allCameras2() { + return Result.success(cameraService.allCameras2()); + } + + @GetMapping("/allCameras3") + @ApiOperation(value = "全部球机3") + //@SessionHandler + public Result> allCameras3() { + return Result.success(cameraService.allCameras3()); + } + @GetMapping("/wallStyle") @ApiOperation(value = "视频墙样式") //@SessionHandler diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 982e811..5581b78 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -36,6 +36,7 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.stream.Collectors; @Service @Slf4j @@ -160,9 +161,44 @@ public class CameraService { } public List allCameras(){ + return cameraMapper.selectByMap(new HashMap<>()); } + /** + * HD01 - HD05 + * @return + */ + public List allCameras1(){ + + List cameras = cameraMapper.selectByMap(new HashMap<>()); + return cameras.stream().filter(camera -> { + int index = Integer.valueOf(camera.getName().substring(2, 4)); + boolean b = index >= 1 && index <= 5; + return b; + }).collect(Collectors.toList()); + } + + public List allCameras2(){ + + List cameras = cameraMapper.selectByMap(new HashMap<>()); + return cameras.stream().filter(camera -> { + int index = Integer.valueOf(camera.getName().substring(2, 4)); + boolean b = index >= 6 && index <= 10; + return b; + }).collect(Collectors.toList()); + } + + public List allCameras3(){ + + List cameras = cameraMapper.selectByMap(new HashMap<>()); + return cameras.stream().filter(camera -> { + int index = Integer.valueOf(camera.getName().substring(2, 4)); + boolean b = index >= 11 && index <= 15; + return b; + }).collect(Collectors.toList()); + } + /** * 导入IO配置 *