---
panlei
2019-12-17 f8d06b644c67921ec0729879bc3ac6288931428c
algorithm/middleware/insertDataToEs.go
@@ -178,7 +178,6 @@
            targetInfos = append(targetInfos, *target)
            sdkname := ""
            id := face.Uuid
            switch key {
            case "face":
               sdkname = "人脸"
@@ -186,17 +185,12 @@
               sdkname = "车牌识别"
            case "track":
               sdkname = "跟踪"
               logger.Info("数据到了此处")
               if len(face.Liker) == 1{
                  id = face.Liker[0].TargetId
               }
            }
            //logger.Info("人脸目标target:",targetInfos)
            if key == "track" && len(face.Liker) == 1{
               logger.Info("确认过眼神是要追加的数据")
               pervideo1 := LinkInfo{
                  id,
                  face.Liker[0].TargetId,
                  msg.Cid,
                  msg.Push.Cam.Addr,
                  msg.Push.Cam.Name,
@@ -239,49 +233,56 @@
                  ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
               }
            } else {
               pervideo := PerVideoPicture{LinkInfo{
                  id,
                  msg.Cid,
                  msg.Push.Cam.Addr,
                  msg.Push.Cam.Name,
                  picTime,
                  imgMaxUrl,
                  msg.Tasklab.Taskid,
                  msg.Tasklab.Taskname,
                  sdkname,
                  "",
                  alarmRules,
                  time.Now().Format("2006-01-02 15:04:05"), // 只检测,没有比对时间
                  lable,
                  lableAttach,
                  "",
                  msg.Push.ServerId,
                  msg.Push.ServerName,
                  msg.Push.LocalIp,
                  "",
                  true,
                  false,
                  false,
                  false,
                  face.Liker,
                  targetInfos,
               },
                  "",
                  []*LinkInfo{},
               }
               requstbody, err := json.Marshal(pervideo)
               if err != nil {
                  logger.Info("json parse error ", err)
                  return
               }
               resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
               if err1 != nil {
                  logger.Error("上传ES出错!---", err1)
               id := face.Uuid
               if id == "" {
                  // 比到了相似的人但在此摄像机下已经出现过,最后不能插入数据库
                  logger.Info("冗余数据,并不入库")
               } else {
                  logger.Info("插入es返回的信息:", resp1)
                  // 发出录像信号
                  ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
                  logger.Info("新增数据")
                  pervideo := PerVideoPicture{LinkInfo{
                     id,
                     msg.Cid,
                     msg.Push.Cam.Addr,
                     msg.Push.Cam.Name,
                     picTime,
                     imgMaxUrl,
                     msg.Tasklab.Taskid,
                     msg.Tasklab.Taskname,
                     sdkname,
                     "",
                     alarmRules,
                     time.Now().Format("2006-01-02 15:04:05"), // 只检测,没有比对时间
                     lable,
                     lableAttach,
                     "",
                     msg.Push.ServerId,
                     msg.Push.ServerName,
                     msg.Push.LocalIp,
                     "",
                     true,
                     false,
                     false,
                     false,
                     face.Liker,
                     targetInfos,
                  },
                     "",
                     []*LinkInfo{},
                  }
                  requstbody, err := json.Marshal(pervideo)
                  if err != nil {
                     logger.Info("json parse error ", err)
                     return
                  }
                  resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
                  if err1 != nil {
                     logger.Error("上传ES出错!---", err1)
                  } else {
                     logger.Info("插入es返回的信息:", resp1)
                     // 发出录像信号
                     ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
                  }
               }
            }
         }