From adb478c329c669f8709593d16dddffc0505e71ee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期三, 10 七月 2019 16:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/area.go | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/controllers/area.go b/controllers/area.go
index 9825af2..4d5771f 100644
--- a/controllers/area.go
+++ b/controllers/area.go
@@ -28,10 +28,27 @@
parentIdStr := c.Query("parentid")
searchTypeStr := c.Query("searchType")
cameraName := c.Query("cameraName")
- treeType := c.Query("type")
var api dbapi.AreaApi
- arr := api.GetLocalCameraTree(parentIdStr, searchTypeStr, cameraName, treeType)
+ arr := api.GetLocalCameraTree(parentIdStr, searchTypeStr, cameraName)
+ util.ResponseFormat(c, code.Success, arr)
+}
+
+// @Summary 鏄剧ずGb28181鏍戝舰缁撴瀯
+// @Description 鏄剧ずGb28181鏍戝舰缁撴瀯
+// @Produce json
+// @Tags menu
+// @Param parentid query int true "鍖哄煙鐨刬d"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁"}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅"}"
+// @Router /data/api-v/area/localmenu [get]
+func (ac AreaController) CameraGb28181Tree(c *gin.Context) {
+ parentIdStr := c.Query("parentid")
+ searchTypeStr := c.Query("searchType")
+ cameraName := c.Query("cameraName")
+
+ var api dbapi.AreaApi
+ arr := api.GetGb28181CameraTree(parentIdStr, searchTypeStr, cameraName)
util.ResponseFormat(c, code.Success, arr)
}
--
Gitblit v1.8.0