From b39d94c592a6287e76337afc4be8ed0524a93496 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 14:34:56 +0800
Subject: [PATCH] 修正场所分析的配置参数
---
models/locationAnalysis.go | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index 1225778..62ff299 100644
--- a/models/locationAnalysis.go
+++ b/models/locationAnalysis.go
@@ -100,8 +100,8 @@
}
type LocationRecord struct {
- IDCard string `json:"idCard"`
- PicDate float64 `json:"picDate"`
+ IDCard string `json:"idCard"`
+ PicDate string `json:"picDate"`
DocumentNumbers []string
CommunityId string `json:"communityId"`
OrgId string `json:"orgId"`
@@ -230,7 +230,7 @@
if err != nil {
return err
}
- logger.Debugf("records %s last result %s", m.Task.Name, records)
+ logger.Debugf("records %s last result %+v", m.Task.Name, records)
domains, err := domainToLocation(records)
if err != nil {
return err
@@ -244,7 +244,7 @@
tagTypes = append(tagTypes, document_number_map[personId].PersonType)
//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
@@ -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(int64(record.PicDate), 0).Format("2006-01-02 15:04:05"),
- //PicDate: ,
+ //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)
@@ -402,9 +402,9 @@
},
"picDate": map[string]interface{}{ // 鏂板鎸� picDate 鑱氬悎
"date_histogram": map[string]interface{}{
- "field": "picDate",
- "interval": "1d", // 鎸夊ぉ鑱氬悎
- "time_zone": "+08:00", // 璁剧疆鏃跺尯
+ "field": "picDate",
+ "interval": "1s", // 鎸夊ぉ鑱氬悎
+ //"time_zone": "+08:00", // 璁剧疆鏃跺尯
},
},
},
@@ -467,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 缁撴瀯浣�
@@ -477,10 +477,10 @@
persons = append(persons, docNumBucket.(map[string]interface{})["key"].(string))
}
}
- var PicDate float64
+ 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"].(float64)
+ PicDate = docNumBucket.(map[string]interface{})["key_as_string"].(string)
}
}
logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount)
--
Gitblit v1.8.0