panlei
2019-07-09 728d6b93340548e39a471b96d38d1340198840e4
给真的yolo的ipcId
2个文件已修改
10 ■■■■■ 已修改文件
main.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruleserver/ruleToformula.go 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.go
@@ -144,7 +144,7 @@
                    logger.Info("解析YOLO sdk数据时出现错误", err)
                    continue
                }
                logger.Info("--------------看看yolo中有几个目标:",len(yoloParam.Infos))
                //logger.Info("--------------看看yolo中有几个目标:",len(yoloParam.Infos))
                for _, info := range yoloParam.Infos {
                    if info.Typ == 0 {
                        photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
ruleserver/ruleToformula.go
@@ -297,13 +297,15 @@
            }
            ipcId := sdk.IpcId
            sdkName := sdk.SdkName
            if ipcId == sdkData.IpcId {
                logger.Info("当前走的规则的算法是--:",sdkName,"---")
                for _, areaMap := range sdkData.AreaMapList {
                    ruleResult := filterRule(groupRule.Rules[j], &areaMap)
                    if ruleResult.Result != "" {
                        logger.Info("条件规则结果:", ruleResult.Result)
                        // 如果此结果为真且当前过的是yolo算法,应记下此规则所对应的sdkName,另外,还要去重
                        if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                        if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                            sdkNames = sdkName + ","
                        }
                        resultSplice = append(resultSplice, &ruleResult)
@@ -328,7 +330,7 @@
                    ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
                    if ruleResult.Result != "" {
                        logger.Info("数量规则结果:", ruleResult.Result)
                        if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                        if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                            sdkNames = sdkName + ","
                        }
                        resultSplice = append(resultSplice, &ruleResult)
@@ -351,7 +353,7 @@
                    ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
                    if ruleResult.Result != "" {
                        logger.Info("时间规则结果:", ruleResult.Result)
                        if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                        if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                            sdkNames = sdkName + ","
                        }
                        resultSplice = append(resultSplice, &ruleResult)