完善参数

zhangzengfei

2025-02-11 c7ec5e7a2762eb9cd2c9d2a23fc1de4677161a30

 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"`
@@ -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)