compareResult sort

liuxiaolong

2019-07-27 59e648d84df45c97c4591dd8c651fca0f20f86c1

 controllers/fileController.go

@@ -1,16 +1,14 @@
package controllers

import (
   "basic.com/pubsub/protomsg.git"
   "basic.com/dbapi.git"
   "basic.com/fileServer/WeedFSClient.git"
   "basic.com/valib/deliver.git"
   "basic.com/pubsub/protomsg.git"
   "bytes"
   "encoding/base64"
   "encoding/json"
   "errors"
   "fmt"
   "github.com/gin-gonic/gin"
   "github.com/gogo/protobuf/proto"
   "github.com/satori/go.uuid"
   "image"
   "image/jpeg"
@@ -25,10 +23,10 @@
   "webserver/extend/code"
   "webserver/extend/config"
   "webserver/extend/esutil"
   "webserver/extend/logger"
   "webserver/extend/util"
   "webserver/models"
   "webserver/service"
   esApi "basic.com/pubsub/esutil.git"
)

type FileController struct {
@@ -139,7 +137,7 @@
            urlArr = append(urlArr, weedFilePath)
         }
      }
      //2.大图画框
      //2.大图画框,标识人脸位置
      originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
      resultMap["uploadImage"] = originFilePath
      resultMap["smImage"] = urlArr
@@ -151,69 +149,75 @@

// @Summary 以图搜图
// @Description  以图搜图
// @Accept json
// @Produce json
// @Tags 以图搜图
// @Param url formData string true "url"
// @Param tableId formData string true "底库id"
// @Param compThreshold formData string true "比对阈值"
// @Param condition body models.EsSearch true "搜索参数"
// @Success 200 {string} json "{"code":200, msg:"", data:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", data:"", success:false}"
// @Router /data/api-v/dbperson/searchByPhoto [POST]
func (controller FileController) SearchByPhoto(c *gin.Context) {
   photoUrl := c.Request.FormValue("url")
   tableId := c.Request.FormValue("tableId")//底库id
   compThresholdStr := c.Request.FormValue("compThreshold")//比对阈值
   compThreshold, err := strconv.Atoi(compThresholdStr)
   if photoUrl == "" || err != nil {
   var searchBody models.EsSearch
   err := c.BindJSON(&searchBody)
   if err !=nil || searchBody.PicUrl == "" || len(searchBody.DataBases) == 0 {
      util.ResponseFormat(c, code.RequestParamError, "参数有误")
      return
   }
   if face,ok := faceExtractedMap[photoUrl];!ok{
      util.ResponseFormat(c, code.RequestParamError, "参数有误")
   var sysSetApi dbapi.SysSetApi
   analyServerId := ""
   flag, sysconf := sysSetApi.GetServerInfo()
   if flag {
      analyServerId = sysconf.ServerId
   } else {
      util.ResponseFormat(c, code.ComError, "analyServerId为空，配置有误")
      return
   }
   if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
      util.ResponseFormat(c, code.RequestParamError, "请重新上传图片")
      return
   } else {
      arg := protomsg.CompareArgs{
         TableIds:[]string{ tableId },
         FaceFeature:face.FaceBytes,
         CompareThreshold:float32(compThreshold),
         FaceFeature: face.FaceBytes,
         CompareThreshold: searchBody.Threshold,
      }
      b, err := proto.Marshal(&arg)
      if err !=nil{
         util.ResponseFormat(c, code.ComError, "请求marshal失败")
         return

      if searchBody.DataBases !=nil {
         for idx,tableId :=range searchBody.DataBases {
            if tableId == "esData" {
               searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
               searchBody.DataBases = append(searchBody.DataBases,service.CaptureTable)
               break
            }
         }
         arg.TableIds = searchBody.DataBases
      }
      compServerList := config.CompServerInfo.Url
      fmt.Println("compServerList:", compServerList)
      resultList :=make([]protomsg.Dbperson,0)
      for _,str :=range compServerList{
         reqUrl := "tcp://"+str
         reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
         err = reqClient.Send(b)
         if err !=nil{
            continue
         }
         resultB, err := reqClient.Recv()
         if err !=nil{
            continue
         }
         m :=make(map[string]float32,0)
         err = json.Unmarshal(resultB, &m)
         if err !=nil{
            continue
         }
         personIds := make([]string,len(m))
         for k,_ :=range m{
            personIds = append(personIds,k)
         }
         esServerIp := config.EsInfo.Masterip
         esServerPort := config.EsInfo.Httpport
         index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
         dbpeople, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
         if e ==nil{
            resultList = append(resultList,dbpeople...)
         }
      arg.Source = true // 标识来源是web
      arg.AlarmLevel = searchBody.AlarmLevel
      arg.Tasks = searchBody.Tasks
      arg.TreeNodes = searchBody.TreeNodes
      arg.Tabs = searchBody.Tabs
      arg.SearchTime = searchBody.SearchTime
      arg.InputValue = searchBody.InputValue
      arg.Collection = searchBody.Collection
      arg.AnalyServerId = analyServerId

      logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
         ",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
      compareService := service.NewFaceCompareService(arg)
      compareOnce := compareService.Compare()
      logger.Debug("compareResult:",*compareOnce)
      dataList := compareOnce.CompareData
      service.SortByScore(dataList)
      totalList := len(dataList)
      m := make(map[string]interface{},3)
      m["compareNum"] = compareOnce.CompareNum
      m["total"] = totalList
      if totalList <= searchBody.Size {
         m["totalList"] = dataList
      } else {
         m["totalList"] = dataList[0:searchBody.Size]
      }
      util.ResponseFormat(c,code.Success,resultList)
      util.ResponseFormat(c,code.Success,m)
   }
}

@@ -304,6 +308,7 @@
   dbperson.PersonPicUrl = field //  图片路经
   dbperson.TableId = tableId           //
   dbperson.PersonName = fileNameOnly       // 图片名
   dbperson.Enable = 1 //默认有效
   // 演示base64编码

   dbperson.FaceFeature = faceBase64 // 特征值base64 码
@@ -384,7 +389,7 @@
   //addResult["detail"] = details
   //fields := fdfsclient.UploadFileByBuffer100(bytess, extNames)     //  fastdfs 上传
   if len(successList)>0 {
      util.ResponseFormat(c, code.Success, addResult)
      util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
   } else {
      util.ResponseFormat(c, code.ServiceInsideError, err.Error())
   }