为数据写入当前规则处理时间

panlei

2019-11-16 74b51d7b71fa71788754285691ecbaf5d34f7d70

 insertdata/insertDataToEs.go

@@ -249,7 +249,7 @@
               msg.Tasklab.Taskid,
               msg.Tasklab.Taskname,
               "人脸",
               "",
               time.Now().Format("2006-01-02 15:04:05"),
               alarmRules,
               time.Now().Format("2006-01-02 15:04:05"), // 只检测，没有比对时间
               sex,                                      //暂改为人脸id strconv.FormatUint(face.Id, 10)
@@ -367,6 +367,7 @@
                     linkInfo = "联动任务"
                  }
                  alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
                  logger.Info("打印任务名称：",)
                  // 上传缓存数据的图片拿到url
                  if yoloResult.Others.CacheData != nil {
                     //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -462,7 +463,7 @@
                  msg.Tasklab.Taskid,
                  msg.Tasklab.Taskname,
                  sdkNames,
                  "",
                  time.Now().Format("2006-01-02 15:04:05"),
                  alarmRules,
                  msg.Push.ServerId,
                  msg.Push.ServerName,
@@ -516,22 +517,31 @@
      // 先判断一下数据带的规则标签是否有可以插入的
      logger.Info("插入定时目标信息：",len(msg.RuleResult["target"].([]structure.Result)))
      for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
         for _, tar := range yoloResult.AlarmObj {
            // 装载目标信息
            logger.Info("报警目标个数：",len(yoloResult.AlarmObj),tar.AreaJson,tar.Location,tar.Score)
            var target = new(Target)
            target.TargetId = strconv.FormatUint(tar.Id, 10)
            target.TargetScore = tar.Score
            target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
         // 装载目标信息`
         // 如果有首次报警的则本帧数据可以插入
         insertFlag := false
         alarmNum := 0
         for _,obj := range yoloResult.AlarmObj {
            if obj.TimeLable == "10" {
               insertFlag = true
               alarmNum++
            }
         }
         if insertFlag {
            logger.Info("报警目标个数：",alarmNum)
            //var target = new(Target)
            //target.TargetId = strconv.FormatUint(tar.Id, 10)
            //target.TargetScore = tar.Score
            //target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
            //logger.Info("人脸的id:",strconv.FormatUint(face.Id, 10))
            var targetInfos []Target
            targetInfos = append(targetInfos, *target)
            //var targetInfos []Target
            //targetInfos = append(targetInfos, *target)
            // 获取目标缓存图片
            url := []string{}
            //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
            // 把缓存的数据上传后得到地址存进去
            // 解压缩并上传图片
            url1 := uploadImg(tar.CacheData)
            url1 := uploadImg(yoloResult.AlarmObj[0].CacheData)
            url = append(url,url1)
            // 添加报警规则组
            sdkNames := ""
@@ -585,16 +595,19 @@
            }
            if resp["fileUrl"] != nil {
               url = append(url, resp["fileUrl"].(string))
               if len(url) == 1 {
                  return
               }
               //esDataId := uuid.NewV4().String()
               peraction := Personaction{
                  tar.Uuid,
                  msg.Push.PushId,
                  msg.Cid,
                  msg.Push.Cam.Name,
                  msg.Push.Cam.Addr,
                  msg.Tasklab.Taskid,
                  msg.Tasklab.Taskname,
                  sdkNames,
                  "",
                  time.Now().Format("2006-01-02 15:04:05"),
                  alarmRules,
                  msg.Push.ServerId,
                  msg.Push.ServerName,
@@ -607,7 +620,7 @@
                  0,
                  0,
                  0,
                  targetInfos,
                  nil,
                  linkTag,
                  linkTagInfos,
               }
@@ -635,6 +648,8 @@
                  //os.Exit(1)
               }
            }
         } else {
            logger.Info("没有首次报警的目标，不插入")
         }
      }
   }
@@ -700,7 +715,7 @@
   }
   i := protomsg.Image{}
   err = proto.Unmarshal(bdata, &i)
   resp1, err1 := util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
   resp1, err1 := util.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
   if err1 != nil {
      logger.Error("缓存数据画框或上传图片服务器出错", err)
   } else {