label重大更新

panlei

2019-08-01 740800875ea9f2b02674d91d4246bbf070d3a760

 main.go

@@ -4,20 +4,21 @@
   "basic.com/dbapi.git"
   "basic.com/pubsub/protomsg.git"
   "basic.com/valib/deliver.git"
   "ruleprocess/insertdata"
   "ruleprocess/util"

   //"bufio"
   //"bytes"
   "flag"
   "fmt"
   "ruleprocess/logger"
   "github.com/golang/protobuf/proto"
   "ruleprocess/logger"
   //"gocv.io/x/gocv"
   //"image"
   //"image/color"
   //"os"
   "ruleprocess/cache"
   "ruleprocess/ruleserver"
   "ruleprocess/util"
   "ruleprocess/insertdata"
   "sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -40,8 +41,9 @@
   go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
   logger.Info("cache init completed!!!",<- initchan)//dbserver初始化完毕
   //fmt.Println("缓存初始化完成",<- initchan)//dbserver初始化完毕

   ruleserver.Init()
   go ruleserver.TimeTicker()
   go ruleserver.StartServer()
   nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
   wg.Wait()
}
@@ -67,13 +69,13 @@
            continue
         } else {
            arg := ruleserver.SdkDatas{}
            //paramFormat(msg, &arg)
            m := paramFormat(msg, &arg)
            //logger.Info("解析出来的数据：", arg)
            logger.Info("解析出来的数据：", arg)
            ruleserver.Judge(&arg,&m) // 把sdkMessage传进去，方便缓存数据时拼出一个resultMag
            // 把arg里的打的标签拿出来给m再封装一层
            resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
            //logger.Info("打完标签后的结果：",resultMag)

            // 将打完标签的数据插入到ES
            insertdata.InsertToEs(resultMag)
         }
@@ -83,6 +85,7 @@

// 将外部传进来的rect（top,bottom,left,right）转化为自己内部的rect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
   //logger.Info("++++++++++++++++++++++++++++++收到的yolo的区域坐标：",rcobj)
   rect := ruleserver.Rect{}
   rect.X = float64(rcobj.Left)
   rect.Y = float64(rcobj.Top)
@@ -105,7 +108,11 @@
   if err != nil {
      panic("解析msg时出现错误")
   }

   // 先进行一下追踪
   ruleserver.FaceIsSame(&m)
   args.CameraId = m.Cid
   args.TaskId = m.Tasklab.Taskid
   // 把图片的二进制解压缩进行画框在压缩回去
   bdata, err := util.UnCompress(m.Data)
   if err != nil {
@@ -131,6 +138,7 @@
         // 暂时写死，sdk还没有这俩算法
         arg.KeepRight = false
         arg.IsStatic = false
         logger.Info("-----追踪之后sdkinfo.Sdkdata的长度为：----",len(sdkinfo.Sdkdata))
         if len(sdkinfo.Sdkdata) > 1 {
            // 大于1才有数据
            yoloParam := protomsg.ParamYoloObj{}
@@ -139,14 +147,16 @@
               logger.Info("解析YOLO sdk数据时出现错误", err)
               continue
            }
            //logger.Info("--------------看看yolo中有几个目标：",len(yoloParam.Infos))
            var yoloNum int = 0
            for _, info := range yoloParam.Infos {
               if info.Typ == 0 {
                  logger.Debug("-------------yolo的坐标有几个",info.RcObj)
                  //logger.Debug("-------------yolo的坐标有几个",info.RcObj)
                  photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
                  arg.Photo = append(arg.Photo, photoMap)
                  yoloNum++
               }
            }
            logger.Info("--------------追踪之后yolo的个数：",yoloNum)
            args.Sdkdata = append(args.Sdkdata,&arg)
         } else {
            continue
@@ -176,9 +186,9 @@
               logger.Info("解析FACE sdk数据时出现错误", err)
               continue
            }
            logger.Info("--------------看看人脸检测中有几个目标：",len(faceParam.Faces))
            logger.Info("--------------追踪之后yolo的个数：",len(faceParam.Faces))
            for _, info := range faceParam.Faces {
               logger.Info("_______________________________________________第一次看相似值：",info.Pos.FAngle.Confidence*100)
               //logger.Info("_______________________________________________第一次看相似值：",info.Pos.FAngle.Confidence*100)
               photoMap := ruleserver.PhotoMap{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)
            }