---

panlei

2019-08-16 b83eb30d3b0d1a43028c665bc28655d77cf98763

---

 main.go

@@ -5,6 +5,7 @@
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/deliver.git"
    "ruleprocess/insertdata"
    "ruleprocess/structure"
    "ruleprocess/util"
    "time"

@@ -76,14 +77,14 @@
                //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)
@@ -98,9 +99,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)
@@ -109,7 +110,7 @@
}

// 将外部传进来的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))
@@ -138,7 +139,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
@@ -166,7 +167,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}
                        arg.Photo = append(arg.Photo, photoMap)
                        yoloNum++
                    }
@@ -179,7 +180,7 @@

        }
        if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
            arg := ruleserver.SdkData{}
            arg := structure.SdkData{}
            arg.TaskId = m.Tasklab.Taskid
            arg.IpcId = sdkinfo.Ipcid
            arg.IsYolo = false
@@ -204,7 +205,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)