fix sort

liuxiaolong

2019-08-01 684a1f1638b235e26cb6d0ed4e8152d4f4546d3e

fix sort

 controllers/fileController.go

@@ -17,6 +17,7 @@
    "mime/multipart"
    "net/http"
    "path"
    "sort"
    "strconv"
    "strings"
    "time"
@@ -365,11 +366,12 @@
        compareService := service.NewFaceCompareService(arg)
        compareOnce := compareService.Compare()
        totalData := compareOnce.CompareData

        logger.Debug("comp 比对结束，用时：",time.Since(timeStart))
        m := make(map[string]interface{},3)
        if totalData!=nil && len(*totalData)>0{
        if totalData!=nil && len(*totalData) > 0{
            //按分值排序
            service.SortByScore(totalData)
            sort.Sort(totalData)
            total := len(*totalData)

            m["compareNum"] = compareOnce.CompareNum

 service/FaceCompareService.go

@@ -8,7 +8,6 @@
    "nanomsg.org/go-mangos/protocol/req"
    "nanomsg.org/go-mangos/transport/ipc"
    "nanomsg.org/go-mangos/transport/tcp"
    "sort"
    "sync"
    "webserver/extend/config"
    "webserver/extend/logger"
@@ -28,28 +27,19 @@

type CompareOnce struct {
    CompareNum string `json:"compareOnce"`
    CompareData *[]*protomsg.SdkCompareEach `json:"compareData"`
    CompareData *CompareResultSort `json:"compareData"`
}

type CompareResultWrapper struct {
    CompareData *[]*protomsg.SdkCompareEach
    By func(p,q *protomsg.SdkCompareEach) bool
}
type CompareResultSort []*protomsg.SdkCompareEach

func (crw CompareResultWrapper) Len()int {
    return len(*crw.CompareData)
func (crw CompareResultSort) Len()int {
    return len(crw)
}
func (crw CompareResultWrapper) Swap(i,j int) {
    (*crw.CompareData)[i],(*crw.CompareData)[j] = (*crw.CompareData)[j],(*crw.CompareData)[i]
func (crw CompareResultSort) Swap(i,j int) {
    crw[i],crw[j] = crw[j],crw[i]
}
func (crw CompareResultWrapper) Less(i,j int) bool{
    return crw.By((*crw.CompareData)[i],(*crw.CompareData)[j])
}

func SortByScore(list *[]*protomsg.SdkCompareEach) {
    sort.Sort(CompareResultWrapper{list, func(p, q *protomsg.SdkCompareEach) bool {
        return q.CompareScore < p.CompareScore //递减排序
    }})
func (crw CompareResultSort) Less(i,j int) bool{//降序排序
    return crw[i].CompareScore > crw[j].CompareScore
}

var compResultHisM = make(map[string]*CompareOnce,0)
@@ -78,7 +68,8 @@
    compServerList := config.CompServerInfo.Url
    logger.Debug("compServerList:", compServerList)
    //1.向各个compare进程发起请求拿到比对结果
    resultList :=make([]*protomsg.SdkCompareEach,0)
    var resultList CompareResultSort
    //resultList :=make([]*protomsg.SdkCompareEach,0)
    for _,str :=range compServerList{
        reqUrl := "tcp://"+str
        resultB := doCompareRequest(reqUrl,b)