add cameraId filter

sunty

2019-07-31 91cb9553117a1875edce05bb213f2ce96dc2ac26

add cameraId filter

 controllers/initForData.go

@@ -29,11 +29,18 @@
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
        "/" + index + "/_search"
    cameraIdStr := ""
    cameraId := searchBody["treeNodes"].([]interface{})
    if cameraId != nil && len(cameraId) > 0 {
        esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
    }
    var setApi dbapi.SysSetApi
    _, sysconf := setApi.GetServerInfo()
    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"

    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
        cameraIdStr +
        analyServerFilterStr +
        "]}},\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
@@ -57,7 +64,7 @@
    searchBody := make(map[string]interface{}, 0)

    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName +","+config.EsInfo.EsIndex.Personaction.IndexName
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    cameraIdStr := ""
    cameraId := searchBody["treeNodes"].([]interface{})
    if cameraId != nil && len(cameraId) > 0 {
@@ -90,4 +97,4 @@
    //logger.Debug("InitForMonitoringData:", prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}
}