From 1e24626fa58f488f7744ce94e88a650f05c7a749 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 08 八月 2019 18:53:38 +0800
Subject: [PATCH] add log

---
 controllers/fileController.go |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index 6d3318f..8ebc80c 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -224,8 +224,7 @@
 		dbpersons, _ = esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
 	}
 
-	logger.Debug("comp dbpersons.len:", len(dbpersons))
-	if dbpersons !=nil {
+	if len(dbpersons) >0 {
 		for _,p :=range dbpersons {
 			var dbP = DbPersonVo {
 				PersonId: p.Id,
@@ -292,7 +291,17 @@
 			resultList = append(resultList,vpE)
 		}
 	}
+	var scorePre []float32
+	for _,f1 :=range resultList {
+		scorePre = append(scorePre, f1.CompareScore)
+	}
+	logger.Debug("comp 鎺掑簭鍓嶅垎鍊兼暟缁勶細",scorePre)
 	sort.Sort(resultList)
+	var scoreAf []float32
+	for _,f2 :=range resultList {
+		scoreAf = append(scoreAf, f2.CompareScore)
+	}
+	logger.Debug("comp 鎺掑簭鍚庡垎鍊兼暟缁勶細",scoreAf)
 	return  resultList
 }
 
@@ -327,13 +336,13 @@
 	}
 	var faceB []byte
 	if searchBody.CaptureId != "" {//鍋氭煡鎵炬浜�,鎼滄墍鏈夋姄鎷嶅拰搴曞簱
-		searchPeople, err := esApi.Dbpersoninfosbyid([]string{searchBody.CaptureId}, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+		searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CaptureId, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
 		if err !=nil {
 			util.ResponseFormat(c, code.ComError, "鎶撴媿鏁版嵁涓嶅瓨鍦紝璇锋鏌�")
 			return
 		}
-		if searchPeople !=nil && len(searchPeople) == 1{
-			decodeF, err := base64.StdEncoding.DecodeString(searchPeople[0].FaceFeature)
+		if searchBase64Fea !=""{
+			decodeF, err := base64.StdEncoding.DecodeString(searchBase64Fea)
 			if err !=nil {
 				util.ResponseFormat(c, code.ComError, "鏈潯鎶撴�曠壒寰佷笉鏄痓ase64锛岃妫�鏌�")
 				return
@@ -406,16 +415,16 @@
 	m := make(map[string]interface{},3)
 	if totalData != nil && totalData.Len() > 0{
 		//鎸夊垎鍊兼帓搴�
-		var scorePre []float32
-		for _,f1 :=range *totalData {
-			scorePre = append(scorePre, f1.CompareScore)
-		}
+		//var scorePre []float32
+		//for _,f1 :=range *totalData {
+		//	scorePre = append(scorePre, f1.CompareScore)
+		//}
 		//logger.Debug("comp 鎺掑簭鍓嶅垎鍊兼暟缁勶細",scorePre)
 		sort.Sort(totalData)
-		var scoreAf []float32
-		for _,f2 :=range *totalData {
-			scoreAf = append(scoreAf, f2.CompareScore)
-		}
+		//var scoreAf []float32
+		//for _,f2 :=range *totalData {
+		//	scoreAf = append(scoreAf, f2.CompareScore)
+		//}
 		//logger.Debug("comp 鎺掑簭鍚庡垎鍊兼暟缁勶細",scoreAf)
 		total := totalData.Len()
 

--
Gitblit v1.8.0