From 5900cb2a31e6f8066fcb40aec448eec04bb5f64a Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 10 二月 2025 10:13:21 +0800
Subject: [PATCH] 测试 场景分析 bug
---
models/locationAnalysis.go | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index 56d3655..7c2f942 100644
--- a/models/locationAnalysis.go
+++ b/models/locationAnalysis.go
@@ -242,6 +242,7 @@
tagTypes = append(tagTypes, document_number_map[personId].PersonType)
lastAppearanceTime = document_number_map[personId].LastAppearanceTime
}
+ logger.Debugf("tagTypes %s ---------------%s--------", tagTypes, record.DocumentNumbers)
_, typeNames, err := service.GetPersonTypeNameByTypes(tagTypes)
if err != nil {
return err
@@ -256,6 +257,8 @@
OrgID: record.OrgId,
ObjectIds: strings.Join(record.DocumentNumbers, ","),
Location: fmt.Sprintf("%s%s%s", domains[record.CommunityId].Name, record.Building, record.Floor),
+ Building: record.Building,
+ Floor: record.Floor,
PicDate: time.Unix(lastAppearanceTime, 0).Format("2006-01-02 15:04:05"),
FirstPersonID: record.DocumentNumbers[0],
}
@@ -343,11 +346,12 @@
// },
// },
//})
+ 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())
- filters = append(filters, map[string]interface{}{
+ queryTimes = append(queryTimes, map[string]interface{}{
"range": map[string]interface{}{
"picDate": map[string]interface{}{
"gte": start.Format("2006-01-02 15:04:05"),
@@ -356,7 +360,17 @@
},
})
}
- logger.Debugf("filters--------------------------------------- %s", filters)
+ //var authParams = map[string]interface{}{
+ // "bool": map[string]interface{}{
+ // "should": queryTimes,
+ // },
+ //}
+ 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{}{
@@ -445,29 +459,30 @@
if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
return nil, fmt.Errorf("error parsing response body: %s", err)
}
-
// 瑙ｆ瀽鑱氬悎缁撴灉
var records []*LocationRecord
if aggs, ok := result["aggregations"].(map[string]interface{}); ok {
if orgBuckets, ok := aggs["orgs"].(map[string]interface{})["buckets"].([]interface{}); ok {
for _, orgBucket := range orgBuckets {
orgId := orgBucket.(map[string]interface{})["key"].(string)
- logger.Debugf("orgId--------------------------------------- %s", orgId)
+ //logger.Debugf("orgId--------------------------------------- %s", orgId)
// 瑙ｆ瀽鎸塩ommunityId鐨勮仛鍚堢粨鏋�
if communityBuckets, ok := orgBucket.(map[string]interface{})["community"].(map[string]interface{})["buckets"].([]interface{}); ok {
for _, communityBucket := range communityBuckets {
communityId := communityBucket.(map[string]interface{})["key"].(string)
- logger.Debugf("communityId--------------------------------------- %s", communityId)
+ //logger.Debugf("communityId--------------------------------------- %s", communityId)
// 瑙ｆ瀽鎸塨uilding鐨勮仛鍚堢粨鏋�
if locationBuckets, ok := communityBucket.(map[string]interface{})["location"].(map[string]interface{})["buckets"].([]interface{}); ok {
for _, locationBucket := range locationBuckets {
building := locationBucket.(map[string]interface{})["key"].(string)
- logger.Debugf("building--------------------------------------- %s", building)
+ //logger.Debugf("building--------------------------------------- %s", building)
// 瑙ｆ瀽鎸塮loor鐨勮仛鍚堢粨鏋�
if floorBuckets, ok := locationBucket.(map[string]interface{})["floor"].(map[string]interface{})["buckets"].([]interface{}); ok {
for _, floorBucket := range floorBuckets {
floor := floorBucket.(map[string]interface{})["key"].(string)
- appearCount := floorBucket.(map[string]interface{})["filter_floor"].(int)
+ //logger.Debugf("floor--------------------------------------- %s -----%s ", floor, floorBucket)
+ appearCount := floorBucket.(map[string]interface{})["doc_count"].(float64)
+ //logger.Debugf("appearCount--------------------------------------- %s- --", appearCount)
// 鏋勫缓 LocationRecord 缁撴瀯浣�
var persons []string
if docNumBuckets, ok := floorBucket.(map[string]interface{})["document_numbers"].(map[string]interface{})["buckets"].([]interface{}); ok {
@@ -476,7 +491,7 @@
}
}
- logger.Debugf("floor--------------------------------------- %s-- %s --", floor, appearCount)
+ logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount)
record := &LocationRecord{
//PicDate: timestamp,
DocumentNumbers: persons,
@@ -484,7 +499,7 @@
Building: building,
Floor: floor,
OrgId: orgId,
- AppearCount: appearCount,
+ AppearCount: int(appearCount),
}
records = append(records, record)
--
Gitblit v1.8.0