From d62130814d09b4c0ad313979902ccefec6260ddf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 15 八月 2019 15:13:44 +0800
Subject: [PATCH] day change to Day
---
ruleserver/readyDataForRule.go | 142 ++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index b405fc6..ba290b0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -8,14 +8,20 @@
"fmt"
"github.com/go-yaml/yaml"
"io/ioutil"
+ "math"
+ "nanomsg.org/go-mangos"
+ "nanomsg.org/go-mangos/protocol/req"
+ "nanomsg.org/go-mangos/transport/tcp"
+ "os"
"ruleprocess/cache"
"ruleprocess/logger"
+ "github.com/golang/protobuf/proto"
"strconv"
"time"
)
var serverIp, serverPort, dbTablePersons string
-
+var sock mangos.Socket
type conf struct {
PhotoUrl string `yaml:"photoUrl"`
VideoPersons string `yaml:"videoPersons"`
@@ -44,13 +50,17 @@
}
logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
+ sock, err = req.NewSocket();
+ if err != nil {
+ logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+ }
}
type BaseInfo struct {
TableId string `json:"tableId"`
TableName string `json:"tableName"`
BwType string `json:"bwType"`
- CompareScore float32 `json:"compareScore"`
+ CompareScore float64 `json:"compareScore"`
PersonId string `json:"personId"`
PersonName string `json:"personName"`
PersonPicUrl string `json:"personPicUrl"`
@@ -71,7 +81,7 @@
taskGroup = task
}
}
- logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------")
+ logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
for _,ruleGroup := range taskGroup.GroupRules{
logger.Info(ruleGroup.GroupText)
}
@@ -88,22 +98,21 @@
// 淇濈暀鍥涗綅灏忔暟
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) float32 {
- value1, _ := strconv.ParseFloat(fmt.Sprintf("%.4f", value), 32)
- return float32(value1)
+func Decimal(value float32) float64 {
+ value1, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(value)), 64)
+ logger.Info("鍒濇淇濈暀涓や綅鎴恠tr:",value1)
+ n10 := math.Pow10(4)
+ value2 := math.Trunc((value1+0.5/n10)*n10) / n10
+ logger.Info("鍒濇淇濈暀涓や綅鎴恠tr::::",value2)
+ return value2
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
func GetTimeById(id string, index int) []TimeRange {
_, cameraTimeRule := cache.GetTimeRuleById(id)
- var timeRangeList []day
+ var timeRangeList []Day
err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
if err != nil {
logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
@@ -132,7 +141,7 @@
Start string `json:"start"`
End string `json:"end"`
}
-type day struct {
+type Day struct {
Day int `json:"day"` // 鏍囩ず褰撳墠鏄熸湡鍑�
TimeRange []TimeRange `json:"time_range"` // 褰撳ぉ鐨勫嚑涓椂闂存
}
@@ -157,17 +166,26 @@
}
// 缁欑洰鏍囧～鍏卨iker
-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)
+func (arg *Arg) FillLiker(tableId []string, compareThreshold float32) {
+ //bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
+ comArg := &protomsg.CompareArgs{
+ TableIds:tableId,
+ FaceFeature:arg.Feature,
+ CompareThreshold:compareThreshold,
+ Source:false,
+ }
+ bytes := Push("tcp://192.168.1.182:40010",comArg,sock)
+ var scResult protomsg.SdkCompareResult
+ err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
- for key, _ := range m {
- ids = append(ids, key)
+ m := make(map[string]*protomsg.SdkCompareEach)
+ for _,key := range scResult.CompareResult {
+ ids = append(ids, key.Id)
+ m[key.Id] = key
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
@@ -185,8 +203,8 @@
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].CompareScore))
+ base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), 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)
}
@@ -198,7 +216,7 @@
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
var tableIds []string
- var threshold float32 = 0.5 // 榛樿闃堝�间负0.5
+ var threshold float32 = 50 // 榛樿闃堝�间负50
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
@@ -232,18 +250,27 @@
logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
- if groupRule.Rules[j].PolygonId == areaMap.areaId {
+ if groupRule.Rules[j].PolygonId == areaMap.AreaId {
//logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
- for _, arg := range 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)
+ arg.FillLiker(nil, threshold)
}
if compareFlag == 2 {
- arg.fillLiker(tableIds, threshold)
+ arg.FillLiker(tableIds, threshold)
}
//logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
- areaMap.filterData = areaMap.args
+ areaMap.FilterData = areaMap.Args
//logger.Info("=======绗竴娆＄湅args锛�",(areaMap.filterData))
}
//logger.Info("-------------------------------浜鸿劯瀵规瘮涔嬪悗鐨勭洰鏍囨暟閲�",len(areaMap.args))
@@ -258,28 +285,29 @@
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
func (a *AreaMap) CountAreaObjs(arg *SdkData) {
- a.targetNum = 0
+ a.TargetNum = 0
threshold := 0.0 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
- areaPoints := Json2points(a.areaJson)
+ areaPoints := Json2points(a.AreaJson)
widthScale := float64(arg.ImageWidth / 960)
heigthScale := float64(arg.ImageHeight / 540)
for _, obj := range arg.Photo {
//logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
- a.targetNum++
+ a.TargetNum++
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)
+ a.Args = append(a.Args, &arg1)
+ a.FilterData = append(a.FilterData, &arg1)
}
}
- a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
- a.keepRight = arg.KeepRight
- a.isStatic = arg.IsStatic
+ //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
//logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
}
@@ -291,9 +319,47 @@
}
for _, polygon := range cameraPolygons {
//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
- areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
+ areaMap := AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
areaMap.CountAreaObjs(arg)
arg.AreaMapList = append(arg.AreaMapList, &areaMap)
}
}
+
+func Push(url string,data *protomsg.CompareArgs,sock mangos.Socket) []byte{
+ //var sock mangos.Socket
+ var err error
+ var msg []byte
+
+ //if sock, err = req.NewSocket(); err != nil {
+ // logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+ //}
+ errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
+ if errSize != nil {
+ logger.Error("Failed set MaxRecvSize: %v", err)
+ return nil
+ }
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
+ if err = sock.Dial(url); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ }
+ logger.Info("搴忓垪鍖栨暟鎹�")
+ bytes,err1 := proto.Marshal(data)
+ logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
+ if err1 != nil {
+ logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ }
+ logger.Debug("鎺ㄩ�佹暟鎹�")
+ //bytes := []byte("ndfasojdfaidsos")
+ if err = sock.Send(bytes); err != nil {
+ logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+ os.Exit(1)
+ }
+ if msg, err = sock.Recv(); err != nil {
+ logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ os.Exit(1)
+ }
+ logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
+ return msg
+}
--
Gitblit v1.8.0