update protomsg and use aiocean index

liuxiaolong

2019-11-20 ec3cdd20b8221caa6093d0a44984ee3098504b52

 controllers/fileController.go

@@ -183,17 +183,16 @@

type CompareResult struct {
   Id string `json:"id"`
   CompareScore float32 `json:"compareScore"`
   CompareScore float64 `json:"compareScore"`
   CameraId string `json:"cameraId"`
   CameraName string `json:"cameraName"`
   CameraAddr string `json:"cameraAddr"`
   PicDate string `json:"picDate"`
   Content string `json:"content"`
   IsAlarm int `json:"isAlarm"`
   IsAlarm bool `json:"isAlarm"`
   PicMaxUrl string `json:"picMaxUrl"`
   PicSmUrl []string `json:"picSmUrl"`
   Sex string `json:"sex"`
   AgeDescription string `json:"ageDescription"`
   Race string `json:"race"`
   TargetInfo []TargetInfo `json:"targetInfo"`
   TaskId string `json:"taskId"`
   TaskName string `json:"taskName"`
   BaseInfo []DbPersonVo `json:"baseInfo"`
@@ -201,23 +200,35 @@
   SdkName string `json:"sdkName"`
   AlarmRules []AlarmRuleVo `json:"alarmRules"`
}

type TargetInfo struct {
   TargetId       string `json:"targetId"`
   TargetScore    float64 `json:"targetScore"`
   Feature        string `json:"feature"`
   PicSmUrl       string `json:"picSmUrl"`
   TargetLocation TargetLocation `json:"targetLocation"`
}

type TargetLocation struct {
   TopLeft     protomsg.Location `json:"topLeft"`
   BottomRight protomsg.Location `json:"bottomRight"`
}

type DbPersonVo struct {
   BwType string `json:"bwType"`
   CompareScore float32 `json:"compareScore"`
   IdCard string `json:"idCard"`
   CompareScore float64 `json:"compareScore"`
   MonitorLevel string `json:"monitorLevel"`
   PersonId string `json:"personId"`
   PersonName string `json:"personName"`
   PersonPicUrl string `json:"personPicUrl"`
   PhoneNum string `json:"phoneNum"`
   Sex string `json:"sex"`
   TargetId string `json:"targetId"`
   TargetName string `json:"targetName"`
   TargetPicUrl string `json:"targetPicUrl"`
   Labels string `json:"labels"`
   TableId string `json:"tableId"`
   TableName string `json:"tableName"`
   Enable int32 `json:"enable"`
}

type ScoreIndex struct {
   CompareScore float32
   CompareScore float64
   Index int
}

@@ -242,13 +253,13 @@
      if v.Tableid == service.CaptureTable {
         captureM[v.Id] = ScoreIndex{
            Index: idx,
            CompareScore: v.CompareScore,
            CompareScore: float64(v.CompareScore),
         }
         captureIds = append(captureIds,v.Id)
      } else {
         dbPersonM[v.Id] = ScoreIndex{
            Index: idx,
            CompareScore: v.CompareScore,
            CompareScore: float64(v.CompareScore),
         }
         personIds = append(personIds,v.Id)
      }
@@ -266,14 +277,12 @@
      var dtApi dbapi.DbTableApi
      for _,p :=range dbpersons {
         var dbP = DbPersonVo {
            PersonId: p.Id,
            IdCard: p.IdCard,
            CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
            TargetId: p.Id,
            CompareScore: dbPersonM[p.Id].CompareScore,
            MonitorLevel: p.MonitorLevel,
            PersonName: p.PersonName,
            PersonPicUrl: p.PersonPicUrl,
            PhoneNum: p.PhoneNum,
            Sex: p.Sex,
            TargetName: p.PersonName,
            TargetPicUrl: p.PersonPicUrl,
            Labels: p.Sex+" / "+p.IdCard+" / "+p.IdCard,
            TableId: p.TableId,
            Enable: p.Enable,
         }
@@ -295,21 +304,18 @@
         return nil
      }
      logger.Debug("captureIds:",strings.Join(captureIds,","))
      videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
      logger.Debug("comp videoPersons.len:",len(videopersons))
      for _,vp :=range videopersons {
         isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
      aiTargets, _ := esApi.AIOceaninfosbyid(captureIds, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
      logger.Debug("comp aiTargets.len:",len(aiTargets))
      for _,vp :=range aiTargets {
         var bi []DbPersonVo
         for _,p :=range vp.BaseInfo {
            bi = append(bi, DbPersonVo{
               PersonId: p.PersonId,
               IdCard: p.IdCard,
               CompareScore: util.ParseScore(p.CompareScore),
               TargetId: p.TargetId,
               CompareScore: float64(p.CompareScore),
               MonitorLevel: parseMonitorLevel(p.MonitorLevel),
               PersonName: p.PersonName,
               PersonPicUrl: p.PersonPicUrl,
               PhoneNum: p.PhoneNum,
               Sex: p.Sex,
               TargetName: p.TargetName,
               TargetPicUrl: p.TargetPicUrl,
               Labels: p.Labels,
               TableId: p.TableId,
               BwType: p.BwType,
               TableName: p.TableName,
@@ -328,18 +334,39 @@
               })
            }
         }
         var ti = make([]TargetInfo,0)
         if vp.TargetInfo !=nil {
            for _,vti :=range ti {
               tl := protomsg.Location{
                  X: vti.TargetLocation.TopLeft.X,
                  Y: vti.TargetLocation.TopLeft.Y,
               }
               br := protomsg.Location{
                  X: vti.TargetLocation.BottomRight.X,
                  Y: vti.TargetLocation.BottomRight.Y,
               }
               tInfo := TargetInfo{
                  TargetId: vti.TargetId,
                  TargetScore: vti.TargetScore,
                  Feature: vti.Feature,
                  PicSmUrl: vti.PicSmUrl,
                  TargetLocation: TargetLocation{
                     TopLeft:tl,
                     BottomRight:br,
                  },
               }
               ti = append(ti, tInfo)
            }
         }
         vpE := CompareResult{
            Id: vp.Id,
            CompareScore: util.ParseScore(captureM[vp.Id].CompareScore),
            CompareScore: captureM[vp.Id].CompareScore,
            CameraId: vp.CameraId,
            CameraAddr: vp.CameraAddr,
            PicDate: vp.PicDate,
            PicMaxUrl: vp.PicMaxUrl,
            PicSmUrl: vp.PicSmUrl,
            IsAlarm: isAlarmInt,
            Sex: vp.Sex,
            AgeDescription: vp.AgeDescription,
            Race: vp.Race,
            TargetInfo: ti,
            IsAlarm: vp.IsAlarm,
            TaskName: vp.TaskName,
            TaskId: vp.TaskId,
            VideoUrl: vp.VideoUrl,
@@ -443,7 +470,7 @@
            return
         }
      } else {
         searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CompTargetId, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
         searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CompTargetId, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
         if err !=nil {
            util.ResponseFormat(c, code.ComError, "抓拍数据不存在，请检查")
            return
@@ -590,7 +617,7 @@
         arg.Collection = searchBody.Collection
         arg.AnalyServerId = localConf.ServerId
         alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
         captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), alarmLevelTypes)
         captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), alarmLevelTypes)
         logger.Debug("searchPhoto first Result.len:",len(*co.CompareData),"twice len(captureIds):",len(captureIds))
         if captureIds !=nil {
            var aResult protomsg.SdkCompareResult