Merge remote-tracking branch 'origin/master'

sunty

2019-07-31 d94f80d854d09e89715ca7c2361cd6057f98f396

 service/FaceCompareService.go

@@ -3,7 +3,6 @@
import (
   esApi "basic.com/pubsub/esutil.git"
   "basic.com/pubsub/protomsg.git"
   "encoding/json"
   "github.com/gogo/protobuf/proto"
   "github.com/satori/go.uuid"
   "nanomsg.org/go-mangos"
@@ -122,15 +121,17 @@
      if resultB == nil || len(*resultB) ==0 {
         continue
      }
      rList :=make([]protomsg.Esinfo,0)
      err = json.Unmarshal(*resultB, &rList)
      if err !=nil{
         logger.Debug("comp recv result Unmarshal err:", err)
      var sdkCompResult protomsg.SdkCompareResult
      //rList :=make([]protomsg.Esinfo,0)
      err = proto.Unmarshal(*resultB, &sdkCompResult)
      if err !=nil {
         logger.Debug("comp sdkCompareResult unmarshal err:", err)
         continue
      }
      logger.Debug("comp len(rList):", len(rList))
      if len(rList) >0 {
         resultList = append(resultList, FillDataToCompareResult(&rList)...)

      logger.Debug("comp len(rList):", len(sdkCompResult.CompareResult))
      if len(sdkCompResult.CompareResult) >0 {
         resultList = append(resultList, FillDataToCompareResult(&sdkCompResult)...)
      }
   }
   logger.Debug("comp totalList.len:", len(resultList))
@@ -176,24 +177,24 @@
}

//填充向前端返回的数据
func FillDataToCompareResult(rList *[]protomsg.Esinfo) []CompareResult {
func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) []CompareResult {
   resultList :=make([]CompareResult,0)

   dbPersonM := make(map[string]*protomsg.Esinfo,0)
   captureM := make(map[string]*protomsg.Esinfo,0)
   dbPersonM := make(map[string]*protomsg.SdkCompareEach, 0)
   captureM := make(map[string]*protomsg.SdkCompareEach, 0)
   personIds :=make([]string,0)
   captureIds := make([]string,0)
   for _,v :=range *rList{
   for _,v :=range compResult.CompareResult{
      if v.Tableid == CaptureTable {
         captureM[v.Id] = &v
         captureM[v.Id] = v
         captureIds = append(captureIds,v.Id)
      } else {
         dbPersonM[v.Id] = &v
         dbPersonM[v.Id] = v
         personIds = append(personIds,v.Id)
      }
   }
   logger.Debug("comp personIds:", personIds)
   logger.Debug("comp captureIds:",captureIds)
   logger.Debug("comp len(personIds):", len(personIds))
   logger.Debug("comp len(captureIds):", len(captureIds))
   esServerIp := config.EsInfo.Masterip
   esServerPort := config.EsInfo.Httpport
   index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
@@ -227,9 +228,7 @@
         resultList = append(resultList,cr)
      }
   }
   var capturePersons []protomsg.Videopersons
   if len(captureIds) >0 {
      logger.Debug("comp capturePersons:", capturePersons)
      videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
      logger.Debug("comp videoPersons.len:",len(videopersons))
      for _,vp :=range videopersons {
@@ -255,7 +254,7 @@
            CameraAddr: vp.CameraAddr,
            PicDate: vp.PicDate,
            PicMaxUrl: vp.PicMaxUrl,
            PicSmUrl: []string{ vp.PicSmUrl },
            PicSmUrl: vp.PicSmUrl,
            IsAlarm: isAlarmInt,
            Sex: vp.Sex,
            AgeDescription: vp.AgeDescription,