From 3b07d34fc238a5401896ada6e8d551a13c92e2fc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 31 七月 2019 15:19:20 +0800
Subject: [PATCH] fix compare
---
service/FaceCompareService.go | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 83b9b58..4c0de89 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -3,7 +3,6 @@
import (
esApi "basic.com/pubsub/esutil.git"
"basic.com/pubsub/protomsg.git"
- "encoding/json"
"github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
"nanomsg.org/go-mangos"
@@ -122,15 +121,17 @@
if resultB == nil || len(*resultB) ==0 {
continue
}
- rList :=make([]protomsg.Esinfo,0)
- err = json.Unmarshal(*resultB, &rList)
- if err !=nil{
- logger.Debug("comp recv result Unmarshal err:", err)
+ var sdkCompResult protomsg.SdkCompareResult
+ //rList :=make([]protomsg.Esinfo,0)
+ err = proto.Unmarshal(*resultB, &sdkCompResult)
+ if err !=nil {
+ logger.Debug("comp sdkCompareResult unmarshal err:", err)
continue
}
- logger.Debug("comp len(rList):", len(rList))
- if len(rList) >0 {
- resultList = append(resultList, FillDataToCompareResult(&rList)...)
+
+ logger.Debug("comp len(rList):", len(sdkCompResult.CompareResult))
+ if len(sdkCompResult.CompareResult) >0 {
+ resultList = append(resultList, FillDataToCompareResult(&sdkCompResult)...)
}
}
logger.Debug("comp totalList.len:", len(resultList))
@@ -176,24 +177,24 @@
}
//濉厖鍚戝墠绔繑鍥炵殑鏁版嵁
-func FillDataToCompareResult(rList *[]protomsg.Esinfo) []CompareResult {
+func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) []CompareResult {
resultList :=make([]CompareResult,0)
- dbPersonM := make(map[string]*protomsg.Esinfo,0)
- captureM := make(map[string]*protomsg.Esinfo,0)
+ dbPersonM := make(map[string]*protomsg.SdkCompareEach, 0)
+ captureM := make(map[string]*protomsg.SdkCompareEach, 0)
personIds :=make([]string,0)
captureIds := make([]string,0)
- for _,v :=range *rList{
+ for _,v :=range compResult.CompareResult{
if v.Tableid == CaptureTable {
- captureM[v.Id] = &v
+ captureM[v.Id] = v
captureIds = append(captureIds,v.Id)
} else {
- dbPersonM[v.Id] = &v
+ dbPersonM[v.Id] = v
personIds = append(personIds,v.Id)
}
}
- logger.Debug("comp personIds:", personIds)
- logger.Debug("comp captureIds:",captureIds)
+ logger.Debug("comp len(personIds):", len(personIds))
+ logger.Debug("comp len(captureIds):", len(captureIds))
esServerIp := config.EsInfo.Masterip
esServerPort := config.EsInfo.Httpport
index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
@@ -255,7 +256,7 @@
CameraAddr: vp.CameraAddr,
PicDate: vp.PicDate,
PicMaxUrl: vp.PicMaxUrl,
- PicSmUrl: parsePicSmUrl(vp.PicSmUrl),
+ PicSmUrl: vp.PicSmUrl,
IsAlarm: isAlarmInt,
Sex: vp.Sex,
AgeDescription: vp.AgeDescription,
@@ -270,13 +271,6 @@
}
}
return resultList
-}
-
-func parsePicSmUrl(picSmUrl string) []string {
- if picSmUrl != ""{
- return []string{ picSmUrl }
- }
- return []string{}
}
func parseMonitorLevel(level string) string {
--
Gitblit v1.8.0