重塑包含

panlei

2019-12-16 1a25fb445f732f1969c336017b55aafb9988ce69

重塑包含

 algorithm/middleware/middleware.go

@@ -75,7 +75,7 @@
                        ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
                        logger.Info("前置连接符：",groupRule.Rules[j])
                        if groupRule.Rules[j].RuleWithPre == "⊇" && len(ruleResult.Target) > 0 {
                            assembleDta(args,groupRule.Rules[j-1],groupRule.Rules[j])
                            assembleDta(resultSplice[len(resultSplice)-1].Target,ruleResult.Target,)
                            // 把当前小规则结果置空
                            ruleResult = structure.LittleRuleResult{}
                        }
@@ -472,38 +472,20 @@
//    }
//}
// 如果规则组中有包含符号，把规则组之后的规则对应的算法和区域提取的数据装配到前面去
func assembleDta(args *structure.SdkDatas,rule1,rule2 *protomsg.Rule) {
        // 拿到后面的那个区域的数据
        logger.Info("触发了包含事件，把后者的数据给到前者",*rule1,*rule2)
        area := structure.AreaMap{}
        for _, sdkData := range args.Sdkdata {
            for _, areaMap := range sdkData.AreaMapList {
                logger.Info("sdkId和区域id碰撞：",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
                if areaMap.AreaId == rule2.PolygonId {
                    area = *areaMap
                    goto second
                }
            }
        }
second:    for _, sdkData := range args.Sdkdata {
            for _, areaMap := range sdkData.AreaMapList {
                if areaMap.SdkId == rule1.SdkId && areaMap.AreaId == rule1.PolygonId {
                    logger.Info("第二次sdkId和区域id碰撞：",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
                    // 拿到包含符之前的数据，遍历装配
                    for _,arg := range areaMap.FilterData {
                        mergeArg(arg,area)
                        logger.Info("合并后的arg是：",*arg)
                    }
                    // 清空人脸，人脸不再单独插入了
                    area.FilterData = nil
func assembleDta(targets1,targets2 []*structure.Arg) {
    if len(targets1) > 0 {
        logger.Info("有人体：",len(targets1))
        for _,target := range targets1 {
            mergeArg(target,targets2)
            targets2 = nil
                    return // 装配一次就可以
                }
            }
        }
}

func mergeArg(arg *structure.Arg,areaMap structure.AreaMap) {
    for _,arg1 := range areaMap.FilterData {
func mergeArg(arg *structure.Arg,targets2 []*structure.Arg) {
    for _,arg1 := range targets2 {
        logger.Info("人脸：",arg1.Location,arg1.Score)
        precent := ruleserver.PgsInterPercent(Rect2Point(arg.Location),arg1.Location,1,1)
        if precent > 99 {
            arg.AttachArg = arg1.SourceArg