qixiaoning
2 天以前 c3fd4effdef0cc5955f89b5df279b14841e857f5
chanmanage-service/controllers/pollSet.go
@@ -280,13 +280,25 @@
         // } else {
         //    cri.Tasks = []vo.CameraRunTask{}
         // }
         var ids []string
         var ids []string = []string{}
         ids = append(ids, cE.Id)
         cri.AllTasks, _ = models.GetListTask(ids)
         tasks, _ := models.GetListTask(ids)
         //rules
         ruleMap := models.GetAllRule()
         cri.AllTasks = []commonModel.TaskM{}
         for _, item := range tasks {
            temp := &commonModel.TaskM{
               TaskName:        item.TaskName,
               EventName:       item.EventName,
               TaskDescription: ruleMap[item.TaskId],
            }
            cri.AllTasks = append(cri.AllTasks, *temp)
         }
         //处理摄像机的状态
         if cE.RunType == commonModel.TYPE_RUNTYPE_POLL || cE.RunType == commonModel.TYPE_RUNTYPE_REALTIME {
            if crInfo, ok := ruleM[cE.Id]; ok && crInfo.Rules != nil && len(crInfo.Rules) > 0 {
            if cri.AllTasks != nil && len(cri.AllTasks) > 0 {
               if cE.IsRunning {
                  cri.Status = commonModel.Camera_Status_Doing
               } else {