From c7ec5e7a2762eb9cd2c9d2a23fc1de4677161a30 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 10:14:08 +0800
Subject: [PATCH] 完善参数
---
models/locationAnalysis.go | 106 ++++++++++++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index 891eef6..8e7b20a 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
@@ -235,37 +236,39 @@
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)
}
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 +330,26 @@
}
filters = append(filters, addrParams)
}
- //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{}{
- // "range": map[string]interface{}{
- // "picDate": map[string]interface{}{
- // "gte": start.Format(time.DateTime),
- // "lte": end.Format(time.DateTime),
- // },
- // },
- // })
- //}
- //filters = append(filters, map[string]interface{}{
- // "bool": map[string]interface{}{
- // "filter": queryTimes,
- // },
- //})
- logger.Debugf("filters--------------------------------------- %s", filters)
+ 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{}{
+ "bool": map[string]interface{}{
+ "should": queryTimes,
+ },
+ })
+ //logger.Debugf("filters--------------------------------------- %s", filters)
query := map[string]interface{}{
"query": map[string]interface{}{
"bool": map[string]interface{}{
@@ -406,6 +400,13 @@
"size": 10000,
},
},
+ "picDate": map[string]interface{}{ // 鏂板鎸� picDate 鑱氬悎
+ "date_histogram": map[string]interface{}{
+ "field": "picDate",
+ "interval": "1s", // 鎸夊ぉ鑱氬悎
+ //"time_zone": "+08:00", // 璁剧疆鏃跺尯
+ },
+ },
},
},
},
@@ -444,7 +445,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)
// 瑙ｆ瀽鑱氬悎缁撴灉
var records []*LocationRecord
if aggs, ok := result["aggregations"].(map[string]interface{}); ok {
@@ -476,10 +477,15 @@
persons = append(persons, docNumBucket.(map[string]interface{})["key"].(string))
}
}
-
+ var PicDate string
+ if docNumBuckets, ok := floorBucket.(map[string]interface{})["picDate"].(map[string]interface{})["buckets"].([]interface{}); ok {
+ for _, docNumBucket := range docNumBuckets {
+ PicDate = docNumBucket.(map[string]interface{})["key_as_string"].(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