fix

liuxiaolong

2020-03-08 c2ce35c96968a278acf5ea16bd650275b14ecf25

fix

 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)
    }