fix face to FaceDetect

liuxiaolong

2020-07-28 74f4798a0f8578aa4609cd05f57f19f43a115afc

 esutil/EsClient.go

@@ -100,19 +100,13 @@
         }
         alarmRules, exist := source["alarmRules"]
         if exist {
            fmt.Println("exist alarmRules")
            if alarmB,ae := json.Marshal(alarmRules);ae ==nil {
               var alarmRArr []AlarmRule
               if ae = json.Unmarshal(alarmB, &alarmRArr);ae ==nil && len(alarmRArr) >0 {
                  d["alarmLevel"] = alarmRArr[0].AlarmLevel
               } else {
                  fmt.Println("unmarshal ae:", ae)
               }
            } else {
               fmt.Println("ae:", ae)
            }
         } else {
            fmt.Println("no alarmRules")
            d["alarmLevel"] = ""
         }
         pmArr := pmax.([]interface{})
@@ -138,7 +132,7 @@
         if len(tiArr) > 0 {
            ti := tiArr[0]
            d["picSmUrl"] = ti.PicSmUrl
            if ti.TargetType == "face" {
            if ti.TargetType == "FaceDetect" {
               sLabelStr, ok := source["showLabels"]
               if ok {
                  labelArr := strings.Split(sLabelStr.(string), "/")
@@ -302,7 +296,7 @@
      mustNotStr = strings.Join(mustNotArr, ",")
   }
   param := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"],\"must_not\":["+mustNotStr+"]}},\"size\":\""+sizeStr+"\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\",\"alarmRules\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
      "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\",\"alarmRules\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\"]}" +
      "}"
   err, tokenRes := GetEsDataReq(url, param, true)