把人体追踪从es最前改为放在规则最后

panlei

2019-10-31 355284a3ac944515951d4c2a7ec5d3964fb13857

把人体追踪从es最前改为放在规则最后

 insertdata/insertDataToEs.go

@@ -165,20 +165,7 @@
    videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
    personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
    InsertFace(msg, "")
    // 如果标签中含有持续时间首次报警的timeLabel的话则不需要过人体追踪，不然就没的插入了
    fk := ruleserver.TrackOrNot(msg.RuleResult)
    if fk {
        InsertYolo(msg, "")
        //if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
        //    logger.Warn("捕捉188摄像机的持续时间任务.....")
        //    os.Exit(1)
        //}
    } else {
        flag := ruleserver.BodyIsSame(msg.SdkMessage)
        if !flag {
            InsertYolo(msg, "")
        }
    }
    InsertYolo(msg, "")
}

// 往es中插入人脸数据

 labelFilter/readyDataForLabel.go

@@ -38,6 +38,7 @@
            }
        }
        if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {

            for _,yoloGroup := range result.RuleResult["yolo"].([]structure.Result) {
                label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
            }

 labelFilter/ruleForLabel.go

@@ -5,25 +5,12 @@
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/logger.git"
    "github.com/knetic/govaluate"
    "ruleprocess/ruleserver"
    "ruleprocess/structure"
    "strconv"
    "time"
)

func PushSomthing (msg structure.ResultMsg) {
    // 如果标签中含有持续时间首次报警的timeLabel的话则不需要过人体追踪，不然就没的插入了
    fk := ruleserver.TrackOrNot(msg.RuleResult)
    if fk {
        Judge(msg)
    } else {
        flag := ruleserver.BodyIsSame(msg.SdkMessage)
        if !flag {
            Judge(msg)
        }
    }
}
func Judge(msg structure.ResultMsg) {
func PushSomthing(msg structure.ResultMsg) {
    defer func() {
        if err := recover(); err != nil {
            logger.Error("事件推送模块儿的异常捕获：",err)

 ruleserver/ruleToformula.go

@@ -67,6 +67,12 @@
                    }
                }
            }
            // 人体追踪
            // 如果标签中含有持续时间首次报警的timeLabel的话则不需要过人体追踪，不然就没的插入了
            fk := TrackOrNot(args.RuleResult)
            if !fk {
                BodyIsSame(message)
            }
        }
    }
}