Merge remote-tracking branch 'origin/master'

sunty

2019-07-31 d94f80d854d09e89715ca7c2361cd6057f98f396

 controllers/fileController.go

@@ -218,10 +218,15 @@

      logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
         ",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
      timeStart := time.Now()

      compareService := service.NewFaceCompareService(arg)
      compareOnce := compareService.Compare()
      //logger.Debug("compareResult.len:",*compareOnce)
      dataList := compareOnce.CompareData

      logger.Debug("comp 比对结束，用时：",time.Since(timeStart))

      service.SortByScore(dataList)
      totalList := len(dataList)
      m := make(map[string]interface{},3)
@@ -232,6 +237,7 @@
      } else {
         m["totalList"] = dataList[0:searchBody.Size]
      }
      logger.Debug("comp 比对加排序返回用时:", time.Since(timeStart))
      util.ResponseFormat(c,code.Success,m)
   }
}
@@ -277,7 +283,7 @@
         resultList = append(resultList,cr)
      }
   }
   logger.Debug("GetCompareDataTwice.data:",resultList)
   //logger.Debug("GetCompareDataTwice.data:",resultList)
   service.SortByScore(resultList)
   from := (arg.Page-1)*arg.Size
   to := from + arg.Size
@@ -290,7 +296,8 @@
      if to <= len(resultList) {
         m["totalList"] = resultList[from:to]
      } else {
         m["totalList"] = resultList[from:len(resultList)]
         lte := len(resultList)
         m["totalList"] = resultList[from:lte]
      }
   } else {
      m["totalList"] = []service.CompareResult{}