From 0ea2815ff30489781880fb48f1b9a748c44e091e Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 01 八月 2019 11:40:59 +0800 Subject: [PATCH] test --- controllers/fileController.go | 14 ++++++++++++-- service/FaceCompareService.go | 18 +++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/controllers/fileController.go b/controllers/fileController.go index a8dde46..9284697 100644 --- a/controllers/fileController.go +++ b/controllers/fileController.go @@ -369,10 +369,20 @@ logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart)) m := make(map[string]interface{},3) - if totalData!=nil && len(*totalData) > 0{ + if totalData != nil && totalData.Len() > 0{ //鎸夊垎鍊兼帓搴� + var scorePre []float32 + for _,f1 :=range *totalData { + scorePre = append(scorePre, f1.CompareScore) + } + logger.Debug("comp 鎺掑簭鍓嶅垎鍊兼暟缁勶細",scorePre) sort.Sort(totalData) - total := len(*totalData) + var scoreAf []float32 + for _,f2 :=range *totalData { + scoreAf = append(scoreAf, f2.CompareScore) + } + logger.Debug("comp 鎺掑簭鍚庡垎鍊兼暟缁勶細",scoreAf) + total := totalData.Len() m["compareNum"] = compareOnce.CompareNum m["total"] = total diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go index 0ff7969..bc94ee3 100644 --- a/service/FaceCompareService.go +++ b/service/FaceCompareService.go @@ -27,19 +27,19 @@ type CompareOnce struct { CompareNum string `json:"compareOnce"` - CompareData *CompareResultSort `json:"compareData"` + CompareData *CompareList `json:"compareData"` } -type CompareResultSort []*protomsg.SdkCompareEach +type CompareList []*protomsg.SdkCompareEach -func (crw CompareResultSort) Len()int { - return len(crw) +func (s CompareList) Len()int { + return len(s) } -func (crw CompareResultSort) Swap(i,j int) { - crw[i],crw[j] = crw[j],crw[i] +func (s CompareList) Swap(i,j int) { + s[i],s[j] = s[j],s[i] } -func (crw CompareResultSort) Less(i,j int) bool{//闄嶅簭鎺掑簭 - return crw[i].CompareScore > crw[j].CompareScore +func (s CompareList) Less(i,j int) bool{//闄嶅簭鎺掑簭 + return s[i].CompareScore > s[j].CompareScore } var compResultHisM = make(map[string]*CompareOnce,0) @@ -68,7 +68,7 @@ compServerList := config.CompServerInfo.Url logger.Debug("compServerList:", compServerList) //1.鍚戝悇涓猚ompare杩涚▼鍙戣捣璇锋眰鎷垮埌姣斿缁撴灉 - var resultList CompareResultSort + var resultList CompareList //resultList :=make([]*protomsg.SdkCompareEach,0) for _,str :=range compServerList{ reqUrl := "tcp://"+str -- Gitblit v1.8.0