From abc05dcd6f9ab2ec826c1109afc135e4722d5c28 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 01 八月 2019 18:26:31 +0800 Subject: [PATCH] fix 4 to 1 --- controllers/fileController.go | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/controllers/fileController.go b/controllers/fileController.go index a8dde46..b3b4406 100644 --- a/controllers/fileController.go +++ b/controllers/fileController.go @@ -182,9 +182,22 @@ TableName string `json:"tableName"` } +type CompareSortResult []CompareResult + +func (s CompareSortResult) Len() int{ + return len(s) +} +func (s CompareSortResult) Swap(i,j int){ + s[i],s[j] = s[j],s[i] +} +func (s CompareSortResult) Less(i,j int) bool{ + return s[i].CompareScore > s[j].CompareScore +} + //濉厖鍚戝墠绔繑鍥炵殑鏁版嵁 -func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) []CompareResult { - resultList :=make([]CompareResult,0) +func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) CompareSortResult { + //resultList :=make([]CompareResult,0) + var resultList = CompareSortResult{} dbPersonM := make(map[string]*protomsg.SdkCompareEach, 0) captureM := make(map[string]*protomsg.SdkCompareEach, 0) @@ -251,6 +264,8 @@ PhoneNum: p.PhoneNum, Sex: p.Sex, TableId: p.TableId, + BwType: strconv.Itoa(int(p.BwType)), + TableName: p.TableName, }) } vpE := CompareResult{ @@ -274,6 +289,7 @@ resultList = append(resultList,vpE) } } + sort.Sort(resultList) return resultList } @@ -369,10 +385,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 -- Gitblit v1.8.0