From 581ff7df72dcc1d70b27c80fbd1004d7fb139a94 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 11:46:54 +0800
Subject: [PATCH] 完善人脸比对
---
go.sum | 2
insertdata/insertDataToEs.go | 73 ++++++++++++-----------
go.mod | 2
ruleserver/readyDataForRule.go | 72 ++++++++++++++++++------
config/conf.yml | 5 +
5 files changed, 99 insertions(+), 55 deletions(-)
diff --git a/config/conf.yml b/config/conf.yml
index e55f659..ee01b34 100644
--- a/config/conf.yml
+++ b/config/conf.yml
@@ -1,3 +1,6 @@
photoUrl: "http://192.168.1.203:6333/submit"
videopersons: "http://192.168.1.182:9200/videopersons/perVideoPicture"
-personaction: "http://192.168.1.182:9200/personaction/perVideoAction"
\ No newline at end of file
+personaction: "http://192.168.1.182:9200/personaction/perVideoAction"
+serverip: "192.168.1.182"
+serverport: "9200"
+dbtablepersons: "dbtablepersons"
\ No newline at end of file
diff --git a/go.mod b/go.mod
index e66c9e0..2170c7c 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@
require (
basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f
- basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b
+ basic.com/pubsub/cache.git v0.0.0-20190718024458-be52360c4814
basic.com/pubsub/protomsg.git v0.0.0-20190717072554-576620e5ba07
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
diff --git a/go.sum b/go.sum
index be748aa..0c88d60 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@
basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b h1:UAasACFqEYUBCuZkkdxYVc1QmSyB7McvNHS36QxDJp4=
basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
+basic.com/pubsub/cache.git v0.0.0-20190718024458-be52360c4814 h1:KoSik/aiJNDt3d+qRKExLW4pNHZ7vU1wXHhWXxZi4qo=
+basic.com/pubsub/cache.git v0.0.0-20190718024458-be52360c4814/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 h1:ygh9CQPS48KmXv+PNUrOcrMqIiDZOs11apnQdu9oGEY=
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190712081201-5a482419c227 h1:1jprxyxmeQ8X4/S7cFnhRf4ByVqD0xLZNvx8/0xTk2k=
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 5384eef..a33c880 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -19,12 +19,15 @@
"ruleprocess/util"
)
-var weedfsUrl,videoPersonUrl,personAction string
+var weedfsUrl, videoPersonUrl, personAction string
type conf struct {
- PhotoUrl string `yaml:"photoUrl"`
- Videopersons string `yaml:"videopersons"`
- Personaction string `yaml:"personaction"`
+ 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() {
@@ -43,35 +46,35 @@
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraAddr string `json:"cameraAddr"`
- PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- LikeDate string `json:"likeDate"`
- Sex string `json:"sex"`
- Age int32 `json:"age"`
- AgeDescription string `json:"ageDescription"`
- Race string `json:"race"`
- SmileLevel int32 `json:"smileLevel"`
- BeautyLevel int32 `json:"beautyLevel"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl []string `json:"picSmUrl"`
- VideoUrl string `json:"videoUrl"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- DetectScore float64 `json:"detectScore"`
- IsAlarm int `json:"isAlarm"`
- IsAckAlarm int `json:"isAckAlarm"`
- IsCollect int `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- BaseInfo []*ruleserver.BaseInfo`json:"baseInfo"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ LikeDate string `json:"likeDate"`
+ Sex string `json:"sex"`
+ Age int32 `json:"age"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ SmileLevel int32 `json:"smileLevel"`
+ BeautyLevel int32 `json:"beautyLevel"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -307,7 +310,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -382,7 +385,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
+ resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 100ba1e..337b09f 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -4,16 +4,42 @@
"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"
)
+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() {
- bigCache.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)
+ serverIp = c.Serverip
+ serverPort = c.Serverport
+ dbTablePersons = c.Dbtablepersons
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ logger.Debug("鏈満淇℃伅锛�",localConfig)
+ bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
}
type BaseInfo struct {
@@ -118,8 +144,8 @@
}
// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) fillLiker() {
- bytes := sdkcompare.GetComparePersonBaseInfo(nil, arg.Feature, 40)
+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 {
@@ -133,32 +159,46 @@
logger.Info("------------------------------------------------------------------------------------------------------------------------")
logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids,dbTablePersons,serverIp,serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
for _,baseinfo := range baseinfos {
- logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ // 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
+ var tableIds []string
+ tableIds = append(tableIds,baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
+ table,err := esutil.Dbtablefosbyid(tableIds,dbTablePersons,serverIp,serverPort)
+ if err != nil {
+ logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�")
+ }
+ base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:float64(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
+ arg.Liker = append(arg.Liker, &base)
}
}
- //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
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
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 != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾娌℃湁閰嶅叏閮ㄥ簳搴�
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)
}
}
}
@@ -180,14 +220,10 @@
logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
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))
}
--
Gitblit v1.8.0