加上人脸，过完规则的标签区分人脸和yolo

panlei

2019-06-26 a3a788801fcd2efb16d58e91f393bad8d7730b96

 insertdata/insertDataToEs.go

@@ -93,76 +93,84 @@
// 往ES插数据
func InsertToEs(msg ruleserver.ResultMsg) {
   log.Println("往ES插数据")

   for _, sdkinfo := range msg.Tasklab.Sdkinfos {
      if sdkinfo.Sdktype == "FaceDetect" {
         if len(sdkinfo.Sdkdata) > 1 {

            faceParam := protomsg.ParamFacePos{}
            err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
            if err1 != nil {
               log.Println("解析FACE sdk有误", err1)
               continue
            }
            for _, face := range faceParam.Faces {
               pervideo := PerVideoPicture{
                  uuid.NewV4().String(),
                  msg.Cid,
                  msg.Caddr,
                  time.Now().Format("2006-01-02 15:04:05"),
                  "",
                  msg.Tasklab.Taskid,
                  msg.Tasklab.Taskname,
                  sdkinfo.SdkName,
                  "",
                  "",
                  face.Result.Gender,
                  face.Result.Age,
                  "",
                  face.Result.Race,
                  face.Result.Smile,
                  face.Result.Beauty,
                  "不是每个人脸算法都有",
                  "---",
                  "",
                  "",
                  "",
                  "",
                  "",
                  "",
                  "",
                  "",
                  0,
                  Base{
                     "是每个人脸算法都有吗",
                     "",
                     0,
                     "",
                     "",
                     "",
                     "",
                     "",
                     "",
                     "",
                     "",
                  },
               }
               requstbody, err := json.Marshal(pervideo)

               if err != nil {
                  log.Println("json parse error ", err)
                  return

               }
               err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
               if err != nil {
                  log.Println("es can not execute right.")
               }
            }
         } else {
            continue
   // 直接从规则的标签数据里拿符合规则的人脸结果
   for _, result := range msg.RuleResult {
      if !result.IsYolo {
         for _,face1 := range result.Faces{
            println(face1)
         }
      }
   }
   for _, sdkinfo := range msg.Tasklab.Sdkinfos {
      //if sdkinfo.Sdktype == "FaceDetect" {
      //   if len(sdkinfo.Sdkdata) > 1 {
      //
      //      faceParam := protomsg.ParamFacePos{}
      //      err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
      //      if err1 != nil {
      //         log.Println("解析FACE sdk有误", err1)
      //         continue
      //      }
      //      for _, face := range faceParam.Faces {
      //         pervideo := PerVideoPicture{
      //            uuid.NewV4().String(),
      //            msg.Cid,
      //            msg.Caddr,
      //            time.Now().Format("2006-01-02 15:04:05"),
      //            "",
      //            msg.Tasklab.Taskid,
      //            msg.Tasklab.Taskname,
      //            sdkinfo.SdkName,
      //            "",
      //            "",
      //            face.Result.Gender,
      //            face.Result.Age,
      //            "",
      //            face.Result.Race,
      //            face.Result.Smile,
      //            face.Result.Beauty,
      //            "不是每个人脸算法都有",
      //            "---",
      //            "",
      //            "",
      //            "",
      //            "",
      //            "",
      //            "",
      //            "",
      //            "",
      //            0,
      //            Base{ // 只有人脸比对有这个信息，人脸检测并没有
      //               "是每个人脸算法都有吗",
      //               "",
      //               0,
      //               "",
      //               "",
      //               "",
      //               "",
      //               "",
      //               "",
      //               "",
      //               "",
      //            },
      //         }
      //         requstbody, err := json.Marshal(pervideo)
      //
      //         if err != nil {
      //            log.Println("json parse error ", err)
      //            return
      //
      //         }
      //         err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
      //         if err != nil {
      //            log.Println("es can not execute right.")
      //         }
      //      }
      //
      //   } else {
      //      continue
      //   }
      //}
      if sdkinfo.Sdktype == "Yolo" {
         if len(sdkinfo.Sdkdata) > 1 {

@@ -188,11 +196,12 @@
               }
               i := protomsg.Image{}
               err = proto.Unmarshal(bdata, &i)
               resp,err = util.PostFormBufferData(weedfsUrl,i.Data,uuid.NewV4().String())
               resp,err = util.PostFormBufferData(weedfsUrl,i,uuid.NewV4().String())
               log.Println("已报警并上传改帧图片到服务器")
            }else {
               isAlarm = "0"
               //continue
               // 不是报警数据不存
               continue
            }
            log.Println("图片上传返回值：",resp)
            // 查询本机信息
@@ -202,7 +211,7 @@
            }
            // 查询cameraName
            camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
            if err == nil {
            if err != nil {
               log.Println("查询摄像机信息失败")
            }
            serverIp,err := GetLocalIP()