---

panlei

2019-08-05 122f28e8be52678a2d3c6cc2d8d545a33cbf1957

---

 labelFilter/readyDataForLabel.go

@@ -17,20 +17,22 @@
}
// 把数据装配到label
func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
    label.CameraId = result.Cid
    camera, err := cache.GetCameraById(result.Cid)
    if err != nil {
        logger.Error("查询摄像机信息出错")
    }
    label.CameraName = camera.Name
    label.CameraAddr = camera.Addr
    label.TaskId = result.Tasklab.Taskid
    for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
        label.Persons = append(label.Persons,faceGroup)
        label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
    }
    for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
        label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
    if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0) {
        label.CameraId = result.Cid
        camera, err := cache.GetCameraById(result.Cid)
        if err != nil {
            logger.Error("查询摄像机信息出错")
        }
        label.CameraName = camera.Name
        label.CameraAddr = camera.Addr
        label.TaskId = result.Tasklab.Taskid
        for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
            label.Persons = append(label.Persons,faceGroup)
            label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
        }
        for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
            label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
        }
    }
}


 labelFilter/ruleForLabel.go

@@ -15,6 +15,11 @@
    // 装配成自己可以识别的数据
    label := new(Label)
    label.DataFormatToLabel(result)
    logger.Info("label的信息：",label.CameraName,label.DefenceLevel,label.Time)
    if label.CameraName == "" {
        logger.Error("无效数据，直接返回")
        return
    }
    //拿到所有规则组
    var api dbapi.EventPushApi
    b,allRules := api.FindAllDetails()