fix all

sunty

2019-11-19 d9e01c51a525adf4f2393a95f87604e3b6e79ad2

fix all

 controllers/capture.go

@@ -33,12 +33,14 @@
func (rc *RealTimeController) PostCapture(c *gin.Context) {
    var searchBody RealTimeArg
    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    index := config.EsInfo.EsIndex.AiOcean.IndexName
    cameraIdStr := ""
    linkTagInfoCameraIdStr := ""
    cameraId := searchBody.TreeNodes
    if cameraId != nil && len(cameraId) > 0 {
        esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
        linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
    }
    //请求头
    localConf, err2 := cache.GetServerInfo()
@@ -51,14 +53,22 @@
        "/" + index + "/_search"

    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"

    prama := "{\"query\":{\"bool\":{\"filter\":[" +
    linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"
    prama := "{\"query\":{\"bool\":{\"should\":[" +
        "{\"bool\":{\"filter\":[" +
        "{\"term\":{\"isAlarm\":\"1\"}}," +
        cameraIdStr +
        analyServerFilterStr +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
        "]}}," +
        "{\"bool\":{\"filter\":[" +
        "{\"term\":{\"isAlarm\":\"1\"}}," +
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}

 controllers/esSearch.go

@@ -200,7 +200,7 @@
        linkTagInfoAnalyServerFilterStr +
        "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+
        "]}}" +
        "]," +
        "]}}," +
        "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
        "}"

 controllers/initForData.go

@@ -31,7 +31,7 @@
    //searchBody := make(map[string]interface{}, 0)
    var searchBody RealTimeArg
    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    index := config.EsInfo.EsIndex.AiOcean.IndexName
    localConf, err2 := cache.GetServerInfo()
    if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
        logger.Debug("localConfig is wrong!!!")
@@ -41,21 +41,34 @@
    url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
        "/" + index + "/_search"
    cameraIdStr := ""
    linkTagInfoCameraIdStr := ""
    if searchBody.TreeNodes !=nil {
        cameraId := searchBody.TreeNodes
        if cameraId != nil && len(cameraId) > 0 {
            esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
            cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
            linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
        }
    }

    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
    linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"

    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
    prama := "{\"query\":{\"bool\":{\"should\":[" +
        "{\"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\"]" +
        "]}}," +
        "{\"bool\":{\"filter\":[" +
        "{\"term\":{\"isAlarm\":\"1\"}}," +
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
        "}"
    //logger.Debug("InitForCaptureData:", prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
@@ -81,19 +94,23 @@
    //searchBody := make(map[string]interface{}, 0)
    var searchBody InitForMonitorArg
    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    index := config.EsInfo.EsIndex.AiOcean.IndexName
    cameraIdStr := ""
    linkTagInfoCameraIdStr := ""
    cameraId := searchBody.TreeNodes
    if cameraId != nil && len(cameraId) > 0 {
        esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
        linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
    }
    //判断任务ID
    taskIdStr := "{\"terms\":{\"taskId\":[]}},"
    taskIdStr := ""
    linkTagInfoTaskIdStr := ""
    taskId := searchBody.Tasks
    if taskId != nil && len(taskId) > 0 {
        esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
        taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
        linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}},"
    }
    //请求头
    localConf, err2 := cache.GetServerInfo()
@@ -106,15 +123,23 @@
        "/" + index + "/_search"

    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
    linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"

    prama := "{\"query\":{\"bool\":{\"filter\":[" +
        cameraIdStr +
    prama := "{\"query\":{\"bool\":{\"should\":[" +
        "{\"bool\":{\"filter\":[" +
        taskIdStr +
        cameraIdStr +
        analyServerFilterStr +
        "]}}," +
        "{\"bool\":{\"filter\":[" +
        linkTagInfoTaskIdStr +
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"20\"," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
    //logger.Debug("url:", url)
    //logger.Debug("InitForMonitoringData:", prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)

 controllers/monitoring.go

@@ -29,19 +29,23 @@
    var searchBody InitForMonitorArg

    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    index := config.EsInfo.EsIndex.AiOcean.IndexName
    cameraIdStr := ""
    linkTagInfoCameraIdStr := ""
    cameraId := searchBody.TreeNodes
    if cameraId != nil && len(cameraId) > 0 {
        esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
        linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
    }
    //判断任务ID
    taskIdStr := "{\"terms\":{\"taskId\":[]}},"
    taskIdStr := ""
    linkTagInfoTaskIdStr := ""
    taskId := searchBody.Tasks
    if taskId != nil && len(taskId) > 0 {
        esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
        taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
        linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}},"
    }
    //请求头
    localConf, err2 := cache.GetServerInfo()
@@ -54,15 +58,25 @@
        "/" + index + "/_search"

    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
    linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"

    prama := "{\"query\":{\"bool\":{\"filter\":[" +
    prama := "{\"query\":{\"bool\":{\"should\":[" +
        "{\"bool\":{\"filter\":[" +
        cameraIdStr +
        taskIdStr +
        analyServerFilterStr +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
        "]}}," +
        "{\"bool\":{\"filter\":[" +
        linkTagInfoCameraIdStr +
        linkTagInfoTaskIdStr +
        linkTagInfoAnalyServerFilterStr +
        "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
    fmt.Println(prama)
    fmt.Println(url)
    tokenRes := esutil.GetEsDataReq(url, prama, true)

 controllers/taglist.go

@@ -62,7 +62,7 @@
        return false
    }
    url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
        "/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "/_search"
        "/" + config.EsInfo.EsIndex.AiOcean.IndexName + "/_search"
    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"baseInfo.tableId\":\"" + id + "\"}}]}},\"size\":0}"
    buf, err := esutil.EsReq("POST", url, []byte(prama))
    if err != nil {