From 2df8219ba063f36122970bf1fe025e2e08589fca Mon Sep 17 00:00:00 2001
From: qiushui <wangyiming1031@aliyun.com>
Date: Tue, 18 Jan 2022 16:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8=E7=90=83?=
 =?UTF-8?q?=E6=9C=BA=20=E5=85=A8=E9=83=A8=E5=B7=B7=E9=81=93=E8=A1=97?=
 =?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhehekeji/web/controller/RealTimeController.java  | 11 +++++++++++
 .../zhehekeji/web/controller/StreetController.java    |  8 ++++++++
 .../java/com/zhehekeji/web/service/CameraService.java |  4 ++++
 .../java/com/zhehekeji/web/service/StreetService.java |  4 ++++
 4 files changed, 27 insertions(+)

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 dda7097..676e7f0 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java
@@ -2,7 +2,9 @@ package com.zhehekeji.web.controller;
 
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.web.config.ConfigProperties;
+import com.zhehekeji.web.entity.Camera;
 import com.zhehekeji.web.pojo.realTime.RealTime;
+import com.zhehekeji.web.service.CameraService;
 import com.zhehekeji.web.service.RealTimeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +22,8 @@ public class RealTimeController {
     private RealTimeService realTimeService;
     @Resource
     private ConfigProperties configProperties;
+    @Resource
+    private CameraService cameraService;
 
     @PostMapping("")
     @ApiOperation(value = "实时列表")
@@ -28,6 +32,13 @@ public class RealTimeController {
         return Result.success(realTimeService.realTimes());
     }
 
+    @GetMapping("/allCameras")
+    @ApiOperation(value = "全部球机")
+    //@SessionHandler
+    public Result<List<Camera>> allCameras() {
+        return Result.success(cameraService.allCameras());
+    }
+
     @GetMapping("/videoServer")
     @ApiOperation(value = "视频服务器地址")
     public Result<String> getVideoServer(){
diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java
index 4a7ce37..849b1ce 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Api(value = "StreetController",tags = "巷道管理")
 @RestController(value = "StreetController")
@@ -28,6 +29,13 @@ public class StreetController {
         return new Result<>(streetService.page(search));
     }
 
+    @GetMapping("/list")
+    @ApiOperation(value = "全部巷道")
+    //@SessionHandler
+    public Result<List<StreetVO>> list() {
+        return new Result(streetService.list());
+    }
+
     @PostMapping("")
     @ApiOperation(value = "巷道新增")
     public Result add(@RequestBody Street street){
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 1de328a..cffc419 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
@@ -87,6 +87,10 @@ public class CameraService {
         return new PageInfo<>(cameras);
     }
 
+    public List<Camera> allCameras(){
+        return cameraMapper.selectByMap(new HashMap<>());
+    }
+
     /**
      * 导入IO配置
      *
diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java
index 5a56552..804b693 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java
@@ -151,4 +151,8 @@ public class StreetService {
         return new PageInfo<>(streetVOS);
     }
 
+    public List<StreetVO> list(){
+        return streetMapper.list();
+    }
+
 }