From 53f2a1ea4ef030f9f4ba2f5faced661ea39a9755 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 18:56:47 +0800
Subject: [PATCH] rm nouse method

---
 controllers/es.go |   82 ++++++++++++++++++++--------------------
 1 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/controllers/es.go b/controllers/es.go
index f3dd501..68937db 100644
--- a/controllers/es.go
+++ b/controllers/es.go
@@ -117,47 +117,47 @@
 // @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/queryCameraAndTaskInfo [get]
-func (ac *CameraController) QueryCameraAndTaskInfo(c *gin.Context) {
-	var cam models.Camera
-	rows := cam.FindAllCamTask()
-
-	if len(rows) == 0 {
-		util.ResponseFormat(c, code.ComError, "娌℃湁璁板綍")
-		return
-	}
-	camList := make([]map[string]interface{}, 0, 5)
-	for _, cam := range rows {
-		newCam := make(map[string]interface{})
-		newCam["cameraid"] = cam.Id
-		newCam["rtspUrl"] = cam.Rtsp
-		tasks := cam.CamTask
-		taskList := make([]map[string]interface{}, 0)
-		if tasks != nil {
-			taskmap := make(map[string]interface{})
-			for _, task := range tasks {
-				taskId := taskmap[task.Taskid]
-				if taskId != nil {
-					cameraTasks := taskmap[task.Taskid].([]models.CameraTask)
-					cameraTasks = append(cameraTasks, task)
-					taskmap[task.Taskid] = cameraTasks
-				} else {
-					cameraTasks := make([]models.CameraTask, 0)
-					taskmap[task.Taskid] = append(cameraTasks, task)
-				}
-			}
-			for key, value := range taskmap {
-				i := make(map[string]interface{})
-				i["taskid"] = key
-				i["sdklist"] = value
-				taskList = append(taskList, i)
-			}
-		}
-		newCam["tasklist"] = taskList
-		camList = append(camList, newCam)
-	}
-	c.JSON(200, camList)
-
-}
+//func (ac *CameraController) QueryCameraAndTaskInfo(c *gin.Context) {
+//	var cam models.Camera
+//	rows := cam.FindAllCamTask()
+//
+//	if len(rows) == 0 {
+//		util.ResponseFormat(c, code.ComError, "娌℃湁璁板綍")
+//		return
+//	}
+//	camList := make([]map[string]interface{}, 0, 5)
+//	for _, cam := range rows {
+//		newCam := make(map[string]interface{})
+//		newCam["cameraid"] = cam.Id
+//		newCam["rtspUrl"] = cam.Rtsp
+//		tasks := cam.CamTask
+//		taskList := make([]map[string]interface{}, 0)
+//		if tasks != nil {
+//			taskmap := make(map[string]interface{})
+//			for _, task := range tasks {
+//				taskId := taskmap[task.Taskid]
+//				if taskId != nil {
+//					cameraTasks := taskmap[task.Taskid].([]models.CameraTask)
+//					cameraTasks = append(cameraTasks, task)
+//					taskmap[task.Taskid] = cameraTasks
+//				} else {
+//					cameraTasks := make([]models.CameraTask, 0)
+//					taskmap[task.Taskid] = append(cameraTasks, task)
+//				}
+//			}
+//			for key, value := range taskmap {
+//				i := make(map[string]interface{})
+//				i["taskid"] = key
+//				i["sdklist"] = value
+//				taskList = append(taskList, i)
+//			}
+//		}
+//		newCam["tasklist"] = taskList
+//		camList = append(camList, newCam)
+//	}
+//	c.JSON(200, camList)
+//
+//}
 
 func searchEsData(searchBody models.EsSearch) map[string]interface{} {
 	//璇锋眰绱㈠紩

--
Gitblit v1.8.0