sunty
2019-12-19 05eb392fbf5c8e6b5cfd615e1dc56bf1ff7cdc64
add targetlocation
2个文件已修改
42 ■■■■■ 已修改文件
EsApi.go 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EsClient.go 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
@@ -76,6 +76,25 @@
                if m["attachTarget"] != nil {
                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,
                        },
                    }
                }
            }
        }
        tmpinfo.AnalyServerId, ok = source["analyServerId"].(string)
@@ -95,6 +114,25 @@
                    for _,val := range mi["targetInfo"].([]interface{}){
                        fmi := val.(map[string]interface{})
                        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)
                    }
                }