From e4fc307d58856a0b319c41f0930cd3b731cb0b24 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 10:19:47 +0800
Subject: [PATCH] 修复规律分析bug
---
models/locationAnalysis.go | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index f0a1958..8e7b20a 100644
--- a/models/locationAnalysis.go
+++ b/models/locationAnalysis.go
@@ -236,32 +236,33 @@
return err
}
var tagTypes []string
- var lastAppearanceTime int64
+ //var lastAppearanceTime int64
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
+ //lastAppearanceTime = document_number_map[personId].LastAppearanceTime
}
- logger.Debugf("tagTypes %s ---------------%s--------", tagTypes, record.DocumentNumbers)
+ logger.Debugf("tagTypes %s ---------------%s--------", record.PicDate, record.DocumentNumbers)
_, typeNames, err := service.GetPersonTypeNameByTypes(tagTypes)
if err != nil {
return err
}
event := strings.Join(typeNames, ",")
result := &db.ModelTaskResults{
- Title: m.Task.Name,
- Event: m.eventFormat(event, record.AppearCount),
- ModelID: m.Task.ModelID,
- ModelTaskID: m.Task.ID,
- CommunityId: record.CommunityId,
- 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"),
+ Title: m.Task.Name,
+ Event: m.eventFormat(event, record.AppearCount),
+ ModelID: m.Task.ModelID,
+ ModelTaskID: m.Task.ID,
+ CommunityId: record.CommunityId,
+ 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(int64(record.PicDate/1000), 0).Format("2006-01-02 15:04:05"),
+ PicDate: record.PicDate,
FirstPersonID: record.DocumentNumbers[0],
}
results = append(results, result)
@@ -393,16 +394,17 @@
},
},
},
- "pic_date": map[string]interface{}{ // 鏂板鎸� documentNumber 鑱氬悎
- "terms": map[string]interface{}{
- "field": "picDate",
- "size": 10000,
- },
- },
"document_numbers": map[string]interface{}{ // 鏂板鎸� documentNumber 鑱氬悎
"terms": map[string]interface{}{
"field": "documentNumber",
"size": 10000,
+ },
+ },
+ "picDate": map[string]interface{}{ // 鏂板鎸� picDate 鑱氬悎
+ "date_histogram": map[string]interface{}{
+ "field": "picDate",
+ "interval": "1s", // 鎸夊ぉ鑱氬悎
+ //"time_zone": "+08:00", // 璁剧疆鏃跺尯
},
},
},
@@ -476,9 +478,9 @@
}
}
var PicDate string
- if docNumBuckets, ok := floorBucket.(map[string]interface{})["pic_data"].(map[string]interface{})["buckets"].([]interface{}); ok {
+ if docNumBuckets, ok := floorBucket.(map[string]interface{})["picDate"].(map[string]interface{})["buckets"].([]interface{}); ok {
for _, docNumBucket := range docNumBuckets {
- PicDate = docNumBucket.(map[string]interface{})["key"].(string)
+ PicDate = docNumBucket.(map[string]interface{})["key_as_string"].(string)
}
}
logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount)
--
Gitblit v1.8.0