From bc37c44c45d08c2cb42822e08adf429f4bcffb51 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期一, 10 二月 2025 11:36:20 +0800 Subject: [PATCH] 测试 场景分析 bug --- models/locationAnalysis.go | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go index b67c462..f0a1958 100644 --- a/models/locationAnalysis.go +++ b/models/locationAnalysis.go @@ -219,12 +219,13 @@ //logger.Debugf("task %s last result %d", m.Task.Name, len(lastFilter)) document_number_list = []string{} for _, i := range keyFilter { + //logger.Debugf("keyFilter %s ------------- %s", i.Id, i.PersonType) document_number_list = append(document_number_list, i.Id) - person := document_number_map[i.DocumentNumber] + person := document_number_map[i.Id] person.PersonType = i.PersonType - document_number_map[i.DocumentNumber] = person + document_number_map[i.Id] = person } - logger.Debugf("document_number_list %s last result %s", m.Task.Name, document_number_list) + //logger.Debugf("document_number_map %s last result %s", m.Task.Name, document_number_map) records, err := queryEsLocation(db.GetEsClient(), m, document_number_list) if err != nil { return err @@ -239,6 +240,7 @@ for _, record := range records { tagTypes = []string{} for _, personId := range record.DocumentNumbers { + logger.Debugf("document_number_map[personId] %s", document_number_map[personId]) tagTypes = append(tagTypes, document_number_map[personId].PersonType) lastAppearanceTime = document_number_map[personId].LastAppearanceTime } @@ -265,7 +267,7 @@ results = append(results, result) } logger.Debugf("task %s last filter result %d", m.Task.Name, len(results)) - return service.SaveTaskResults(results) + return service.SaveLocationTaskResults(results) } func (m *LocationModel) KeepAlive() error { @@ -327,35 +329,26 @@ } filters = append(filters, addrParams) } - //var queryTimes []map[string]interface{} + var queryTimes []map[string]interface{} for date := startTime; date.Before(nowTime); date = date.Add(24 * time.Hour) { start := time.Date(date.Year(), date.Month(), date.Day(), locationModel.StartTime, 0, 0, 0, date.Location()) end := time.Date(date.Year(), date.Month(), date.Day(), locationModel.EndTime, 0, 0, 0, date.Location()) - //queryTimes = append(queryTimes, map[string]interface{}{ - // "range": map[string]interface{}{ - // "picDate": map[string]interface{}{ - // "gte": start.Format(time.DateTime), // "2006-01-02 15:04:05d" - // "lte": end.Format(time.DateTime), - // }, - // }, - //}) - - filters = append(filters, map[string]interface{}{ + queryTimes = append(queryTimes, map[string]interface{}{ "range": map[string]interface{}{ "picDate": map[string]interface{}{ - "gte": start.Format(time.DateTime), + "gte": start.Format(time.DateTime), // "2006-01-02 15:04:05d" "lte": end.Format(time.DateTime), }, }, }) } - //filters = append(filters, map[string]interface{}{ - // "bool": map[string]interface{}{ - // "filter": queryTimes, - // }, - //}) - logger.Debugf("filters--------------------------------------- %s", filters) + filters = append(filters, map[string]interface{}{ + "bool": map[string]interface{}{ + "should": queryTimes, + }, + }) + //logger.Debugf("filters--------------------------------------- %s", filters) query := map[string]interface{}{ "query": map[string]interface{}{ "bool": map[string]interface{}{ @@ -398,6 +391,12 @@ "threshold": locationModel.Appearances, }, }, + }, + }, + "pic_date": map[string]interface{}{ // 鏂板鎸� documentNumber 鑱氬悎 + "terms": map[string]interface{}{ + "field": "picDate", + "size": 10000, }, }, "document_numbers": map[string]interface{}{ // 鏂板鎸� documentNumber 鑱氬悎 @@ -444,7 +443,7 @@ if err := json.NewDecoder(res.Body).Decode(&result); err != nil { return nil, fmt.Errorf("error parsing response body: %s", err) } - logger.Debugf("result--------------------------------------- %s", result) + //logger.Debugf("result--------------------------------------- %s", result) // 瑙f瀽鑱氬悎缁撴灉 var records []*LocationRecord if aggs, ok := result["aggregations"].(map[string]interface{}); ok { @@ -476,10 +475,15 @@ persons = append(persons, docNumBucket.(map[string]interface{})["key"].(string)) } } - + var PicDate string + if docNumBuckets, ok := floorBucket.(map[string]interface{})["pic_data"].(map[string]interface{})["buckets"].([]interface{}); ok { + for _, docNumBucket := range docNumBuckets { + PicDate = docNumBucket.(map[string]interface{})["key"].(string) + } + } logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount) record := &LocationRecord{ - //PicDate: timestamp, + PicDate: PicDate, DocumentNumbers: persons, CommunityId: communityId, Building: building, -- Gitblit v1.8.0