From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 13 十一月 2019 19:33:39 +0800 Subject: [PATCH] fix --- service/FaceCompareService.go | 58 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 17 deletions(-) diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go index bc94ee3..24aabde 100644 --- a/service/FaceCompareService.go +++ b/service/FaceCompareService.go @@ -8,9 +8,10 @@ "nanomsg.org/go-mangos/protocol/req" "nanomsg.org/go-mangos/transport/ipc" "nanomsg.org/go-mangos/transport/tcp" + "strconv" "sync" "webserver/extend/config" - "webserver/extend/logger" + "basic.com/valib/logger.git" ) type FaceCompareService struct { @@ -63,21 +64,22 @@ var CaptureTable = "capturetable" // 鎶撴媿搴� -func (sv *FaceCompareService) Compare() *CompareOnce{ +func (sv *FaceCompareService) CompareVideoPersons() *CompareList{ + sv.CompareArgs.TableIds = []string { CaptureTable } b, err := proto.Marshal(&sv.CompareArgs) - compServerList := config.CompServerInfo.Url - logger.Debug("compServerList:", compServerList) - //1.鍚戝悇涓猚ompare杩涚▼鍙戣捣璇锋眰鎷垮埌姣斿缁撴灉 + esCompServerList := config.EsCompServerInfo.Ips + logger.Debug("compServerList:", esCompServerList) + //1.鍚戝悇涓狤s compare杩涚▼鍙戣捣璇锋眰鎷垮埌姣斿缁撴灉 var resultList CompareList - //resultList :=make([]*protomsg.SdkCompareEach,0) - for _,str :=range compServerList{ - reqUrl := "tcp://"+str + + for _,str :=range esCompServerList{ + reqUrl := "tcp://"+str + ":"+strconv.Itoa(config.EsCompServerInfo.Port) resultB := doCompareRequest(reqUrl,b) if resultB == nil || len(*resultB) ==0 { continue } var sdkCompResult protomsg.SdkCompareResult - //rList :=make([]protomsg.Esinfo,0) + err = proto.Unmarshal(*resultB, &sdkCompResult) if err !=nil { logger.Debug("comp sdkCompareResult unmarshal err:", err) @@ -87,19 +89,41 @@ logger.Debug("comp len(rList):", len(sdkCompResult.CompareResult)) if len(sdkCompResult.CompareResult) >0 { resultList = append(resultList, sdkCompResult.CompareResult...) - //resultList = append(resultList, FillDataToCompareResult(&sdkCompResult)...) } } logger.Debug("comp totalList.len:", len(resultList)) - //2.缂撳瓨姣斿缁撴灉 - co := &CompareOnce{ - CompareNum: sv.CompareNum, - CompareData: &resultList, - } - SetCompResultByNum(co) + return &resultList +} - return co +//姣斿搴曞簱 +func (sv *FaceCompareService) CompareDbPersons() *CompareList{ + b, err := proto.Marshal(&sv.CompareArgs) + dbPersonCompServerUrl := config.DbPersonCompInfo.Ip + logger.Debug("comp Server url:", dbPersonCompServerUrl) + + var resultList CompareList + + reqUrl := "tcp://"+dbPersonCompServerUrl+":"+strconv.Itoa(config.DbPersonCompInfo.Port) + resultB := doCompareRequest(reqUrl,b) + if resultB == nil || len(*resultB) ==0 { + return nil + } + var sdkCompResult protomsg.SdkCompareResult + err = proto.Unmarshal(*resultB, &sdkCompResult) + if err !=nil { + logger.Debug("comp sdkCompareResult unmarshal err:", err) + return nil + } + + logger.Debug("comp len(rList):", len(sdkCompResult.CompareResult)) + if len(sdkCompResult.CompareResult) >0 { + resultList = append(resultList, sdkCompResult.CompareResult...) + } + + logger.Debug("comp totalList.len:", len(resultList)) + + return &resultList } func doCompareRequest(url string,args []byte) *[]byte{ -- Gitblit v1.8.0