From c2ce35c96968a278acf5ea16bd650275b14ecf25 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期日, 08 三月 2020 11:55:43 +0800
Subject: [PATCH] fix

---
 controllers/cameraTask.go |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go
index 5cb8231..7ae01fb 100644
--- a/controllers/cameraTask.go
+++ b/controllers/cameraTask.go
@@ -96,12 +96,12 @@
 	flag, data := api.FindTasksByCameraIds(mulCamera.CameraIds)
 	if flag {
 		bytes, _ := json.Marshal(data)
-		var camTInfo CameraTaskInfoVo
+		var camTInfo []CameraTaskInfoVo
 		json.Unmarshal(bytes, &camTInfo)
+
 		//澶勭悊宸茶鍒犻櫎鐨勪换鍔�
-		aTasks := camTInfo.Tasks
 
-
+		var delTasks []models.Task
 		var taskApi dbapi.TaskApi
 		taskInfos := taskApi.FindAll()
 		m := make(map[string]string)
@@ -119,7 +119,7 @@
 					if _,ok := m[tM["taskId"].(string)];!ok {//琛ㄧず姝や换鍔″凡琚垹闄�
 						taskId := tM["taskId"].(string)
 						m[taskId] = taskId
-						aTasks = append(aTasks, models.Task{
+						delTasks = append(delTasks, models.Task{
 							Taskid:	taskId,
 							Taskname: tM["taskName"].(string),
 							DelFlag: true,
@@ -128,8 +128,19 @@
 				}
 			}
 		}
-		camTInfo.Tasks = aTasks
-		util.ResponseFormat(c,code.Success, camTInfo)
+		var result []CameraTaskInfoVo
+		if camTInfo != nil {
+			for _, camIn := range camTInfo {
+				nIfn := CameraTaskInfoVo{
+					Camera: camIn.Camera,
+					Polygon: camIn.Polygon,
+					Tasks: append(camIn.Tasks, delTasks...),
+				}
+				result = append(result, nIfn)
+			}
+		}
+
+		util.ResponseFormat(c,code.Success, result)
 	} else {
 		util.ResponseFormat(c,code.ComError,data)
 	}

--
Gitblit v1.8.0