fix should

sunty

2020-01-13 3dddd55662df78b3603bd0ab4d0aad4c8cdf3e53

fix should

 controllers/capture.go

@@ -67,7 +67,7 @@
        linkTagInfoAnalyServerFilterStr +
        "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
        "]}}" +
        "]}}," +
        "],\"minimum_should_match\":1}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"

 controllers/es.go

@@ -66,7 +66,6 @@
    util.ResponseFormat(c, code.CompareResultGone, m)
}


func sourceCompare(sources []interface{}, isEsSource bool, campareByte []byte, threshold float32) []interface{} {
    var filterName = "feature"
    if isEsSource {
@@ -396,10 +395,6 @@
type Hosts struct {
    NewIp string `json:newIp`
    OldIp string `json:oldIp`
}

func forwardCommand() {

}

//func AddEsCluster(hosts []string) (string){

 controllers/esSearch.go

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

 controllers/initForData.go

@@ -65,7 +65,7 @@
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "],\"minimum_should_match\":1}}," +
        "\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
        "}"
@@ -135,7 +135,7 @@
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "],\"minimum_should_match\":1}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"20\"," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"

 controllers/monitoring.go

@@ -73,7 +73,7 @@
        linkTagInfoAnalyServerFilterStr +
        "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
        "]}}" +
        "]}}," +
        "],\"minimum_should_match\":1}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +
        "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"