panlei
2019-07-10 c775ea17ffd8b064fb5109567e89a169299373a1
更新cache
3个文件已修改
65 ■■■■ 已修改文件
go.mod 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruleserver/ruleToformula.go 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.mod
@@ -4,7 +4,7 @@
require (
    basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f
    basic.com/pubsub/cache.git v0.0.0-20190708074039-d25f504c5fab
    basic.com/pubsub/cache.git v0.0.0-20190710092005-5d7ea0a4cbbc
    basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2
    basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
    basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
go.sum
@@ -2,6 +2,8 @@
basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/cache.git v0.0.0-20190708074039-d25f504c5fab h1:5JZi7kAh7b0LH4dV0XzIR32KjmW9va331/K6dqZJLfo=
basic.com/pubsub/cache.git v0.0.0-20190708074039-d25f504c5fab/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/cache.git v0.0.0-20190710092005-5d7ea0a4cbbc h1:WLWAYTyMflMnuO31RBCGJizG6Cx+xF0IRECpSNgvghs=
basic.com/pubsub/cache.git v0.0.0-20190710092005-5d7ea0a4cbbc/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/protomsg.git v0.0.0-20190708093242-02e81455712c h1:p6bCit0NDQvC9ziK9Zf815LXgTYWxjr4mn99gcdehyk=
basic.com/pubsub/protomsg.git v0.0.0-20190708093242-02e81455712c/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 h1:ygh9CQPS48KmXv+PNUrOcrMqIiDZOs11apnQdu9oGEY=
ruleserver/ruleToformula.go
@@ -237,7 +237,7 @@
            }
        }
    }
    // 作弊,直接让其比对全部底库
    // 为了测试作下弊,直接让其比对全部底库
    compareFlag = 1
    if compareFlag == 0 {
        logger.Info("没有配置对比底库参数")
@@ -390,17 +390,9 @@
                logger.Error("没查到sdk的信息---", err)
            }
            ipcId := sdk.IpcId
            sdkName := sdk.SdkName
            if ipcId == sdkData.IpcId {
                for _, areaMap := range sdkData.AreaMapList {
                    ruleResult := duration(groupRule.Rules[j], &areaMap, args)
                    if ruleResult.Result != "" {
                        logger.Info("时间规则结果:", ruleResult.Result)
                        if ruleResult.Result == "true" && !strings.Contains(sdkNames, sdkName) {
                            sdkNames = sdkName + ","
                        }
                        resultSplice = append(resultSplice, &ruleResult)
                    }
                    duration(groupRule.Rules[j], &areaMap, args)
                }
            }
        }
@@ -440,29 +432,10 @@
                    timeEle.N = timeEle.InitN // 重置定时器
                }
            }
            logger.Info("-------------------重置可能存在的定时器并返回false---------------")
            logger.Info("-------------------重置相关的定时器并返回false---------------")
            return false
        } else {
            // 最后成功报警才把符合条件的人脸数据塞进结果标签里
            faces := []Arg{}
            faceFlag := false
            for j := 0; j < len(groupRule.Rules); j++ {
                if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
                    faceFlag = true
                }
            }
            for _, sdkData := range args.Sdkdata {
                if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData里有人脸数据且配置了算法才把符合条件的数据塞进标签里去
                    for _, areaMap := range sdkData.AreaMapList {
                        faces = append(faces, putFaceToResult(&areaMap)...)
                    }
                }
            }
            // 配了人脸的算法才把人脸的数据甩出来打标签
            if faceFlag {
                args.RuleResult["face"] = faces
            }
            // 去看池子里是否有与本帧数据有关的定时器,如果有,看此时是否走到0,没有此定时器或有定时器走到0的话返回成功报警
            // 判断持续时间条件,去看池子里是否有与本帧数据有关的定时器,如果有,看此时是否走到0,没有此定时器或有定时器走到0的话返回成功报警
            var flag bool = true
            for k, timeEle := range TimeEleList {
                if strings.Contains(k, taskId) {
@@ -473,6 +446,25 @@
                }
            }
            if flag {
                // 最后成功报警才把符合条件的人脸数据塞进结果标签里
                // 配了人脸的算法才把人脸的数据甩出来打标签
                faces := []Arg{}
                faceFlag := false
                for j := 0; j < len(groupRule.Rules); j++ {
                    if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
                        faceFlag = true
                    }
                }
                for _, sdkData := range args.Sdkdata {
                    if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData里有人脸数据且配置了算法才把符合条件的数据塞进标签里去
                        for _, areaMap := range sdkData.AreaMapList {
                            faces = append(faces, putFaceToResult(&areaMap)...)
                        }
                    }
                }
                if faceFlag {
                    args.RuleResult["face"] = faces
                }
                logger.Warn("___________________________________________________________________________终于走完万里长征")
                // 把他们的位置数据也传下去
                locations := []Rect{}
@@ -802,7 +794,7 @@
    }
}
// 都过滤完条件之后看看是否要创建一个定时器元素 创建定时器的条件:是否有靠右行,个体静止等自带定时器含义的算法以及是否有持续时间
// 都过滤完条件之后看看是否满足持续时间条件
func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) LittleRuleResult{
    if rule.PolygonId == am.areaId { // 首先规则所对应的区域id要跟区域数据的id对的上  配置的算法要对的上
        if rule.SdkArgAlias == "duration" { //
@@ -813,7 +805,10 @@
                    flag = false // 有就置为false
                    logger.Info("有这个定时器,不再创建了:")
                    // 看看定时器中的值是否为0 如果为0应该报警,如果不为0返回false,未达到持续时间的要求
                    if value.N == 0 {
                    if value.N == 0 && !value.AlarmFlag{
                        // 报警之后改为置为true 后面的报警图片就不报了,顺便把缓存的那张图片也给结果标签
                        value.AlarmFlag = true
                        args.RuleResult["cacheData"] = value.CacheSdkData
                        return LittleRuleResult{am.sdkName, "true" + "" + rule.RuleWithPre, rule.Sort}
                    }else {
                        logger.Info("------------------------------持续时间条件不满足")