From 0222e79afe45d9fc55aed9a7e62ca239c228ab73 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 23 十二月 2019 10:24:12 +0800
Subject: [PATCH] add sys comeback sh
---
controllers/camera.go | 110 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 11 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index b800bb7..e9dc4ee 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -4,7 +4,8 @@
"encoding/json"
"fmt"
"strconv"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
+ "webserver/cache"
"github.com/gin-gonic/gin"
@@ -19,6 +20,7 @@
type CameraVo struct {
Id string `json:"id"`
Name string `json:"name"`
+ Alias string `json:"alias"` //鎽勫儚鏈虹殑鍒悕
Type int `json:"type" `
Addr string `json:"addr"`
Areaid string `json:"areaid"`
@@ -40,6 +42,7 @@
// @Summary 娣诲姞鎽勫儚鏈�
// @Description "浼犲叆鍖哄煙鐨刬d锛坅reaid锛夊拰鎽勫儚鏈哄悕瀛�(name) 蹇呴』锛� 鍏朵粬鍙傛暟鍙互鍦ㄦ憚鍍忔満閰嶇疆鐐瑰嚮淇濆瓨杩涜娣诲姞"
+// @Security ApiKeyAuth
// @Accept json
// @Produce json
// @Tags camera
@@ -56,10 +59,10 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
- cam.Id = util.PseudoUuid()
paramBody := util.Struct2Map(cam)
- if api.CameraAdd(paramBody) {
- util.ResponseFormat(c, code.Success, cam)
+ b, data := api.CameraAdd(paramBody)
+ if b {
+ util.ResponseFormat(c, code.Success, data)
return
}
util.ResponseFormat(c, code.ComError, err)
@@ -68,6 +71,7 @@
// @Summary 鏇存柊鎽勫儚鏈�
// @Description "鐢ㄤ簬鏇存柊鎽勫儚鏈烘搷浣�"
+// @Security ApiKeyAuth
// @Accept json
// @Produce json
// @Tags camera
@@ -81,6 +85,7 @@
err := c.BindJSON(&cam)
if err != nil {
+ logger.Debug("err:",err)
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
@@ -95,6 +100,7 @@
// @Summary "鍒犻櫎鎽勫儚鏈�"
// @Description "鏍规嵁鎽勫儚鏈篿d鍒犻櫎鎽勫儚鏈�"
+// @Security ApiKeyAuth
// @Produce json
// @Tags camera
// @Param cid path string true "鎽勫儚鏈篿d example: cid0"
@@ -114,11 +120,12 @@
// @Summary 鏄剧ず鎽勫儚鏈�
// @Description "鏄剧ず鎽勫儚鏈�"
+// @Security ApiKeyAuth
// @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
@@ -128,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)
}
@@ -164,6 +198,7 @@
return json.Marshal(test)
}
+// @Security ApiKeyAuth
// @Summary 灏嗘憚鍍忔満鎸傚埌鎸囧畾鐨勭洰褰曟爲涓�
// @Description 灏嗘憚鍍忔満鎸傚埌鎸囧畾鐨勭洰褰曟爲涓�
// @Produce json
@@ -180,6 +215,7 @@
fmt.Println(areaId)
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎鏌愪竴涓洰褰曟爲涓嬬殑鎸囧畾鎽勫儚鏈�
// @Description 鍒犻櫎鏌愪竴涓洰褰曟爲涓嬬殑鎸囧畾鎽勫儚鏈�
// @Produce json
@@ -196,6 +232,33 @@
fmt.Println(areaId)
}
+// @Security ApiKeyAuth
+// @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, "")
+ }
+}
+
+// @Security ApiKeyAuth
// @Summary 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
// @Description 鑾峰彇杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
// @Produce json
@@ -228,12 +291,14 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
// @Description 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
+// @Accept x-www-form-urlencoded
// @Produce json
// @Tags camera
-// @Param cameraId query string true "鎽勫儚鏈篿d"
-// @Param runEnable query bool true "寮�鍚細true锛屽叧闂細false"
+// @Param cameraId formData string true "鎽勫儚鏈篿d"
+// @Param runEnable formData bool true "寮�鍚細true锛屽叧闂細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/updateRunEnable [post]
@@ -256,6 +321,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鏇存柊搴曞浘
// @Description 鍒锋柊搴曞浘
// @Produce json
@@ -273,7 +339,10 @@
util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
return
}
- util.ResponseFormat(c, code.Success, filename)
+ util.ResponseFormat(c, code.Success, map[string]string{
+ "cameraId": cid,
+ "snapshotUrl": filename,
+ })
}
type CameraChangeRunVo struct {
@@ -281,6 +350,7 @@
RunType int `json:"run_type"`
}
+// @Security ApiKeyAuth
// @Summary 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
// @Description 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
// @Produce json
@@ -305,4 +375,22 @@
}
}
+// @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/statisticRunInfo [get]
+func (cc CameraController) StatisticRunInfo(c *gin.Context) {
+ var api dbapi.CameraApi
+ b, d := api.StatisticRunInfo()
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
+}
+
--
Gitblit v1.8.0