From 1b28cea6846f5f3c904ce783f83097f0ee8662e9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 14:59:28 +0800
Subject: [PATCH] add GetAllCamerasByServer api
---
controllers/camera.go | 26 ++++++++++++++++++++++++++
go.sum | 4 ++--
go.mod | 2 +-
router/router.go | 1 +
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index 7e484ef..47abb25 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -5,6 +5,7 @@
"fmt"
"strconv"
"basic.com/valib/logger.git"
+ "webserver/cache"
"github.com/gin-gonic/gin"
@@ -197,6 +198,31 @@
fmt.Println(areaId)
}
+// @Summary 鏍规嵁server鑾峰彇鎵�鏈夋憚鍍忔満鍒楄〃鍙婁俊鎭�
+// @Description 鏍规嵁server鑾峰彇鎵�鏈夋憚鍍忔満鍒楄〃鍙婁俊鎭�
+// @Produce json
+// @Tags camera
+// @Param cameraName query string false "鎽勫儚鏈哄悕绉�"
+// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
+// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
+// @Router /data/api-v/camera/getAllCamerasByServer [get]
+func (cc CameraController) GetAllCamerasByServer(c *gin.Context) {
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ util.ResponseFormat(c,code.ComError,"鏈嶅姟鍣ㄦ湰鏈烘湭閰嶇疆serverId")
+ return
+ }
+ var api dbapi.CameraApi
+ cameraName := c.Query("cameraName")
+ b,d := api.GetAllCamerasByServer(localConf.ServerId, cameraName)
+ if b {
+ util.ResponseFormat(c,code.Success, d)
+ } else {
+ util.ResponseFormat(c,code.ComError, "")
+ }
+}
+
// @Summary 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
// @Description 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
// @Produce json
diff --git a/go.mod b/go.mod
index d858d04..d3b1d92 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20190928095850-a32d6c8af6e9 // indirect
+ basic.com/dbapi.git v0.0.0-20191011065050-af1996626aff // indirect
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
basic.com/pubsub/esutil.git v0.0.0-20190807083318-4431a8860d47
diff --git a/go.sum b/go.sum
index 7882d9b..0c34736 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20190928095850-a32d6c8af6e9 h1:elKxEm2v6fhuw1XidzOVuSBIl2xgMH64/LtsBBnqPCE=
-basic.com/dbapi.git v0.0.0-20190928095850-a32d6c8af6e9/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20191011065050-af1996626aff h1:i5Wy5xv58/wUIgQxGKeRK0Jj6kUy7Bk7WmQMH794rQ4=
+basic.com/dbapi.git v0.0.0-20191011065050-af1996626aff/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
diff --git a/router/router.go b/router/router.go
index dfc13e6..e548e2b 100644
--- a/router/router.go
+++ b/router/router.go
@@ -97,6 +97,7 @@
camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
+ camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
--
Gitblit v1.8.0