删减冗余代码 把分值和id改回性别和年龄描述

panlei

2019-09-29 e8166a1b997086554a83c486d99d3887733c322d

删减冗余代码 把分值和id改回性别和年龄描述

 go.mod

@@ -10,6 +10,7 @@
    basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
    basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
    basic.com/valib/gosdk.git v0.0.0-20190531034110-0062fdaaa05a // indirect
    basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223
    github.com/Microsoft/go-winio v0.4.12 // indirect
    github.com/ajg/form v1.5.1 // indirect
    github.com/go-yaml/yaml v2.1.0+incompatible

 go.sum

@@ -26,6 +26,8 @@
basic.com/valib/gosdk.git v0.0.0-20190531034110-0062fdaaa05a/go.mod h1:mT/jbyl3++GmYjh/jBF65Ein6O6/yd4qIQbSFMCZoE4=
basic.com/valib/logger.git v0.0.0-20190926101623-99e2471fbbf5 h1:kBGQ+7tbDY4kIyZJVK3gLqAFzK8zS7o7323pSgfXXBs=
basic.com/valib/logger.git v0.0.0-20190926101623-99e2471fbbf5/go.mod h1:SPlOGUUlxCscwF1dkqmLb0oJXVqg1uJ8hsPXLFxrw1M=
basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223 h1:LPTDC1cOb2ZhuAkflqWXrIQ2RPYPS+ntoRgvpnZm4bY=
basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223/go.mod h1:SPlOGUUlxCscwF1dkqmLb0oJXVqg1uJ8hsPXLFxrw1M=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

 insertdata/insertDataToEs.go

@@ -1,13 +1,12 @@
package insertdata

import (
    "basic.com/valib/logger.git"
    "encoding/base64"
    "encoding/json"
    "errors"
    "fmt"
    "net"
    "ruleprocess/cache"
    "basic.com/valib/logger.git"
    "strconv"
    "time"

@@ -243,9 +242,9 @@
                    "",
                    alarmRules,
                    time.Now().Format("2006-01-02 15:04:05"), // 只检测，没有比对时间
                    strconv.FormatUint(face.Id, 10),            //暂改为人脸id strconv.FormatUint(face.Id, 10)
                    sex,            //暂改为人脸id strconv.FormatUint(face.Id, 10)
                    face.ThftRes.Age,
                    fmt.Sprintf("%.2f",face.Score), // 暂改为分值fmt.Sprintf("%.2f",face.Score)
                    ageDescription, // 暂改为分值fmt.Sprintf("%.2f",face.Score)
                    race,
                    face.ThftRes.Smile,
                    face.ThftRes.Beauty,

 ruleserver/ruleToformula.go

@@ -580,7 +580,7 @@
        //logger.Info("规则的算法id和区域的算法id：", rule.SdkId, "===", am.sdkId)
        if rule.PolygonId == am.areaId { // 算法和区域都得对的上

            if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
            if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
                if rule.RuleWithPre == "||" {
                    return LittleRuleResult{}
                } else {
@@ -648,17 +648,15 @@
                        } else {
                            return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                        }
                    } else {
                        return LittleRuleResult{}
                    }
                } else {
                    return LittleRuleResult{}
                } else if rule.SdkArgAlias == "" { // 什么参数都不配的情况
                    if am.targetNum > 0 {
                        return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
                    } else {
                        return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                    }
                }
            } else {
                return LittleRuleResult{}
            }
        } else {
            return LittleRuleResult{}
        }
    } else {
        // 处理的都是yolo数据
@@ -704,14 +702,10 @@
                } else {
                    return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                }
            } else {
                return LittleRuleResult{}
            }

        } else {
            return LittleRuleResult{}
        }
    }
    return LittleRuleResult{}
}

// 如果有持续时间条件维护开启一个定时器
@@ -762,18 +756,6 @@
            result, _ := expression.Evaluate(nil)                      // 得到数学公式的结果
            return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
            // 加上关于算法的判断条件，不能只有关于规则的，有的算法本身就是一个规则，如个体静止，靠右行,所以，拿到当前子规则的sdkid来判断是否是那些特殊的规则
        } else if rule.SdkId == "IsStatic" { // 静止算法
            if am.isStatic {
                return LittleRuleResult{}
            } else {
                return LittleRuleResult{}
            }
        } else if rule.SdkId == "KeepRight" { // 靠右行算法
            if am.keepRight {
                return LittleRuleResult{}
            } else {
                return LittleRuleResult{}
            }
        }
    }
    return LittleRuleResult{}