merge labelFilter

panlei

2019-09-10 e2aab518eddae165b9a7c517fbaddaf692ac4070

 insertdata/insertDataToEs.go

@@ -9,7 +9,6 @@
   "net"
   "ruleprocess/cache"
   "ruleprocess/logger"
   "ruleprocess/structure"
   "time"

   "basic.com/pubsub/protomsg.git"
@@ -111,6 +110,7 @@
   RuleText     string `json:"ruleText"`
   DefenceState bool   `json:"defenceState"`
   IsLink       bool   `json:"isLink"`
   LinkInfo    string `json:"linkInfo"`
}

// 一个face对多个规则组的归置人脸的结构体
@@ -181,7 +181,7 @@
            //os.Exit(1)
            for _,faceResult := range face.rules {
               alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
               alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink})
               alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink,""})
            }
            i := protomsg.Image{}
            err = proto.Unmarshal(bdata, &i)
@@ -204,7 +204,7 @@
            if err != nil {
               logger.Error("上传小图出错")
            }
            logger.Info("================小图地址:", resp["fileUrl"].(string))
            //logger.Info("================小图地址:", resp["fileUrl"].(string))
            sex := ""
            if face.ThftRes.Gender == 1 {
               sex = "男"
@@ -337,7 +337,11 @@
               //logger.Info("应该进来才对的")
               sdkNames = sdkNames + yoloResult.SdkName
               alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
               alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink})
               linkInfo := ""
               if yoloResult.IsLink {
                  linkInfo = "联动任务"
               }
               alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink,linkInfo})
               // 上传缓存数据的图片拿到url
               if yoloResult.Others.CacheData != nil {
                  //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -395,6 +399,7 @@
            resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
            if err != nil {
               logger.Error("画框或上传图片服务器出错", err)
               return
            } else {
               logger.Info("上传的图片信息：", resp)
            }
@@ -415,7 +420,7 @@
            logger.Error("查询摄像机信息失败")
         }
         serverIp, err := GetLocalIP()

         if resp["fileUrl"] != nil {
         url = append(url, resp["fileUrl"].(string))
         esDataId := uuid.NewV4().String()
         linksId := ""
@@ -447,9 +452,46 @@
         }
         requstbody, err := json.Marshal(peraction)

//<<<<<<< HEAD
//         url = append(url, resp["fileUrl"].(string))
//         esDataId := uuid.NewV4().String()
//         linksId := ""
//         if linkId != "" {
//            linksId = linkId
//         }
//         peraction := Personaction{
//            esDataId,
//            msg.Cid,
//            camera.Name,
//            camera.Addr,
//            msg.Tasklab.Taskid,
//            msg.Tasklab.Taskname,
//            sdkNames,
//            "",
//            alarmRules,
//            localConfig.ServerId,
//            localConfig.ServerName,
//            serverIp,
//            "",
//            url,
//            i.Timestamp,
//            linksId,
//            "",
//            isAlarm,
//            0,
//            0,
//            0,
//         }
//         requstbody, err := json.Marshal(peraction)
//
//         if err != nil {
//            logger.Info("json parse error ", err)
//            return
//=======
         if err != nil {
            logger.Info("json parse error ", err)
            return
//>>>>>>> labelFilter

         }
         resp1, err2 := EsReq("POST", personAction, requstbody)
@@ -462,6 +504,7 @@
            logger.Warn("__________________________________________往ES插入yolo数据成功")
            //os.Exit(1)
         }
         }
      } else {
         logger.Debug("timeLabel条件都不符合！")
      }