add initForCaptureData controller add initForMonitoringData controller fix ...

sunty

2019-07-22 5e664037b47b68b1ba28e07cefcfcec2795fbeed

add initForCaptureData controller
add initForMonitoringData controller
fix capture
fix monitoring

 controllers/androidAction.go

File was deleted

 controllers/capture.go

@@ -17,7 +17,7 @@
// @Description 实时抓拍数据
// @Accept  json
// @Produce json
// @Tags es
// @Tags realTime
// @Param obj body map true "底库数据"
// @Success 200 {string} json "{"code":200, msg:"目录结构数据", success:true}"
// @Failure 500 {string} json "{"code":500,  msg:"返回错误信息", success:false}"
@@ -45,22 +45,11 @@
    prama := "{\"query\":{\"bool\":{\"filter\":[" +
        cameraIdStr +
        analyServerFilterStr +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
        "{\"range\":{\"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\"]}"
    fmt.Println(prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    /*for _, value := range tokenRes["datalist"].([]interface{}) {
        if value.(map[string]interface{})["personId"] != nil {
            info := getDBPersonInfo(value.(map[string]interface{})["personId"].(string))
            for key, val := range info {
                //fmt.Println(value.(map[string]interface{})[key],val)
                value.(map[string]interface{})[key] = val

            }
        }
    }*/

    util.ResponseFormat(c, code.Success, tokenRes)
}

 controllers/initForData.go

New file
@@ -0,0 +1,91 @@
package controllers

import (
    "fmt"
    "github.com/gin-gonic/gin"
    "strings"
    "webserver/extend/code"
    "webserver/extend/config"
    "webserver/extend/esutil"
    "webserver/extend/util"
)

type InitForData struct {
}

// @Summary 抓拍实时图数据初始化
// @Description 实时获取数据
// @Accept  json
// @Produce json
// @Tags realTime
// @Success 200 {string} json "{"code":200, msg:"目录结构数据", success:true}"
// @Failure 500 {string} json "{"code":500,  msg:"返回错误信息", success:false}"
// @Router /data/api-v/realTime/action [POST]
//实时抓拍数据初始化
func (rc *RealTimeController) InitForCaptureData(c *gin.Context) {
    searchBody := make(map[string]interface{}, 0)
    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
    url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
        "/" + index + "/_search"
    var setApi dbapi.SysSetApi
    _, sysconf := setApi.GetServerInfo()
    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"

    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
        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\"]" +
        "}"
    fmt.Println(prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}

// @Summary 实时任务监控数据初始化
// @Description 实时监控比对数据
// @Accept  json
// @Produce json
// @Tags realTime
// @Param obj body map true "底库数据"
// @Success 200 {string} json "{"code":200, msg:"目录结构数据", success:true}"
// @Failure 500 {string} json "{"code":500,  msg:"返回错误信息", success:false}"
// @Router /data/api-v/realTime/monitoring [POST]
//实时监控数据初始化
func (rc *RealTimeController) InitForMonitoringData(c *gin.Context) {
    searchBody := make(map[string]interface{}, 0)

    c.BindJSON(&searchBody)
    index := config.EsInfo.EsIndex.VideoPersons.IndexName
    cameraIdStr := ""
    cameraId := searchBody["treeNodes"].([]interface{})
    if cameraId != nil && len(cameraId) > 0 {
        esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
    }
    //判断任务ID
    taskIdStr := "{\"terms\":{\"taskId\":[]}},"
    taskId := searchBody["tasks"].([]interface{})
    if taskId != nil && len(taskId) > 0 {
        esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
        taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
    }
    //请求头
    url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
        "/" + index + "/_search"
    var setApi dbapi.SysSetApi
    _, sysconf := setApi.GetServerInfo()
    analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"

    prama := "{\"query\":{\"bool\":{\"filter\":[" +
        cameraIdStr +
        taskIdStr +
        analyServerFilterStr +
        "]}}," +
        "\"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\"]}"
    fmt.Println(prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}

 controllers/monitoring.go

@@ -16,7 +16,7 @@
// @Description 实时监控比对数据
// @Accept  json
// @Produce json
// @Tags es
// @Tags realTime
// @Param obj body map true "底库数据"
// @Success 200 {string} json "{"code":200, msg:"目录结构数据", success:true}"
// @Failure 500 {string} json "{"code":500,  msg:"返回错误信息", success:false}"
@@ -34,7 +34,7 @@
        cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
    }
    //判断任务ID
    taskIdStr := ""
    taskIdStr := "{\"terms\":{\"taskId\":[]}},"
    taskId := searchBody["tasks"].([]interface{})
    if taskId != nil && len(taskId) > 0 {
        esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
@@ -52,10 +52,10 @@
        cameraIdStr +
        taskIdStr +
        analyServerFilterStr +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
        "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +
        "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"cameraId\"]}"
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
    fmt.Println(prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    /*    for _, value := range tokenRes["datalist"].([]interface{}) {

 router/router.go

@@ -137,7 +137,8 @@
    {
        realTime.POST("/capture", realTimeController.PostCapture)
        realTime.POST("/monitoring", realTimeController.PostMonitoring)
        realTime.POST("/action", realTimeController.PostAction)
        realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
        realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
    }
    //底库 操作
    vdbtable := r.Group(urlPrefix + "/dbtable")