add targetlocation

sunty

2019-12-19 05eb392fbf5c8e6b5cfd615e1dc56bf1ff7cdc64

add targetlocation

 EsApi.go

@@ -680,7 +680,7 @@
    case "face":
        source = []string{"id","targetInfo.feature","analyServerId","cameraId"}
    case "track":
        source = []string{"id","targetInfo.feature","analyServerId","cameraId","targetInfo.attachTarget.feature","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature","linkTagInfo.cameraId"}
        source = []string{"id","targetInfo.feature","analyServerId","cameraId","targetInfo.attachTarget.feature","targetInfo.targetLocation","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature","linkTagInfo.cameraId","linkTagInfo.targetInfo.targetLocation"}
    }
    JsonDSL := `
                {
@@ -737,7 +737,7 @@
    case "face":
        source = []string{"id","targetInfo.feature","analyServerId"}
    case "track":
        source = []string{"id","targetInfo.feature","analyServerId","targetInfo.attachTarget.feature","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature"}
        source = []string{"id","targetInfo.feature","analyServerId","targetInfo.attachTarget.feature","targetInfo.targetLocation","linkTagInfo.targetInfo.feature","linkTagInfo.targetInfo.attachTarget.feature","linkTagInfo.targetInfo.targetLocation"}
    }

    url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"

 EsClient.go

@@ -74,7 +74,26 @@
                    continue
                }
                if m["attachTarget"] != nil {
                multiInfo.AttachFeature, ok = m["attachTarget"].(map[string]interface{})["feature"].(string)
                    multiInfo.AttachFeature, ok = m["attachTarget"].(map[string]interface{})["feature"].(string)
                }
                if m["targetLocation"] != nil {
                    targetLocation := m["targetLocation"].(map[string]interface{})
                    topLeft := targetLocation["topLeft"].(map[string]interface{})
                    tx := topLeft["x"].(float64)
                    ty := topLeft["y"].(float64)
                    bottomRight := targetLocation["bottomRight"].(map[string]interface{})
                    bx := bottomRight["x"].(float64)
                    by := bottomRight["y"].(float64)
                    multiInfo.TargetLocation = &protomsg.TargetLocation{
                        TopLeft: &protomsg.Location{
                            X: tx,
                            Y: ty,
                        },
                        BottomRight: &protomsg.Location{
                            X: bx,
                            Y: by,
                        },
                    }
                }
            }
        }
@@ -85,16 +104,35 @@
        multiInfo.EsInfo = &tmpinfo
        multiInfo.CameraId, ok = source["cameraId"].(string)
        //fmt.Println(source["cameraId"])
        leis := make([]*protomsg.LinkEsInfo,0)
        if source["linkTagInfo"] != nil{
            for _,v := range source["linkTagInfo"].([]interface{}) {
        leis := make([]*protomsg.LinkEsInfo, 0)
        if source["linkTagInfo"] != nil {
            for _, v := range source["linkTagInfo"].([]interface{}) {
                var lei protomsg.LinkEsInfo
                mi := v.(map[string]interface{})
                lei.CameraId, ok = mi["cameraId"].(string)
                if mi["targetInfo"] != nil {
                    for _,val := range mi["targetInfo"].([]interface{}){
                    for _, val := range mi["targetInfo"].([]interface{}) {
                        fmi := val.(map[string]interface{})
                        lei.Feature,ok = fmi["feature"].(string)
                        lei.Feature, ok = fmi["feature"].(string)
                        if fmi["targetLocation"] != nil {
                            targetLocation := fmi["targetLocation"].(map[string]interface{})
                            topLeft := targetLocation["topLeft"].(map[string]interface{})
                            tx := topLeft["x"].(float64)
                            ty := topLeft["y"].(float64)
                            bottomRight := targetLocation["bottomRight"].(map[string]interface{})
                            bx := bottomRight["x"].(float64)
                            by := bottomRight["y"].(float64)
                            multiInfo.TargetLocation = &protomsg.TargetLocation{
                                TopLeft: &protomsg.Location{
                                    X: tx,
                                    Y: ty,
                                },
                                BottomRight: &protomsg.Location{
                                    X: bx,
                                    Y: by,
                                },
                            }
                        }
                        lei.AttachFeature, ok = fmi["attachTarget"].(map[string]interface{})["feature"].(string)
                    }
                }
@@ -133,7 +171,7 @@
        tmpinfo.SdkName, ok = source["sdkName"].(string)

        if source["picMaxUrl"] != nil {
            for _,v := range source["picMaxUrl"].([]interface{}) {
            for _, v := range source["picMaxUrl"].([]interface{}) {
                tmpinfo.PicMaxUrl = append(tmpinfo.PicMaxUrl, v.(string))
            }
        }
@@ -232,7 +270,7 @@
                lti.TaskName, ok = lm["taskName"].(string)
                lti.SdkName, ok = lm["sdkName"].(string)
                if lm["picMaxUrl"] != nil {
                    for _,v := range lm["picMaxUrl"].([]interface{}) {
                    for _, v := range lm["picMaxUrl"].([]interface{}) {
                        lti.PicMaxUrl = append(lti.PicMaxUrl, v.(string))
                    }
                }