delete EndTime omitempty

sunty

2019-07-30 11164b48c94572573b51c380894763008f6010f6

 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 {
@@ -120,11 +118,12 @@
      return
   }
   var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"

   resultMap :=make(map[string]interface{},0)
   //将上传的图片交人脸检测和人脸提取，获得特征
   fileBytes, _ := ioutil.ReadAll(file)
   faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
   if err ==nil && len(faceArr) >0 {
      //1.提取每一张人脸小图
      urlArr := make([]string,0)
      for _,r := range faceArr {
         rcFace := r.Pos.RcFace
@@ -138,8 +137,11 @@
            urlArr = append(urlArr, weedFilePath)
         }
      }

      util.ResponseFormat(c,code.Success,urlArr)
      //2.大图画框,标识人脸位置
      originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
      resultMap["uploadImage"] = originFilePath
      resultMap["smImage"] = urlArr
      util.ResponseFormat(c,code.Success, resultMap)
   } else {
      util.ResponseFormat(c,code.ComError,"未提取到人脸")
   }
@@ -147,65 +149,164 @@

// @Summary 以图搜图
// @Description  以图搜图
// @Accept json
// @Produce json
// @Tags 以图搜图
// @Param url formData string true "url"
// @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")
   if photoUrl == "" {
   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, "参数有误")
   if searchBody.CompareNum !="" {
      //二次搜索，不需要再比对了
      co := service.GetCompResultByNum(searchBody.CompareNum)
      if co != nil {
         //二次搜索和排序
         twiceM := GetCompareDataTwice(co,&searchBody)
         util.ResponseFormat(c,code.Success,twiceM)
      } else {
         m :=make(map[string]interface{},0)
         m["compareNum"] = searchBody.CompareNum
         m["total"] = 0
         m["totalList"] = []service.CompareResult{}
         util.ResponseFormat(c,code.CompareResultGone,m)
      }
   }
   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{
         FaceFeature:face.FaceBytes,
         CompareThreshold:0.2,
         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)
   }
}

func GetCompareDataTwice(co *service.CompareOnce,arg *models.EsSearch) map[string]interface{} {
   camIds := arg.TreeNodes
   tabIds := arg.Tabs
   taskIds := arg.Tasks
   alarmLevels := arg.AlarmLevel
   timeArr := arg.SearchTime
   input := arg.InputValue
   resultList := make([]service.CompareResult,0)
   for _,cr :=range co.CompareData {
      if cr.Id !=""{
         n :=0
         if len(camIds) == 0 || isInArr(cr.CameraId,camIds) {
            n++
         }
         if len(tabIds) == 0 {
            n++
         }
         if len(taskIds) == 0 || isInArr(cr.TaskId, taskIds) {
            n++
         }
         //判断报警等级
         if len(alarmLevels) == 0 {

         }
         n++
         //判断时间
         if len(timeArr) == 0 {

         }
         n++
         if input == ""{

         }
         n++
         if n == 6 {
            resultList = append(resultList,cr)
         }
      } else {
         resultList = append(resultList,cr)
      }
   }
   logger.Debug("GetCompareDataTwice.data:",resultList)
   service.SortByScore(resultList)
   from := (arg.Page-1)*arg.Size
   to := from + arg.Size
   lenth := len(resultList)
   m := make(map[string]interface{},0)
   m["total"] = lenth
   m["compareNum"] = arg.CompareNum

   if from < len(resultList) {
      if to <= len(resultList) {
         m["totalList"] = resultList[from:to]
      } else {
         m["totalList"] = resultList[from:len(resultList)]
      }
   } else {
      m["totalList"] = []service.CompareResult{}
   }
   return m
}

func isInArr(id string,arr []string) bool {
   for _,v :=range arr {
      if v == id {
         return true
      }
   }
   return false
}


// @Description 人员照片上传并获取特征值
// @Router /data/api-v/dbperson/fileUploadTest [POST]
@@ -294,6 +395,7 @@
   dbperson.PersonPicUrl = field //  图片路经
   dbperson.TableId = tableId           //
   dbperson.PersonName = fileNameOnly       // 图片名
   dbperson.Enable = 1 //默认有效
   // 演示base64编码

   dbperson.FaceFeature = faceBase64 // 特征值base64 码
@@ -374,7 +476,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())
   }