From d7675e60a5d6056b898e7bc567c898fd6f8bfc0b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 18:45:34 +0800
Subject: [PATCH] 更新人脸追踪
---
ruleserver/readyDataForRule.go | 130 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 31 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 8b530f5..d6bee96 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -4,23 +4,70 @@
"basic.com/pubsub/cache.git/esutil"
bigCache "basic.com/pubsub/cache.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/pubsub/sdkcompare.git"
"encoding/json"
"fmt"
+ "github.com/go-yaml/yaml"
+ "io/ioutil"
"ruleprocess/cache"
"ruleprocess/logger"
"strconv"
- "strings"
"time"
)
-func init() {
- bigCache.Init()
+var serverIp,serverPort,dbTablePersons string
+type conf struct {
+ PhotoUrl string `yaml:"photoUrl"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
+}
+func Init() {
+ data, err := ioutil.ReadFile("./config/conf.yml")
+ if err != nil {
+ fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
+ logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
+ }
+ c := conf{}
+ //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
+ yaml.Unmarshal(data, &c)
+ logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�",c)
+ serverIp = c.ServerIp
+ serverPort = c.ServerPort
+ dbTablePersons = c.DbTablePersons
+ localConfig, err1 := cache.GetServerInfo()
+ if err1 != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�",localConfig,serverIp,serverPort)
+ bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
}
+type BaseInfo struct {
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
+ BwType string `json:"bwType"`
+ CompareScore float64 `json:"compareScore"`
+ PersonId string `json:"personId"`
+ PersonName string `json:"personName"`
+ PersonPicUrl string `json:"personPicUrl"`
+ PhoneNum string `json:"phoneNum"`
+ Sex string `json:"sex"`
+ IdCard string `json:"idCard"`
+ MonitorLevel string `json:"monitorLevel"`
+ Content string `json:"content"`
+}
// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
-func GetRuleGroup(cameraId string) []*protomsg.TaskGroupArgs {
+func GetRuleGroup(cameraId string,taskId string) *protomsg.TaskGroupArgs {
all := cache.GetCameraTaskRulesByCameraId(cameraId)
- return all
+ //logger.Info("==================鎵�鏈夌殑浠诲姟鐨勮鍒欑粍锛�",all)
+ var taskGroup *protomsg.TaskGroupArgs
+ for _,task := range all {
+ if task.TaskId == taskId {
+ taskGroup = task
+ }
+ }
+ return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
@@ -31,13 +78,14 @@
}
// 淇濈暀鍥涗綅灏忔暟
-func Retain(f float32)(float32) {
+func Retain(f float32)(float64) {
s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
- v, err := strconv.ParseFloat(s, 32)
+ v, err := strconv.ParseFloat(s, 64)
if err != nil {
logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
}
- return float32(v)
+ // float32涓巉loat64浜掕浆浼氭湁浣嶆暟淇濈暀涓嶅噯鐨勯棶棰�
+ return v
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
@@ -98,8 +146,8 @@
}
// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) fillLiker() {
- bytes := sdkcompare.GetComparePersonBaseInfo(nil, arg.Feature, 70)
+func (arg *Arg) fillLiker(tableId []string,compareThreshold float32) {
+ bytes := bigCache.GetComparePersonBaseInfo(tableId,arg.Feature,compareThreshold)
var m map[string]float32
err1 := json.Unmarshal(bytes, &m)
if err1 != nil {
@@ -110,28 +158,51 @@
for key,_ := range m {
ids = append(ids,key)
}
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ logger.Info("------------------------------------------------------------------------------------------------------------------------")
+ logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
+ if len(ids) > 0 {
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids,dbTablePersons,serverIp,serverPort)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ }
+ for _,baseinfo := range baseinfos {
+ // 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
+ var 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))
+ }
+ base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:Retain(m[baseinfo.Id]),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鐨勫姣斿�兼槸澶氬皯锛�",base)
+ //os.Exit(1)
+ arg.Liker = append(arg.Liker, &base)
+ }
}
- logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
- //baseinfo.CompareScore = Retain(val)
- //arg.Liker = append(arg.Liker, &baseinfo)
- //logger.Info("------------------绗竴娆＄湅args:",*arg)
+
}
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
- tableIds := ""
+ var tableIds []string
+ var threshold float32 = 0.5 // 榛樿闃堝�间负0.5
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
- if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾娌℃湁閰嶅叏閮ㄥ簳搴�
+ if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾涓嶆槸閰嶇殑鍏ㄩ儴搴曞簱
compareFlag = 2
- tableIds = groupRule.Rules[j].SdkArgValue + "," // 鏈�鍚庝細澶氫竴涓猼ableId锛屽垏鍑烘潵鐨勬暟缁勫彇len-1灏卞彲浠�
+ tableIds = append(tableIds,groupRule.Rules[j].SdkArgValue)// 鏈�鍚庝細澶氫竴涓猼ableId锛屽垏鍑烘潵鐨勬暟缁勫彇len-1灏卞彲浠�
}
if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue == "" { // 閰嶇殑鍙傛暟鏄瘮瀵瑰叏閮ㄥ簳搴�
compareFlag = 1
+ }
+ if groupRule.Rules[j].SdkArgAlias == "threshold" {
+ v2, err := strconv.ParseFloat(groupRule.Rules[j].SdkArgValue, 32)
+ if err != nil {
+ logger.Error("string杞琭loat32澶辫触锛�")
+ }
+ threshold = float32(v2)
}
}
}
@@ -141,36 +212,33 @@
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
return
}
+ logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�",threshold)
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
- logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
- logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
+ logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
if compareFlag == 1 {
- arg.fillLiker()
+ arg.fillLiker(nil,threshold)
}
if compareFlag == 2 {
- array := strings.Split(tableIds, ",")
- logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
- for i := 0; i < len(array)-1; i++ {
- arg.fillLiker()
- }
+ arg.fillLiker(tableIds,threshold)
}
logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
areaMap.filterData = areaMap.args
//logger.Info("=======绗竴娆＄湅args锛�",(areaMap.filterData))
}
- logger.Info("-------------------------------浜鸿劯瀵规瘮涔嬪悗鐨勭洰鏍囨暟閲�",len(areaMap.args))
+ //logger.Info("-------------------------------浜鸿劯瀵规瘮涔嬪悗鐨勭洰鏍囨暟閲�",len(areaMap.args))
}
}
}
+ return // 姣斿畬涓�娆″氨鍑哄幓锛岄槻姝㈠啀姣旂浜岄亶閫犳垚閲嶅锛屽洜涓虹‘瀹炲彲浠ユ湁涓や釜浜鸿劯姣斿鐨勫皬瑙勫垯锛屼竴涓簳搴擄紝涓�涓槇鍊�
}
}
}
@@ -191,7 +259,7 @@
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, []*protomsg.Baseinfo{}}
+ 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{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, &arg1)
a.filterData = append(a.filterData, &arg1)
--
Gitblit v1.8.0