From 408290cf3fe23f639c8718d984d66809fad50ed8 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 15:06:00 +0800
Subject: [PATCH] ---看看比分
---
ruleserver/readyDataForRule.go | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 63c2cd0..be06ef1 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -13,7 +13,9 @@
"strconv"
"time"
)
-var serverIp,serverPort,dbTablePersons string
+
+var serverIp, serverPort, dbTablePersons string
+
type conf struct {
PhotoUrl string `yaml:"photoUrl"`
VideoPersons string `yaml:"videoPersons"`
@@ -22,6 +24,7 @@
ServerPort string `yaml:"serverPort"`
DbTablePersons string `yaml:"dbTablePersons"`
}
+
func Init() {
data, err := ioutil.ReadFile("./config/conf.yml")
if err != nil {
@@ -31,7 +34,7 @@
c := conf{}
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
- logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�",c)
+ logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�", c)
serverIp = c.ServerIp
serverPort = c.ServerPort
dbTablePersons = c.DbTablePersons
@@ -39,36 +42,38 @@
if err1 != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�",localConfig,serverIp,serverPort)
- bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
+ 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"`
+ 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"`
+ 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,taskId string) *protomsg.TaskGroupArgs {
+func GetRuleGroup(cameraId string, taskId string) *protomsg.TaskGroupArgs {
all := cache.GetCameraTaskRulesByCameraId(cameraId)
//logger.Info("==================鎵�鏈夌殑浠诲姟鐨勮鍒欑粍锛�",all)
- var taskGroup *protomsg.TaskGroupArgs
- for _,task := range all {
+ var taskGroup *protomsg.TaskGroupArgs
+ for _, task := range all {
if task.TaskId == taskId {
taskGroup = task
}
}
return taskGroup
}
+
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
var cameraPolygons []protomsg.CameraPolygon
@@ -78,8 +83,8 @@
}
// 淇濈暀鍥涗綅灏忔暟
-func Retain(f float32)(float64) {
- s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
+func Retain(f float32) (float64) {
+ s := strconv.FormatFloat(float64(f), 'f', 4, 64)
v, err := strconv.ParseFloat(s, 64)
if err != nil {
logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
@@ -105,7 +110,6 @@
return nil
}
-
// 鏍规嵁浼犲叆鐨勫瓧绗︿覆寰楀埌鍏跺湪涓�鍛ㄥ唴鐨勭储寮� 鍛ㄤ竴鍒板懆鏃ュ垎鍒搴�1鍒�7
func getIndexOfWeek(weekday string) int {
var weekdays = [7]string{"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}
@@ -129,7 +133,7 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
func Json2points(areaPoints string) []Point {
var pts []Point
- if areaPoints == "[]" || areaPoints == ""{
+ if areaPoints == "[]" || areaPoints == "" {
logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
pts = append(pts, Point{0, 0})
pts = append(pts, Point{0, 540})
@@ -146,8 +150,8 @@
}
// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) fillLiker(tableId []string,compareThreshold float32) {
- bytes := bigCache.GetComparePersonBaseInfo(tableId,arg.Feature,compareThreshold)
+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 {
@@ -155,33 +159,34 @@
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
- for key,_ := range m {
- ids = append(ids,key)
+ for key, _ := range m {
+ ids = append(ids, key)
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids,dbTablePersons,serverIp,serverPort)
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
- for _,baseinfo := range baseinfos {
+ 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))
+ 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])*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鐨勫姣斿�兼槸澶氬皯锛�",base)
+ logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�",Retain(m[baseinfo.Id]) * 100)
+ base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Retain(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)
}
}
}
+
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
@@ -192,7 +197,7 @@
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾涓嶆槸閰嶇殑鍏ㄩ儴搴曞簱
compareFlag = 2
- tableIds = append(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
@@ -212,7 +217,7 @@
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
return
}
- logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�",threshold)
+ 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 {
@@ -224,10 +229,10 @@
//logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
if compareFlag == 1 {
- arg.fillLiker(nil,threshold)
+ arg.fillLiker(nil, threshold)
}
if compareFlag == 2 {
- arg.fillLiker(tableIds,threshold)
+ arg.fillLiker(tableIds, threshold)
}
//logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
@@ -284,4 +289,4 @@
areaMap.CountAreaObjs(arg)
arg.AreaMapList = append(arg.AreaMapList, &areaMap)
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0