From a1bb1fb1e5ff5cf18a6d287dfa02978ec7ca8fa1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 20:32:07 +0800
Subject: [PATCH] update esutil
---
controllers/camera.go | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index e7105b2..374accf 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -85,6 +85,7 @@
err := c.BindJSON(&cam)
if err != nil {
+ logger.Debug("err:",err)
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
@@ -123,8 +124,8 @@
// @Produce json
// @Tags camera
// @Param cid path string true "鎽勫儚鏈篿d"
-// @Success 200 {string} json "{"code":200, success:true, msg:"璇锋眰澶勭悊鎴愬姛", data:"鎽勫儚鏈轰俊鎭�"}"
-// @Failure 500 {string} json "{"code":500, success:false msg:"",data:"閿欒淇℃伅鍐呭"}"
+// @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) {
var api dbapi.CameraApi
@@ -134,8 +135,35 @@
util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
return
}
-
- util.ResponseFormat(c, code.Success, camera)
+ //2019-11-02鏂板闇�姹傦紝鏄剧ず姣忎釜鎽勫儚鏈虹殑澶勭悊鏈嶅姟鍣ㄤ俊鎭�,褰掑睘鐨勮妭鐐规湇鍔″櫒鍚嶇О
+ m := util.Struct2Map(camera)
+ m["runServerName"] = ""
+ if camera.RunServerId !="" {
+ localConf, e := cache.GetServerInfo()
+ if e ==nil {
+ if camera.RunServerId == localConf.ServerId {//褰掑睘鏈彴鏈嶅姟鍣�
+ m["runServerName"] = localConf.ServerName
+ } else {//灞炰簬鍏朵粬鏈嶅姟鍣�
+ var clusterApi dbapi.ClusterApi
+ b, data := clusterApi.FindCluster()
+ if b && data !=nil {
+ cb, _ := json.Marshal(data)
+ var clu ClusterDb
+ if err := json.Unmarshal(cb, &clu);err ==nil {
+ if len(clu.Nodes) >0 {
+ for _,n :=range clu.Nodes {
+ if camera.RunServerId == n.NodeId {
+ m["runServerName"] = n.NodeName
+ break
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ util.ResponseFormat(c, code.Success, m)
}
@@ -170,9 +198,9 @@
return json.Marshal(test)
}
+// @Security ApiKeyAuth
// @Summary 灏嗘憚鍍忔満鎸傚埌鎸囧畾鐨勭洰褰曟爲涓�
// @Description 灏嗘憚鍍忔満鎸傚埌鎸囧畾鐨勭洰褰曟爲涓�
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param cameraId path string true "鎽勫儚鏈篿d"
@@ -187,9 +215,9 @@
fmt.Println(areaId)
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎鏌愪竴涓洰褰曟爲涓嬬殑鎸囧畾鎽勫儚鏈�
// @Description 鍒犻櫎鏌愪竴涓洰褰曟爲涓嬬殑鎸囧畾鎽勫儚鏈�
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param cameraId path string true "鎽勫儚鏈篿d"
@@ -204,9 +232,9 @@
fmt.Println(areaId)
}
+// @Security ApiKeyAuth
// @Summary 鏍规嵁server鑾峰彇鎵�鏈夋憚鍍忔満鍒楄〃鍙婁俊鎭�
// @Description 鏍规嵁server鑾峰彇鎵�鏈夋憚鍍忔満鍒楄〃鍙婁俊鎭�
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param cameraName query string false "鎽勫儚鏈哄悕绉�"
@@ -230,9 +258,9 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
// @Description 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param runType query int true "0锛氭煡杞锛�1锛氭煡瀹炴椂"
@@ -263,9 +291,10 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
// @Description 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
-// @Security ApiKeyAuth
+// @Accept x-www-form-urlencoded
// @Produce json
// @Tags camera
// @Param cameraId formData string true "鎽勫儚鏈篿d"
@@ -292,9 +321,9 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鏇存柊搴曞浘
// @Description 鍒锋柊搴曞浘
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param cid path string true "鎽勫儚鏈篿d"
@@ -318,9 +347,9 @@
RunType int `json:"run_type"`
}
+// @Security ApiKeyAuth
// @Summary 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
// @Description 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param changeRunBody body controllers.CameraChangeRunVo true "鍙傛暟缁撴瀯浣�,0锛氬疄鏃跺垏杞锛�1锛氳疆璇㈠垏瀹炴椂"
@@ -343,9 +372,9 @@
}
}
+// @Security ApiKeyAuth
// @Summary 缁熻瀹炴椂鍜岃疆璇㈢殑杩愯璺暟鎯呭喌
// @Description 缁熻瀹炴椂鍜岃疆璇㈢殑杩愯璺暟鎯呭喌
-// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
--
Gitblit v1.8.0