zhaoqingang
2025-02-10 5900cb2a31e6f8066fcb40aec448eec04bb5f64a
测试 场景分析 bug
1个文件已修改
89 ■■■■■ 已修改文件
models/locationAnalysis.go 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/locationAnalysis.go
@@ -242,6 +242,7 @@
            tagTypes = append(tagTypes, document_number_map[personId].PersonType)
            lastAppearanceTime = document_number_map[personId].LastAppearanceTime
        }
        logger.Debugf("tagTypes %s ---------------%s--------", tagTypes, record.DocumentNumbers)
        _, typeNames, err := service.GetPersonTypeNameByTypes(tagTypes)
        if err != nil {
            return err
@@ -256,6 +257,8 @@
            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"),
            FirstPersonID: record.DocumentNumbers[0],
        }
@@ -282,8 +285,8 @@
func queryEsLocation(esClient *elasticsearch.Client, locationModel *LocationModel, documentNumbers []string) ([]*LocationRecord, error) {
    var buf bytes.Buffer
    //nowTime := time.Now()
    //startTime := nowTime.Add(-time.Duration(locationModel.Duration) * 24 * time.Hour)
    nowTime := time.Now()
    startTime := nowTime.Add(-time.Duration(locationModel.Duration) * 24 * time.Hour)
    // 构建过滤条件
    var filters []map[string]interface{}
@@ -343,19 +346,30 @@
    //        },
    //    },
    //})
    //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())
    //
    //    filters = append(filters, map[string]interface{}{
    //        "range": map[string]interface{}{
    //            "picDate": map[string]interface{}{
    //                "gte": start.Format("2006-01-02 15:04:05"),
    //                "lte": end.Format("2006-01-02 15:04:05"),
    //            },
    //        },
    //    })
    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("2006-01-02 15:04:05"),
                    "lte": end.Format("2006-01-02 15:04:05"),
                },
            },
        })
    }
    //var authParams = map[string]interface{}{
    //    "bool": map[string]interface{}{
    //        "should": queryTimes,
    //    },
    //}
    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{}{
@@ -419,14 +433,6 @@
        "size": 0,
    }
    //query = map[string]interface{}{
    //    "query": map[string]interface{}{
    //        "bool": map[string]interface{}{
    //            "filter": filters,
    //        },
    //    },
    //    "size": 10000,
    //}
    if err := json.NewEncoder(&buf).Encode(query); err != nil {
        return nil, fmt.Errorf("error encoding query: %s", err)
    }
@@ -453,57 +459,30 @@
    if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
        return nil, fmt.Errorf("error parsing response body: %s", err)
    }
    logger.Debugf("ressss--------------------------------------- %s", result)
    // 解析聚合结果
    var records []*LocationRecord
    //dat, ok := result["hits"].(map[string]interface{})
    //dat := result["hits"].(map[string]interface{})
    //
    //var data = make(map[string]interface{}, 2)
    //
    //tmp, b := dat["total"].(map[string]interface{})
    //if b != true {
    //    data["total"] = dat["total"].(float64)
    //} else {
    //    data["total"] = tmp["value"].(float64)
    //}
    //sources := []interface{}{}
    //for _, value := range dat["hits"].([]interface{}) {
    //    sourceData := value.(map[string]interface{})
    //    source := sourceData["_source"].(map[string]interface{})
    //    source["_id"] = sourceData["_id"]
    //    /*sdkType := source["sdkType"]
    //    if sdkType != nil {
    //        sdk, _ := strconv.Atoi(sdkType.(string))
    //        source["sdkType"] = sdkTypeToValue(sdk)
    //    }*/
    //    sources = append(sources, source)
    //}
    //data["datalist"] = sources
    //logger.Debugf("ressss--------------data------------------------- %s", data)
    if aggs, ok := result["aggregations"].(map[string]interface{}); ok {
        if orgBuckets, ok := aggs["orgs"].(map[string]interface{})["buckets"].([]interface{}); ok {
            for _, orgBucket := range orgBuckets {
                orgId := orgBucket.(map[string]interface{})["key"].(string)
                logger.Debugf("orgId--------------------------------------- %s", orgId)
                //logger.Debugf("orgId--------------------------------------- %s", orgId)
                // 解析按communityId的聚合结果
                if communityBuckets, ok := orgBucket.(map[string]interface{})["community"].(map[string]interface{})["buckets"].([]interface{}); ok {
                    for _, communityBucket := range communityBuckets {
                        communityId := communityBucket.(map[string]interface{})["key"].(string)
                        logger.Debugf("communityId--------------------------------------- %s", communityId)
                        //logger.Debugf("communityId--------------------------------------- %s", communityId)
                        // 解析按building的聚合结果
                        if locationBuckets, ok := communityBucket.(map[string]interface{})["location"].(map[string]interface{})["buckets"].([]interface{}); ok {
                            for _, locationBucket := range locationBuckets {
                                building := locationBucket.(map[string]interface{})["key"].(string)
                                logger.Debugf("building--------------------------------------- %s", building)
                                //logger.Debugf("building--------------------------------------- %s", building)
                                // 解析按floor的聚合结果
                                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)
                                        //logger.Debugf("appearCount--------------------------------------- %s- --", appearCount)
                                        // 构建 LocationRecord 结构体
                                        var persons []string
                                        if docNumBuckets, ok := floorBucket.(map[string]interface{})["document_numbers"].(map[string]interface{})["buckets"].([]interface{}); ok {
@@ -512,7 +491,7 @@
                                            }
                                        }
                                        logger.Debugf("persons--------------------------------------- %s-- %s --", floor, persons)
                                        logger.Debugf("floor, persons--,appearCount------------------------------------- %s-- %s --", floor, persons, appearCount)
                                        record := &LocationRecord{
                                            //PicDate:        timestamp,
                                            DocumentNumbers: persons,