From cd9b765f63ffd584b640898f745947f2a8b39365 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 09 十二月 2019 15:55:46 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 104 +++++++++++++++++++++++++---------------------------
1 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 5fb9ac4..479e9d5 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -3,12 +3,11 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
"encoding/json"
"errors"
"fmt"
+ "basic.com/valib/logger.git"
"github.com/golang/protobuf/proto"
- uuid "github.com/satori/go.uuid"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
@@ -157,8 +156,8 @@
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
- logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore))
- base := structure.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}
+ //logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore))
+ base := structure.BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), TargetId: baseinfo.Id, TargetName: baseinfo.PersonName, TargetPicUrl: baseinfo.PersonPicUrl, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved,DbLabel: baseinfo.PhoneNum+"/"+baseinfo.Sex+"/"+baseinfo.IdCard,}
//os.Exit(1)
arg.Liker = append(arg.Liker, &base)
}
@@ -184,7 +183,7 @@
if groupRule.Rules[j].SdkArgAlias == "cmpThreshold" {
v2, err := strconv.ParseFloat(groupRule.Rules[j].SdkArgValue, 32)
if err != nil {
- logger.Error("string杞琭loat32澶辫触锛�")
+ //logger.Error("string杞琭loat32澶辫触锛�")
}
threshold = float32(v2)
}
@@ -193,15 +192,15 @@
// 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
//compareFlag = 1
if compareFlag == 0 {
- logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
+ //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 {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
- logger.Info("============================================杩涜浜鸿劯瀵规瘮")
+ //logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.AreaId {
@@ -229,48 +228,48 @@
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
-
- a.TargetNum = 0
- threshold := 80.0 // 鐩镐技搴�
- intersectionper := 20.0 // 鍗犳瘮
- size := 0.0 // 灏哄
-
- areaPoints := Json2points(a.AreaJson)
- logger.Info("鐪嬬湅鍥剧墖鐨剋idth鍜宧eight:",arg.ImageWidth,arg.ImageHeight)
- 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 obj.Score >= threshold && float64(obj.Rects.Width*obj.Rects.Height) >= size && PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) >= intersectionper {
- // 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
- a.TargetNum++
- uuid := uuid.NewV4().String()
- arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.IsYolo, obj.Rects, obj.Car,obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}}
- //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]
- //logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
-}
-
-// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
- logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
- for _, photo := range arg.Photo {
- logger.Info("--------瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
- }
- for _, polygon := range cameraPolygons {
- //logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
- areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
- // 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
- CountAreaObjs(&areaMap,arg)
- arg.AreaMapList = append(arg.AreaMapList, &areaMap)
- }
-}
+//func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
+//
+// a.TargetNum = 0
+// threshold := 80.0 // 鐩镐技搴�
+// intersectionper := 20.0 // 鍗犳瘮
+// size := 0.0 // 灏哄
+//
+// areaPoints := Json2points(a.AreaJson)
+// logger.Info("鐪嬬湅鍥剧墖鐨剋idth鍜宧eight:",arg.ImageWidth,arg.ImageHeight)
+// 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 obj.Score >= threshold && float64(obj.Rects.Width*obj.Rects.Height) >= size && PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) >= intersectionper {
+// // 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
+// a.TargetNum++
+// uuid := uuid.NewV4().String()
+// arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}}
+// //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]
+// //logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
+//}
+//
+//// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
+//func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
+// logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
+// for _, photo := range arg.Photo {
+// logger.Info("--------瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
+// }
+// for _, polygon := range cameraPolygons {
+// //logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
+// areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
+// // 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
+// CountAreaObjs(&areaMap,arg)
+// arg.AreaMapList = append(arg.AreaMapList, &areaMap)
+// }
+//}
func Push(data *protomsg.CompareArgs,sock mangos.Socket) []byte{
//var sock mangos.Socket
@@ -344,19 +343,16 @@
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))
receiver <- msg
default:
-
+ time.Sleep(time.Millisecond * 10)
}
}
}
--
Gitblit v1.8.0