From 250f2e68becab56cc009216496dfa0d7d8d1a22f Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期日, 07 七月 2024 15:15:20 +0800 Subject: [PATCH] 添加常住人口和重点人员比对 --- cache/cache.go | 150 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 90 insertions(+), 60 deletions(-) diff --git a/cache/cache.go b/cache/cache.go index bfaceb8..f0b725c 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -20,44 +20,49 @@ PRE_DBTABLE = "dbTable_" ) -type CmapItem struct { +type AreaMapItem struct { sync.Mutex Area map[string]*shardmap.ShardMap } -var CacheMap *CmapItem +var CaptureDbMap *AreaMapItem +var RealNameDbMap = shardmap.New(uint8(*threadnum)) +var KeyPersonDbMap = shardmap.New(uint8(*threadnum)) + var doOnce sync.Once -func ReInitDbTablePersonsCache() { - CacheMap.Lock() - defer CacheMap.Unlock() - if CacheMap == nil { - CacheMap = &CmapItem{ - Area: make(map[string]*shardmap.ShardMap), - } - } - for tableId, _ := range CacheMap.Area { - delete(CacheMap.Area, tableId) - } - - initDbTablePersonsCache() -} - -func InitDbTablePersons() { +func InitCache() { doOnce.Do(func() { flag.Parse() - CacheMap = &CmapItem{ + CaptureDbMap = &AreaMapItem{ Area: make(map[string]*shardmap.ShardMap), } // 鍒濆鍖栨湭鍒嗙被, 娌℃湁灏忓尯id鐨勬。妗� - CacheMap.Area[Unfiled] = shardmap.New(uint8(*threadnum)) + CaptureDbMap.Area[Unfiled] = shardmap.New(uint8(*threadnum)) }) initDbTablePersonsCache() + initRealNamePersonsCache() + initKeyPersonsCache() } +func ReInitDbTablePersonsCache() { + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() + + if CaptureDbMap == nil { + CaptureDbMap = &AreaMapItem{ + Area: make(map[string]*shardmap.ShardMap), + } + } + for tableId, _ := range CaptureDbMap.Area { + delete(CaptureDbMap.Area, tableId) + } + + initDbTablePersonsCache() +} func initDbTablePersonsCache() { // 缂撳瓨搴曞簱涓殑鍏ㄩ儴浜哄憳淇℃伅 var dbpApi db.DbPersons @@ -66,7 +71,7 @@ var psApi db.PersonStatus accessAreas, _ := psApi.GetPersonAccessedAreas() - logger.Debugf("鎵�鏈夊簳搴撳叡鏈�%d鏉¤褰�", total) + logger.Debugf("鎶撴媿妗f搴撳叡鏈�%d鏉¤褰�", total) if e == nil && total > 0 { queryEachNum := *querynum qn := int(total) / *threadnum @@ -91,35 +96,63 @@ return } logger.Debugf(" eachNum:%d, 鑾峰彇%d鏉′汉鍛樹俊鎭�", queryEachNum, len(dbPersons)) - CacheMap.Lock() + CaptureDbMap.Lock() areaId := "" for _, value := range dbPersons { areaId = value.AreaId // 娌℃湁灏忓尯id鐨勪汉鍛� if areaId == "" { - CacheMap.Area[Unfiled].Set(value.Id, value) - CacheMap.Area[Unfiled].Settime() + CaptureDbMap.Area[Unfiled].Set(value.Id, value) + CaptureDbMap.Area[Unfiled].Settime() continue } for _, areaId := range accessAreas[value.Id] { - if _, ok := CacheMap.Area[areaId]; !ok { - CacheMap.Area[areaId] = shardmap.New(uint8(*threadnum)) + if _, ok := CaptureDbMap.Area[areaId]; !ok { + CaptureDbMap.Area[areaId] = shardmap.New(uint8(*threadnum)) } - CacheMap.Area[areaId].Set(value.Id, value) - CacheMap.Area[areaId].Settime() + CaptureDbMap.Area[areaId].Set(value.Id, value) + CaptureDbMap.Area[areaId].Settime() } } - CacheMap.Unlock() + CaptureDbMap.Unlock() }(j) } wg.Wait() - logger.Debug("搴曞簱浜哄憳缂撳瓨瀹屾垚鐢ㄦ椂:", time.Since(temptime)) + logger.Debug("鎶撴媿妗f搴撲汉鍛樼紦瀛樺畬鎴愮敤鏃�:", time.Since(temptime)) } +} + +func initRealNamePersonsCache() { + var dbApi db.Layouts + dbPersons, err := dbApi.GetRealNamePersonList() + if err != nil { + logger.Error("init real-name persons error,", err.Error()) + } + + for _, value := range dbPersons { + RealNameDbMap.Set(value.Id, value) + } + + logger.Debugf("甯镐綇浜哄彛鍏辨湁%d鏉¤褰�", len(dbPersons)) +} + +func initKeyPersonsCache() { + var dbApi db.Layouts + dbPersons, err := dbApi.GetKeyPersonList() + if err != nil { + logger.Error("init real-name persons error,", err.Error()) + } + + for _, value := range dbPersons { + KeyPersonDbMap.Set(value.Id, value) + } + + logger.Debugf("閲嶇偣浜哄憳鍏辨湁%d鏉¤褰�", len(dbPersons)) } // UpdateDbPersonsCacheById 鏇存柊缂撳瓨涓殑鍏ㄩ儴浜哄憳淇℃伅 @@ -131,30 +164,27 @@ return } if info != nil && info.AreaId != "" { - CacheMap.Lock() - defer CacheMap.Unlock() - if _, ok := CacheMap.Area[info.AreaId]; !ok { - CacheMap.Area[info.AreaId] = shardmap.New(uint8(*threadnum)) + if _, ok := CaptureDbMap.Area[info.AreaId]; !ok { + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() + CaptureDbMap.Area[info.AreaId] = shardmap.New(uint8(*threadnum)) } - CacheMap.Area[info.AreaId].Set(info.Id, info) - CacheMap.Area[info.AreaId].Settime() + CaptureDbMap.Area[info.AreaId].Set(info.Id, info) + CaptureDbMap.Area[info.AreaId].Settime() } } func DeleteDbPersonsCacheById(id string) { - CacheMap.Lock() - defer CacheMap.Unlock() - - for key, _ := range CacheMap.Area { - CacheMap.Area[key].Del(id) + for key, _ := range CaptureDbMap.Area { + CaptureDbMap.Area[key].Del(id) } } func RealTimeAddPersonInfoToCache(tableId string, id string, faceFeature string, enable int32, carNo string) { - CacheMap.Lock() - defer CacheMap.Unlock() - if _, ok := CacheMap.Area[tableId]; !ok { - CacheMap.Area[tableId] = shardmap.New(uint8(*threadnum)) + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() + if _, ok := CaptureDbMap.Area[tableId]; !ok { + CaptureDbMap.Area[tableId] = shardmap.New(uint8(*threadnum)) } var ei = protomsg.Esinfo{ Id: id, @@ -163,16 +193,16 @@ Enable: enable, CarNo: carNo, } - CacheMap.Area[tableId].Set(id, &ei) + CaptureDbMap.Area[tableId].Set(id, &ei) logger.Debug("id:", id, ",tableId:", ",len(faceFeature):", len(faceFeature), ",tableId:", tableId, ",enable:", enable) } func RealTimeDelPersonFromCache(tableId string, id string) { logger.Debug("DelPersonFromCache,tableId:", tableId, ",id:", id) - CacheMap.Lock() - defer CacheMap.Unlock() - if _, ok := CacheMap.Area[tableId]; ok { - CacheMap.Area[tableId].Del(id) + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() + if _, ok := CaptureDbMap.Area[tableId]; ok { + CaptureDbMap.Area[tableId].Del(id) logger.Debug("DelPerson ok success") } else { logger.Error("tableId:", tableId, " not exist") @@ -181,27 +211,27 @@ func RealTimeDelTable(tableId string) { logger.Debug("RealTimeDelTable tableId:", tableId) - CacheMap.Lock() - defer CacheMap.Unlock() + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() - if dtM, ok := CacheMap.Area[PRE_DBTABLE]; ok { + if dtM, ok := CaptureDbMap.Area[PRE_DBTABLE]; ok { dtM.Del(tableId) } - if _, ok := CacheMap.Area[tableId]; ok { - delete(CacheMap.Area, tableId) + if _, ok := CaptureDbMap.Area[tableId]; ok { + delete(CaptureDbMap.Area, tableId) } } // 浣垮簳搴撶敓鏁�,灏嗗簳搴撲腑鐨勬墍鏈夌敓鏁堢姸鎬佺殑浜虹壒寰佹坊鍔犲埌缂撳瓨 func RealTimeUpdateTable(tableId string, enable int32) { logger.Debug("RealTimeUpdateTable tableId:", tableId, ",enable:", enable) - CacheMap.Lock() - defer CacheMap.Unlock() + CaptureDbMap.Lock() + defer CaptureDbMap.Unlock() - if _, ok := CacheMap.Area[PRE_DBTABLE]; !ok { - CacheMap.Area[PRE_DBTABLE] = shardmap.New(uint8(*threadnum)) + if _, ok := CaptureDbMap.Area[PRE_DBTABLE]; !ok { + CaptureDbMap.Area[PRE_DBTABLE] = shardmap.New(uint8(*threadnum)) } - CacheMap.Area[PRE_DBTABLE].Set(tableId, enable == 1) + CaptureDbMap.Area[PRE_DBTABLE].Set(tableId, enable == 1) } func UpdateCache(changeMsg *protomsg.EsPersonCacheChange) { -- Gitblit v1.8.0