git add .

panlei

2019-11-07 23c837bc4d5b4312c0bb5eb96260c90e887882ac

 insertdata/insertDataToEs.go

@@ -218,7 +218,7 @@
            race := getRaceString(face.ThftRes.Race)
            ageDescription := getDescription(face.ThftRes.Age)
            logger.Info(ageDescription)
            esDataId := uuid.NewV4().String()
            //esDataId := uuid.NewV4().String()
            linksId := ""
            if linkId != "" {
               linksId = linkId
@@ -230,7 +230,7 @@
            //logger.Info("人脸的id:",strconv.FormatUint(face.Id, 10))
            logger.Info("%%%%%%%%%%%%%%%%%%%%%目标信息：",*target)
            pervideo := PerVideoPicture{
               esDataId,
               msg.Push.PushId,
               msg.Cid,
               msg.Push.Cam.Addr,
               picTime,
@@ -249,7 +249,7 @@
               face.ThftRes.Beauty,
               base64.StdEncoding.EncodeToString(face.Feature),
               []string{resp["fileUrl"].(string)},
               msg.Push.VideoUrl,
               "",
               msg.Push.ServerId,
               msg.Push.ServerName,
               msg.Push.LocalIp,
@@ -275,7 +275,7 @@
            } else {
               logger.Info("插入es返回的信息：", resp1)
               // 发出录像信号
               ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl:msg.Push.VideoUrl,ImgId: i.Id, SdkIds: []string{}, Type: 1})
               ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl:msg.Push.VideoUrl,ImgId: i.Id, SdkIds: []string{}, Type: 1})
            }
         }
      }
@@ -368,6 +368,10 @@
                     }
                     i := protomsg.Image{}
                     err = proto.Unmarshal(bdata, &i)
                     logger.Debug("持续时间第一张画框：")
                     for _,res := range msg1.RuleResult["yolo"].([]structure.Result) {
                        logger.Debug("持续时间第一张规则：",res)
                     }
                     resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
                     if err1 != nil {
                        logger.Error("缓存数据画框或上传图片服务器出错", err)
@@ -445,13 +449,13 @@

         if resp["fileUrl"] != nil {
            url = append(url, resp["fileUrl"].(string))
            esDataId := uuid.NewV4().String()
            //esDataId := uuid.NewV4().String()
            linksId := ""
            if linkId != "" {
               linksId = linkId
            }
            peraction := Personaction{
               esDataId,
               msg.Push.PushId,
               msg.Cid,
               msg.Push.Cam.Name,
               msg.Push.Cam.Addr,
@@ -467,7 +471,7 @@
               url,
               i.Timestamp,
               linksId,
               msg.Push.VideoUrl,
               "",
               isAlarm,
               0,
               0,
@@ -479,7 +483,6 @@
            if err != nil {
               logger.Info("json parse error ", err)
               return

            }
            resp1, err2 := EsReq("POST", personAction, requstbody)
            if err2 != nil {
@@ -487,8 +490,7 @@
            } else {
               logger.Debug("插入es返回的数据信息是：", resp1)
               // 发出录像信号
               logger.Info("给录像的视频地址：",msg.Push.VideoUrl)
               ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid,VideoUrl:msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{}, Type: 2})
               ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid,VideoUrl:msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{}, Type: 2})
               logger.Warn("__________________________________________往ES插入yolo数据成功")
               //os.Exit(1)
            }