---

panlei

2019-12-16 b9d95191e0326a1a75f3809d75b94638c47c3d43

 algorithm/middleware/insertDataToEs.go

@@ -1,7 +1,6 @@
package main

import (
   "encoding/base64"
   "encoding/json"
   "errors"
   "net"
@@ -9,15 +8,15 @@
   "strconv"
   "time"

   "basic.com/valib/logger.git"
   "github.com/golang/protobuf/proto"
   "github.com/satori/go.uuid"
   "basic.com/valib/logger.git"

   "ruleprocess/cache"
   "ruleprocess/structure"
   "basic.com/pubsub/protomsg.git"
   "basic.com/pubsub/esutil.git"
   "basic.com/pubsub/protomsg.git"
   "ruleprocess/cache"
   "ruleprocess/ruleserver"
   "ruleprocess/structure"
   "ruleprocess/util"
)

@@ -134,7 +133,7 @@
      faces = PutFace(faces, results.([]structure.Result))
      //logger.Info("整理后的数据：",faces)
      if faces != nil {
         logger.Warn("face不为nil")
         logger.Warn("目标不为nil")
         var imgMaxUrl []string = []string{}
         var picTime string = ""
         for _, face := range faces {
@@ -171,10 +170,10 @@
            target.TargetId = face.Id
            target.TargetScore = face.Score
            target.TargetType = face.Type
            target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
            target.Feature = face.Feature
            target.PicSmUrl = resp["fileUrl"].(string)
            target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
            target.AttachTarget = SourceTarget{face.AttachArg.Id,face.AttachArg.Score,face.AttachArg.Type,base64.StdEncoding.EncodeToString(face.AttachArg.Feature),"",Points{TopLeft: Point{face.AttachArg.Location.X, face.AttachArg.Location.Y}, BottomRight: Point{face.AttachArg.Location.X + face.AttachArg.Location.Width, face.AttachArg.Location.Y + face.AttachArg.Location.Height}}}
            target.AttachTarget = SourceTarget{face.AttachArg.Id,face.AttachArg.Score,face.AttachArg.Type,face.AttachArg.Feature,"",Points{TopLeft: Point{face.AttachArg.Location.X, face.AttachArg.Location.Y}, BottomRight: Point{face.AttachArg.Location.X + face.AttachArg.Location.Width, face.AttachArg.Location.Y + face.AttachArg.Location.Height}}}
            var targetInfos []Target
            targetInfos = append(targetInfos, *target)

@@ -186,7 +185,8 @@
            case "plate":
               sdkname = "车牌识别"
            case "track":
               sdkname = "人员跟踪"
               sdkname = "跟踪"
               logger.Info("数据到了此处")
               if len(face.Liker) == 1{
                  id = face.Liker[0].TargetId
               }
@@ -231,6 +231,7 @@
            }
            if key == "track" && len(face.Liker) == 1{
               esid := face.Liker[0].TargetId
               logger.Info("liker信息：",*face.Liker[0])
               returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),structure.EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
               if err1 != nil {
                  logger.Error("追加数据出错！---", err1)