panlei
2019-11-04 5a6639ba0450e5f58955f5d7d906b9e454a4295e
labelFilter/readyDataForLabel.go
@@ -1,9 +1,9 @@
package labelFilter
import (
   "basic.com/valib/logger.git"
   "ruleprocess/cache"
   "ruleprocess/logger"
   "ruleprocess/ruleserver"
   "ruleprocess/structure"
   "time"
)
@@ -13,12 +13,15 @@
   CameraAddr    string
   TaskId        string
   Time        string
   Persons       []ruleserver.FaceResult
   Persons       []structure.FaceResult
   DefenceLevel  []int32
}
// 把数据装配到label
func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
   if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0) {
func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
   logger.Debug("face结果:",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
   logger.Debug("yolo结果:",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
   if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) {
      logger.Info("---------------标签过滤器赋值")
      label.CameraId = result.Cid
      camera, err := cache.GetCameraById(result.Cid)
      if err != nil {
@@ -27,14 +30,20 @@
      label.CameraName = camera.Name
      label.CameraAddr = camera.Addr
      label.TaskId = result.Tasklab.Taskid
      label.Time = time.Now().String()
      for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
         label.Persons = append(label.Persons,faceGroup)
         label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
      label.Time = time.Now().Format("2006-01-02 15:04:05")
      if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0 {
         for _,faceGroup := range result.RuleResult["face"].([]structure.FaceResult) {
            label.Persons = append(label.Persons,faceGroup)
            label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
         }
      }
      for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
         label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
      if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {
         for _,yoloGroup := range result.RuleResult["yolo"].([]structure.Result) {
            label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
         }
      }
      logger.Info("------------标签过滤器赋值完毕")
   }
}