fix decodeActivityId isTimeInRange

sunty

2024-04-25 263f2a5fa7dc9239570be347fc162eb5d2b06ebf

fix decodeActivityId isTimeInRange

 EsApi.go

@@ -84,9 +84,11 @@

    if startTime.After(endTime) {
        // 跨越日期的情况
        //fmt.Println("跨日期",timeStamp, timeStamp.After(startTime), timeStamp.Before(endTime))
        return timeStamp.After(startTime) || timeStamp.Before(endTime)
    } else {
        // 不跨越日期的情况
        //fmt.Println("不跨日期",timeStamp, timeStamp.After(startTime), timeStamp.Before(endTime))
        return timeStamp.After(startTime) && timeStamp.Before(endTime)
    }
}
@@ -228,14 +230,13 @@
            captureTime := source["picDate"].(string)
            dDate := strings.Split(captureTime, " ")[0]
            dTime := strings.Split(captureTime[:19], " ")[1]
            //fmt.Println(captureTime, dDate, dTime)
            id := source["id"].(string)
            //fmt.Println("sindex: ", sIndex, "documentNumber", tmpInfo["documentNumber"], "id: ", id, "captureTime: ", captureTime)
            if !isTimeInRange(dTime, aHFormat.startTime, aHFormat.endTime) {
                if sDate != "" && len(dataId) >= frequency {
                    activeId = append(activeId, dataId...)
                    dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
                }
                //if sDate != "" && len(dataId) >= frequency {
                //    activeId = append(activeId, dataId...)
                //    dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
                //}
                continue
            }
            if sDate == "" {