add targetType

sunty

2019-11-20 a6b70dc77c22af74b13f70715b6328ec65c7e312

add targetType

 EsApi.go

@@ -175,7 +175,7 @@
    //判断布防等级
    alarmLevelStr := ""
    if alarmLevelTypes != "" {
        alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
        alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
    }

    //使用es底层机制处理分页

 EsClient.go

@@ -121,6 +121,7 @@
                m := v.(map[string]interface{})
                var ti protomsg.TargetInfo
                ti.TargetId, ok = m["targetId"].(string)
                ti.TargetType, ok = m["targetType"].(string)
                ti.TargetScore, ok = m["targetScore"].(float64)
                ti.Feature, ok = m["feature"].(string)
                ti.PicSmUrl, ok = m["picSmUrl"].(string)
@@ -219,6 +220,7 @@
                        m := v.(map[string]interface{})
                        var ti protomsg.TargetInfo
                        ti.TargetId, ok = m["targetId"].(string)
                        ti.TargetType, ok = m["targetType"].(string)
                        ti.TargetScore, ok = m["targetScore"].(float64)
                        ti.Feature, ok = m["feature"].(string)
                        ti.PicSmUrl, ok = m["picSmUrl"].(string)