From a430c75648009bbadff0b7dfc831661c23a4564a Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 10 二月 2025 11:56:08 +0800
Subject: [PATCH] 测试 场景分析 bug
---
models/locationAnalysis.go | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index 3a53aed..1225778 100644
--- a/models/locationAnalysis.go
+++ b/models/locationAnalysis.go
@@ -100,8 +100,8 @@
}
type LocationRecord struct {
- IDCard string `json:"idCard"`
- PicDate string `json:"picDate"`
+ IDCard string `json:"idCard"`
+ PicDate float64 `json:"picDate"`
DocumentNumbers []string
CommunityId string `json:"communityId"`
OrgId string `json:"orgId"`
@@ -236,13 +236,13 @@
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)
_, typeNames, err := service.GetPersonTypeNameByTypes(tagTypes)
@@ -261,8 +261,8 @@
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"),
- PicDate: record.PicDate,
+ PicDate: time.Unix(int64(record.PicDate), 0).Format("2006-01-02 15:04:05"),
+ //PicDate: ,
FirstPersonID: record.DocumentNumbers[0],
}
results = append(results, result)
@@ -394,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": "1d", // 鎸夊ぉ鑱氬悎
+ "time_zone": "+08:00", // 璁剧疆鏃跺尯
},
},
},
@@ -466,7 +467,7 @@
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)
- //logger.Debugf("floor--------------------------------------- %s -----%s ", floor, floorBucket)
+ logger.Debugf("floor--------------------------------------- %s -----%s ", floor, floorBucket)
appearCount := floorBucket.(map[string]interface{})["doc_count"].(float64)
//logger.Debugf("appearCount--------------------------------------- %s- --", appearCount)
// 鏋勫缓 LocationRecord 缁撴瀯浣�
@@ -476,10 +477,10 @@
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 {
+ var PicDate float64
+ 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"].(float64)
}
}
logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount)
--
Gitblit v1.8.0