fix 规则组可能为空的bug

panlei

2019-09-12 0646ffa55a7a75d1a6f64d254fb97acf18bc4c1b

fix 规则组可能为空的bug

 insertdata/insertDataToEs.go

@@ -453,46 +453,9 @@
                }
                requstbody, err := json.Marshal(peraction)

//<<<<<<< HEAD
//            url = append(url, resp["fileUrl"].(string))
//            esDataId := uuid.NewV4().String()
//            linksId := ""
//            if linkId != "" {
//                linksId = linkId
//            }
//            peraction := Personaction{
//                esDataId,
//                msg.Cid,
//                camera.Name,
//                camera.Addr,
//                msg.Tasklab.Taskid,
//                msg.Tasklab.Taskname,
//                sdkNames,
//                "",
//                alarmRules,
//                localConfig.ServerId,
//                localConfig.ServerName,
//                serverIp,
//                "",
//                url,
//                i.Timestamp,
//                linksId,
//                "",
//                isAlarm,
//                0,
//                0,
//                0,
//            }
//            requstbody, err := json.Marshal(peraction)
//
//            if err != nil {
//                logger.Info("json parse error ", err)
//                return
//=======
                if err != nil {
                    logger.Info("json parse error ", err)
                    return
//>>>>>>> labelFilter

                }
                resp1, err2 := EsReq("POST", personAction, requstbody)

 ruleserver/readyDataForRule.go

@@ -81,10 +81,14 @@
        }
    }
    logger.Debug("当前数据帧要匹配的规则组：-------------------------","摄像机id:",cameraId,"任务id",taskId)
    for _,ruleGroup := range taskGroup.GroupRules{
        logger.Info(ruleGroup.GroupText)
    if taskGroup == nil  {
        return nil
    } else {
        for _,ruleGroup := range taskGroup.GroupRules{
            logger.Info(ruleGroup.GroupText)
        }
        return taskGroup
    }
    return taskGroup
}

// 根据摄像机id拿到摄像机所有区域