修改一下推送成功条件

panlei

2019-10-28 e3c33684b4907cc338866623d2362eb85100387d

 main.go

@@ -7,15 +7,18 @@
   "net/http"
   _ "net/http/pprof"
   "ruleprocess/insertdata"
   "ruleprocess/labelFilter"
   "ruleprocess/structure"
   "ruleprocess/util"
   "time"

   "basic.com/valib/logger.git"
   //"bufio"
   //"bytes"
   "flag"
   "fmt"
   "github.com/golang/protobuf/proto"
   "ruleprocess/logger"
   "github.com/spf13/viper"
   //"gocv.io/x/gocv"
   //"image"
   //"image/color"
@@ -23,7 +26,6 @@
   "ruleprocess/cache"
   "ruleprocess/ruleserver"
   "sync"
   "github.com/spf13/viper"
)

var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -42,8 +44,10 @@
   if viper.GetString("LogBasePath") != "" {
      logFile = viper.GetString("LogBasePath")
   }
   logFile = logFile + "/ruleprocess.log"
   logFile = logFile + "ruleprocess.log"
   fmt.Println("日志地址：",logFile)
   logger.Config(logFile, logger.DebugLevel)
   logger.SetSaveDays(7)
   logger.Info("日志初始化成功！")
}
func main() {
@@ -90,20 +94,20 @@
            //logger.Debug("使用的cpu个数：",runtime.NumCPU())
            //go func(msg []byte) {
               logger.Debug("当前时间戳：", time.Now().Unix())
               arg := ruleserver.SdkDatas{}
               arg := structure.SdkDatas{}
               //paramFormat(msg, &arg)
               start := time.Now()
               m := paramFormat(msg, &arg)
               // 进行规则处理判断(打上规则的标签)
               ruleserver.Judge(&arg, &m) // 把sdkMessage传进去，方便缓存数据时拼出一个resultMag
               // 把arg里的打的标签拿出来给m再封装一层
               resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
               resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
               logger.Debug("规则判断完所用时间：", time.Since(start))
               // 将打完标签的数据插入到ES
               insertdata.InsertToEs(resultMsg)
               logger.Debug("插入完Es所用时间：", time.Since(start))
               //事件推送
               //go labelFilter.Judge(resultMsg)
               go labelFilter.Judge(resultMsg)
            //}(msg)
         }
      }
@@ -112,9 +116,9 @@


// 将外部传进来的rect（top,bottom,left,right）转化为自己内部的rect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
func rectFormat(rcobj *protomsg.Rect) structure.Rect {
   //logger.Info("++++++++++++++++++++++++++++++收到的yolo的区域坐标：",rcobj)
   rect := ruleserver.Rect{}
   rect := structure.Rect{}
   rect.X = float64(rcobj.Left)
   rect.Y = float64(rcobj.Top)
   rect.Width = float64(rcobj.Right - rcobj.Left)
@@ -123,10 +127,10 @@
}

// 将外部传进来的sdk数据包解成 SdkDatas
func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
func paramFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage {
   defer func() {
      if err := recover(); err != nil {
         logger.Info("解包过程的错误", err.(string))
         logger.Info("解包过程的异常捕获", err.(string))
      }

   }()
@@ -152,7 +156,7 @@
   //logger.Info("----------------看看有几个算法：",len(m.Tasklab.Sdkinfos))
   for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo算法
      if sdkinfo.Sdktype == "Yolo" {
         arg := ruleserver.SdkData{}
         arg := structure.SdkData{}
         arg.TaskId = m.Tasklab.Taskid
         arg.IpcId = sdkinfo.Ipcid
         arg.IsYolo = true
@@ -180,7 +184,7 @@
            for _, info := range yoloParam.Infos {
               if info.Typ == 0 {
                  //logger.Debug("-------------yolo的坐标有几个",info.RcObj)
                  photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true}
                  photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true,Id:info.ObjID}
                  arg.Photo = append(arg.Photo, photoMap)
                  yoloNum++
               }
@@ -193,7 +197,7 @@

      }
      if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
         arg := ruleserver.SdkData{}
         arg := structure.SdkData{}
         arg.TaskId = m.Tasklab.Taskid
         arg.IpcId = sdkinfo.Ipcid
         arg.IsYolo = false
@@ -218,7 +222,7 @@
            logger.Info("--------------追踪之后人脸的个数：", len(faceParam.Faces))
            for _, info := range faceParam.Faces {
               //logger.Info("_______________________________________________第一次看相似值：",info.Pos.FAngle.Confidence*100)
               photoMap := ruleserver.PhotoMap{Id: info.Pos.FaceID, Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence * 100), IsYolo: false, ThftRes: *(info.Result), Feature: info.Feats}
               photoMap := structure.PhotoMap{Id: info.Pos.FaceID, Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence * 100), IsYolo: false, ThftRes: *(info.Result), Feature: info.Feats}
               arg.Photo = append(arg.Photo, photoMap)
            }
            args.Sdkdata = append(args.Sdkdata, &arg)