From 870cdf6b042a3a8848afac02fc47181b23d13094 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:41:57 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 4c8ffcc..77e739f 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -72,6 +72,10 @@
taskGroup = task
}
}
+ logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------")
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
return taskGroup
}
@@ -85,18 +89,16 @@
// 淇濈暀鍥涗綅灏忔暟
func Retain(f float32) (float64) {
- s := strconv.FormatFloat(float64(f), 'f', 4, 64)
- v, err := strconv.ParseFloat(s, 64)
- if err != nil {
- logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
- }
- // float32涓巉loat64浜掕浆浼氭湁浣嶆暟淇濈暀涓嶅噯鐨勯棶棰�
- return v
+ value1, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(f)), 64)
+ return value1
}
func Decimal(value float32) float64 {
- value1, _ := strconv.ParseFloat(fmt.Sprintf("%.4f", float64(value)), 64)
+ value1, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(value)), 64)
+ logger.Info("鍒濇淇濈暀涓や綅鎴恠tr:",value1)
n10 := math.Pow10(4)
- return math.Trunc((value1+0.5/n10)*n10) / n10
+ value2 := math.Trunc((value1+0.5/n10)*n10) / n10
+ logger.Info("鍒濇淇濈暀涓や綅鎴恠tr::::",value2)
+ return value2
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
func GetTimeById(id string, index int) []TimeRange {
@@ -177,14 +179,14 @@
for _, baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
//logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
- var tableIds []string
+ tableIds := []string{}
tableIds = append(tableIds, baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
- logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id]) * 100)
- base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id]) * 100, PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
+ logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id] * 100))
+ base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id] * 100), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
//os.Exit(1)
arg.Liker = append(arg.Liker, &base)
}
@@ -233,6 +235,15 @@
if groupRule.Rules[j].PolygonId == areaMap.areaId {
//logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
+ arg.Liker = arg.Liker[0:0]
+ logger.Info("娓呯┖涔嬪悗鐪嬬湅涔嬪墠鎵撶殑浜鸿劯鏍囩鍙樹簡娌★細")
+ if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
+ for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
+ for _,arg := range faceResult.Args {
+ logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
+ }
+ }
+ }
if compareFlag == 1 {
arg.fillLiker(nil, threshold)
}
@@ -269,12 +280,13 @@
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
- arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
+ arg1 := Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, &arg1)
a.filterData = append(a.filterData, &arg1)
}
}
+ logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
--
Gitblit v1.8.0