From 6b6efb6dc9797b04aae9f66de15507a95a84b9cd Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 三月 2020 18:39:26 +0800
Subject: [PATCH] add camera resolution
---
controllers/camera.go | 38 ++++++++++++++++++++++++++++++++------
controllers/cameraTask.go | 4 ++--
2 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index bea1cc0..c660dca 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -41,7 +41,15 @@
RunType int `json:"run_type"` //澶勭悊绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃�
RunServerId string `json:"run_server_id"` //褰撳墠姝ｅ湪澶勭悊鐨勫垎鏋愭湇鍔″櫒id
+ ResolutionWidth int `json:"resolution_width"`//鍒嗚鲸鐜囧
+ ResolutionHeight int `json:"resolution_height"`//鍒嗚鲸鐜囬珮
+
Sensors []SensorVo `json:"sensors"` //浼犳劅鍣ㄥ垪琛�
+}
+
+type Resolution struct {
+ Width int `json:"width"`
+ Height int `json:"height"`
}
type SensorVo struct {
@@ -66,7 +74,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:"娣诲姞鍚庣殑鎽勫儚鏈轰俊鎭�"}"
// @Failure 500 {string} json "{"code":500, success:false msg:"null ",data:"閿欒淇℃伅鍐呭"}"
// @Router /data/api-v/camera/add [post]
-func (ac CameraController) CameraAdd(c *gin.Context) {
+func (cc CameraController) CameraAdd(c *gin.Context) {
var cam CameraVo
var api dbapi.CameraApi
@@ -95,7 +103,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:"淇敼鍚庣殑鎽勫儚鏈轰俊鎭�"}"
// @Failure 500 {string} json "{"code":500, success:false msg:"null",data:"閿欒淇℃伅鍐呭"}"
// @Router /data/api-v/camera/update [put]
-func (ac CameraController) CameraUpdate(c *gin.Context) {
+func (cc CameraController) CameraUpdate(c *gin.Context) {
var cam CameraVo
var api dbapi.CameraApi
@@ -123,7 +131,7 @@
// @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/del/{cid} [delete]
-func (ac CameraController) CameraDel(c *gin.Context) {
+func (cc CameraController) CameraDel(c *gin.Context) {
var api dbapi.CameraApi
cid := c.Param("cid")
logger.Debug("CameraDel.cid:",cid)
@@ -143,7 +151,7 @@
// @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/show/{cid} [get]
-func (ac CameraController) CameraSel(c *gin.Context) {
+func (cc CameraController) CameraSel(c *gin.Context) {
var api dbapi.CameraApi
cid := c.Param("cid")
camera, err := api.GetCameraById(cid)
@@ -154,6 +162,12 @@
//2019-11-02鏂板闇�姹傦紝鏄剧ず姣忎釜鎽勫儚鏈虹殑澶勭悊鏈嶅姟鍣ㄤ俊鎭�,褰掑睘鐨勮妭鐐规湇鍔″櫒鍚嶇О
m := util.Struct2Map(camera)
m["runServerName"] = ""
+ //鎽勫儚鏈哄垎杈ㄧ巼
+ dResolution := Resolution{
+ Width: 0,
+ Height: 0,
+ }
+ m["resolutions"] = []Resolution{ dResolution }
if camera.RunServerId !="" {
localConf, e := cache.GetServerInfo()
if e ==nil {
@@ -225,7 +239,7 @@
// @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/updateCameraArea [post]
-func (ac CameraController) UpdateCameraArea(c *gin.Context) {
+func (cc CameraController) UpdateCameraArea(c *gin.Context) {
cameraId := c.PostForm("cameraId")
areaId := c.PostForm("areaId")
if cameraId == "" || areaId == "" {
@@ -250,7 +264,7 @@
// @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/cameraAreaDel [get]
-func (ac CameraController) CameraAreaDel(c *gin.Context) {
+func (cc CameraController) CameraAreaDel(c *gin.Context) {
cameraId := c.Param("cameraId")
areaId := c.Param("areaId")
fmt.Println(cameraId)
@@ -444,4 +458,16 @@
}
}
+/*
+// @Security ApiKeyAuth
+// @Summary 鑾峰彇鎽勫儚鏈哄垎杈ㄧ巼
+// @Description 鑾峰彇鍒嗚鲸鐜�
+// @Produce json
+// @Tags camera
+// @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/resolution/{cid} [get]
+func (cc CameraController) Resolution(c *gin.Context) {
+}
+*/
diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 52a817c..a3130f0 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -160,7 +160,7 @@
// @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/saveTask [post]
-func (ac CameraController) CameraTaskSave(c *gin.Context) {
+func (cc CameraController) CameraTaskSave(c *gin.Context) {
var saveBody CameraTaskSaveArg
err := c.BindJSON(&saveBody)
if err != nil {
@@ -218,7 +218,7 @@
// @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/delTask/{cameraId}/{taskId} [delete]
-func (ac CameraController) CameraDelTask(c *gin.Context) {
+func (cc CameraController) CameraDelTask(c *gin.Context) {
cameraId := c.Param("cameraId")
taskId := c.Param("taskId")
if cameraId == "" || taskId == "" {
--
Gitblit v1.8.0