Merge remote-tracking branch 'origin/master'

sunty

2019-08-01 f79f18bf3e65ad0eaf8fd1feb788bf792e362520

 controllers/fileController.go

@@ -17,6 +17,7 @@
   "mime/multipart"
   "net/http"
   "path"
   "sort"
   "strconv"
   "strings"
   "time"
@@ -181,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)
@@ -273,6 +287,7 @@
         resultList = append(resultList,vpE)
      }
   }
   sort.Sort(resultList)
   return  resultList
}

@@ -365,12 +380,23 @@
      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 && totalData.Len() > 0{
         //按分值排序
         service.SortByScore(totalData)
         total := len(*totalData)
         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)
         }
         //logger.Debug("comp 排序后分值数组：",scoreAf)
         total := totalData.Len()

         m["compareNum"] = compareOnce.CompareNum
         m["total"] = total