From 6be5f42ff0e8c9671dd0e99eb2988e8c7c305d91 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期二, 10 九月 2019 17:06:35 +0800 Subject: [PATCH] dial fix --- ruleserver/readyDataForRule.go | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 107 insertions(+), 13 deletions(-) diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go index 77e739f..cbf9a5a 100644 --- a/ruleserver/readyDataForRule.go +++ b/ruleserver/readyDataForRule.go @@ -1,14 +1,20 @@ package ruleserver import ( + "basic.com/dbapi.git" 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" + "net" "ruleprocess/cache" "ruleprocess/logger" "strconv" @@ -16,7 +22,7 @@ ) var serverIp, serverPort, dbTablePersons string - +var sock mangos.Socket type conf struct { PhotoUrl string `yaml:"photoUrl"` VideoPersons string `yaml:"videoPersons"` @@ -45,6 +51,14 @@ } 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()) + } + serverIP, _ := GetLocalIP() + if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil { + logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error()) + } } type BaseInfo struct { @@ -72,7 +86,7 @@ taskGroup = task } } - logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------") + logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId) for _,ruleGroup := range taskGroup.GroupRules{ logger.Info(ruleGroup.GroupText) } @@ -158,35 +172,51 @@ // 缁欑洰鏍囧~鍏卨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) + //bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold) + comArg := &protomsg.CompareArgs{ + TableIds:tableId, + FaceFeature:arg.Feature, + CompareThreshold:compareThreshold, + Source:false, + } + + bytes := Push(comArg,sock) + //bytes := []byte{} + var scResult protomsg.SdkCompareResult + err1 := proto.Unmarshal(bytes, &scResult) if err1 != nil { logger.Error("getBaseInfo瑙e帇閿欒", err1) + return } //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) 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] * 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 +228,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" { // 閰嶄簡浜鸿劯姣斿 @@ -307,3 +337,67 @@ arg.AreaMapList = append(arg.AreaMapList, &areaMap) } } + +func Push(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()) + + 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 +} + +// 鑾峰彇鏈満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