add GetAllCamerasByServer api

liuxiaolong

2019-10-11 1b28cea6846f5f3c904ce783f83097f0ee8662e9

add GetAllCamerasByServer api

 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

 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

 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=

 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")