From 1ea27965df17bf8326455e207cf73a5094357282 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 11 九月 2019 09:47:53 +0800
Subject: [PATCH] merge labelFilter
---
ruleserver/readyDataForRule.go | 176 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 127 insertions(+), 49 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index ba290b0..8776f8b 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -1,21 +1,21 @@
package ruleserver
import (
- bigCache "basic.com/pubsub/cache.git"
"basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"encoding/json"
+ "errors"
"fmt"
"github.com/go-yaml/yaml"
+ "github.com/golang/protobuf/proto"
"io/ioutil"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
- "os"
+ "net"
"ruleprocess/cache"
"ruleprocess/logger"
- "github.com/golang/protobuf/proto"
"strconv"
"time"
)
@@ -49,13 +49,11 @@
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
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())
- }
+ go Push1()
}
+var sender chan *protomsg.CompareArgs = make(chan *protomsg.CompareArgs)
+var receiver chan []byte = make(chan []byte)
type BaseInfo struct {
TableId string `json:"tableId"`
TableName string `json:"tableName"`
@@ -110,9 +108,9 @@
return value2
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
-func GetTimeById(id string, index int) []TimeRange {
+func GetTimeById(id string, index int) []structure.TimeRange {
_, cameraTimeRule := cache.GetTimeRuleById(id)
- var timeRangeList []Day
+ var timeRangeList []structure.Day
err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
if err != nil {
logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
@@ -137,24 +135,17 @@
return 0
}
-type TimeRange struct {
- Start string `json:"start"`
- End string `json:"end"`
-}
-type Day struct {
- Day int `json:"day"` // 鏍囩ず褰撳墠鏄熸湡鍑�
- TimeRange []TimeRange `json:"time_range"` // 褰撳ぉ鐨勫嚑涓椂闂存
-}
+
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
-func Json2points(areaPoints string) []Point {
- var pts []Point
+func Json2points(areaPoints string) []structure.Point {
+ var pts []structure.Point
if areaPoints == "[]" || areaPoints == "" {
logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
- pts = append(pts, Point{0, 0})
- pts = append(pts, Point{0, 540})
- pts = append(pts, Point{960, 540})
- pts = append(pts, Point{960, 0})
+ pts = append(pts, structure.Point{0, 0})
+ pts = append(pts, structure.Point{0, 540})
+ pts = append(pts, structure.Point{960, 540})
+ pts = append(pts, structure.Point{960, 0})
} else {
err := json.Unmarshal([]byte(areaPoints), &pts)
if err != nil {
@@ -166,7 +157,7 @@
}
// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) FillLiker(tableId []string, compareThreshold float32) {
+func FillLiker(arg *structure.Arg,tableId []string, compareThreshold float32) {
//bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
comArg := &protomsg.CompareArgs{
TableIds:tableId,
@@ -174,11 +165,13 @@
CompareThreshold:compareThreshold,
Source:false,
}
- bytes := Push("tcp://192.168.1.182:40010",comArg,sock)
+
+ bytes := getCompareMsg(comArg)
var scResult protomsg.SdkCompareResult
err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
+ return
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
@@ -190,21 +183,25 @@
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
+ var dbApi dbapi.DbPersonApi
+ baseinfos, err1 := dbApi.Dbpersoninfosbyid(ids)
+ //baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
+ var dtapi dbapi.DbTableApi
for _, baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
//logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
tableIds := []string{}
tableIds = append(tableIds, baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
- table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
+ table, err := dtapi.DbtablesById(tableIds)
+ //table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
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}
+ 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}
//os.Exit(1)
arg.Liker = append(arg.Liker, &base)
}
@@ -213,7 +210,7 @@
}
// 浜鸿劯姣斿
-func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
+func Compare(args *structure.SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
var tableIds []string
var threshold float32 = 50 // 榛樿闃堝�间负50
@@ -255,18 +252,18 @@
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) {
+ if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]structure.FaceResult)) > 0 {
+ for _, faceResult := range args.RuleResult["face"].([]structure.FaceResult) {
for _,arg := range faceResult.Args {
logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
}
}
}
if compareFlag == 1 {
- arg.FillLiker(nil, threshold)
+ FillLiker(arg,nil, threshold)
}
if compareFlag == 2 {
- arg.FillLiker(tableIds, threshold)
+ FillLiker(arg,tableIds, threshold)
}
//logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
@@ -283,7 +280,7 @@
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func (a *AreaMap) CountAreaObjs(arg *SdkData) {
+func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
a.TargetNum = 0
threshold := 0.0 // 鐩镐技搴�
@@ -298,35 +295,35 @@
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
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{}}
+ arg1 := structure.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, []*structure.BaseInfo{}}
//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]
- 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)
}
// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
+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 := AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
+ areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
- areaMap.CountAreaObjs(arg)
+ CountAreaObjs(&areaMap,arg)
arg.AreaMapList = append(arg.AreaMapList, &areaMap)
}
}
-func Push(url string,data *protomsg.CompareArgs,sock mangos.Socket) []byte{
+func Push(data *protomsg.CompareArgs,sock mangos.Socket) []byte{
//var sock mangos.Socket
var err error
var msg []byte
@@ -339,11 +336,13 @@
logger.Error("Failed set MaxRecvSize: %v", err)
return nil
}
- //sock.AddTransport(ipc.NewTransport())
- sock.AddTransport(tcp.NewTransport())
- if err = sock.Dial(url); err != nil {
+ serverIP, _ := GetLocalIP()
+ if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
+
logger.Info("搴忓垪鍖栨暟鎹�")
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
@@ -354,12 +353,91 @@
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
if msg, err = sock.Recv(); err != nil {
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
return msg
}
+
+func Push1(){
+ //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)
+ }
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
+ serverIP, _ := GetLocalIP()
+ if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ }
+ logger.Info("搴忓垪鍖栨暟鎹�")
+
+ for {
+ select {
+ // case <-ctx.Done():
+ // return
+ case data := <- sender:
+ 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))
+ receiver <- msg
+ default:
+
+ }
+ }
+}
+func getCompareMsg(data *protomsg.CompareArgs) []byte{
+ sender <- data
+ return <-receiver
+}
+// 鑾峰彇鏈満ip
+func GetLocalIP() (ipv4 string, err error) {
+ var (
+ addrs []net.Addr
+ addr net.Addr
+ ipNet *net.IPNet // IP鍦板潃
+ isIpNet bool
+ )
+ // 鑾峰彇鎵�鏈夌綉鍗�
+ if addrs, err = net.InterfaceAddrs(); err != nil {
+ return
+ }
+ // 鍙栫涓�涓潪lo鐨勭綉鍗P
+ for _, addr = range addrs {
+ // 杩欎釜缃戠粶鍦板潃鏄疘P鍦板潃: ipv4, ipv6
+ if ipNet, isIpNet = addr.(*net.IPNet); isIpNet && !ipNet.IP.IsLoopback() {
+ // 璺宠繃IPV6
+ if ipNet.IP.To4() != nil {
+ ipv4 = ipNet.IP.String() // 192.168.1.1
+ return
+ }
+ }
+ }
+
+ err = errors.New("ipv4 not found")
+ return
+}
--
Gitblit v1.8.0