From b0f374409775bd30ed8f0dc8d47d015d3edc0abb Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 03 九月 2024 19:05:52 +0800
Subject: [PATCH] 1、修改查询策略 2、修改地址统计策略
---
rule/service.go | 154 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 32 deletions(-)
diff --git a/rule/service.go b/rule/service.go
index 6294c83..eb9fcbe 100644
--- a/rule/service.go
+++ b/rule/service.go
@@ -3,8 +3,13 @@
import (
"basic.com/valib/logger.git"
"fmt"
+ "ruleModelEngine/cache"
+ "ruleModelEngine/config"
"ruleModelEngine/data"
"ruleModelEngine/db"
+ "ruleModelEngine/task"
+ "strconv"
+ "time"
)
//
@@ -26,6 +31,60 @@
// return true
//}
+func executeEnteringButNotLeaving(communityId string) {
+ //杩涘嚭寮傚父甯冩帶浠诲姟锛屾殏鏃跺綊绫诲埌鏍囩璁＄畻閮ㄥ垎
+ //fmt.Println("杩涘嚭寮傚父寮�濮嬪叆鍙ｏ紒锛侊紒锛侊紒锛�")
+ tasks, err := db.GetAllTaskData()
+ if err != nil {
+ logger.Error("GetAllTaskData Error", err)
+ }
+ var tkInfo db.Task
+ for _, taskInfo := range tasks {
+ if taskInfo.Name == "杩涘嚭寮傚父" {
+ tkInfo.Id = taskInfo.Id
+ tkInfo.Name = taskInfo.Name
+ }
+ }
+
+ //fmt.Println("tkInfo: ", tkInfo)
+ //fmt.Println("docNumIdMap: ", len(docNumIdMap))
+ //鑾峰彇鍟嗕綇妤糲ameraid
+
+ cameraIds := make([]string, 0)
+ for _, deviceInfo := range cache.Device {
+ if deviceInfo.AreaID == communityId && deviceInfo.BuildingType == db.BuildingTypeMixedUse {
+ cameraIds = append(cameraIds, deviceInfo.DeviceCode)
+ }
+ }
+
+ if len(cameraIds) == 0 {
+ logger.Info("涓嶅瓨鍦ㄥ晢浣忔ゼ璁惧锛�", cameraIds)
+ return
+ }
+ //鏌ヨ寰呭垽鏂繘鍑哄紓甯搁璀︽。妗�
+ days := config.Api.AInterval
+ docNumIdMap, err := db.QueryLastIdByDayRange(communityId, cameraIds, days, days-1)
+ if err != nil {
+ logger.Error("QueryByDayRange err: ", err)
+ }
+ for docNumber, id := range docNumIdMap {
+ //fmt.Println(docNumber, id)
+ alarmRules := make([]db.AlarmRule, 0)
+ flag := task.EnteringButNotLeaving(docNumber, communityId, cameraIds, days)
+ if flag == true {
+ alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(tkInfo.Id), RuleText: tkInfo.Name, AlarmLevel: "0"})
+ }
+ //fmt.Println("alarmRules: ", id, alarmRules)
+ addFlag, err := db.AddAlarmRules(alarmRules, id)
+ if err != nil {
+ logger.Error("AddAlarmRules err: ", err)
+ }
+ if addFlag == true {
+ logger.Info("AddAlarmRules success: ", id)
+ }
+ }
+}
+
// 鎵ц绋嬪簭鍏ュ彛
func ExecuteTask() {
//return
@@ -35,7 +94,7 @@
}
fmt.Println("ruleInfo: ", ruleInfo)
communityIDs, err := db.GetCommunityIDs()
- //fmt.Println("communityIDs:", communityIDs)
+ fmt.Println("communityIDs:", communityIDs)
if err != nil {
logger.Error("GetCommunityIDs Error", err)
}
@@ -45,79 +104,110 @@
}
//fmt.Println(labeManage)
for _, communityID := range communityIDs {
+ executeEnteringButNotLeaving(communityID)
+
//涓囧叏绀惧尯
//if communityID != "50010101010000001001" {
// continue
//}
+ fmt.Println("communityID: ", communityID)
+ //continue
+ now := time.Now()
+ timeThresholdDay := now.AddDate(0, 0, -config.Api.TimeThreshold)
+ timeThresholdDayZeroTime := time.Date(timeThresholdDay.Year(), timeThresholdDay.Month(), timeThresholdDay.Day(), 0, 0, 0, 0, timeThresholdDay.Location()).Unix()
+ fmt.Println("姣斿鏃堕棿鎴筹細", timeThresholdDayZeroTime)
//鏌ヨ绀惧尯鍐呬汉鍛樻。妗堬紝鏂逛究鏁版嵁鏇存柊
- personStatus, err := db.GetDBPersonStatusData(communityID)
+ personStatusList, err := db.QueryPersonStatusWithPagination(communityID, timeThresholdDayZeroTime)
if err != nil {
- logger.Error("GetDBPersonStatusData Error", err)
+ logger.Error("QueryPersonStatusWithPagination err: ", err)
}
- //fmt.Println(labeManage)
- //fmt.Println("personStatus: ", personStatus)
- //fmt.Println("CcmmunityIDs: ", cmmunityID)
- //鎸夌ぞ鍖篿d鏌ヨ杩戜竴涓湀es鏁版嵁
- captureInfos, err := db.Query1MDataByCommunityId(communityID)
- //fmt.Println("captureInfos: ", captureInfos)
- //residentCount := 0
+
+ documentNumberIDS := make([]string, 0)
+ for _, personStatus := range personStatusList {
+ //fmt.Println("personStatus.LastAppearanceTime: ", personStatus.LastAppearanceTime)
+ documentNumberIDS = append(documentNumberIDS, personStatus.DocumentNumber)
+ //涓氬姟閫昏緫
+ }
+ fmt.Println("绀惧尯妗ｆ鎬绘潯鏁帮細", len(documentNumberIDS))
+ captureInfos := make([]db.CaptureInfo, 0)
+ batchSize := config.Elastic.BatchSize
+ //fmt.Println(batchSize)
+ for i := 0; i < len(documentNumberIDS); i += batchSize {
+ end := i + batchSize
+ if end > len(documentNumberIDS) {
+ end = len(documentNumberIDS)
+ }
+ batch := documentNumberIDS[i:end]
+ //fmt.Println("batch: ", batch)
+ batchCaptureInfos, err := db.QueryByTimeThresholdDataByCommunityId(communityID, batch, config.Api.TimeThreshold)
+ if err != nil {
+ logger.Error("Query1MDataByCommunityId Error", err)
+ }
+ if len(batchCaptureInfos) == 0 {
+ continue
+ }
+ //fmt.Println("batchCaptureInfos: ", batchCaptureInfos)
+ captureInfos = append(captureInfos, batchCaptureInfos...)
+ }
+ if len(captureInfos) == 0 {
+ continue
+ }
+ fmt.Println("鍏辫鏈夋。妗堟暟鎹潯鏁颁负锛�", len(captureInfos))
+ //琛ュ叏鍒嗘瀽鎵�闇�鏁版嵁
for i := range captureInfos {
- //fmt.Println(captureInfos[i].DocumentNumber)
captureDays, overnightCount := data.CalculateCaptureDays(captureInfos[i].CaptureDetail)
captureInfos[i].CaptureDays = captureDays
captureInfos[i].OvernightStays = overnightCount
-
- //if captureInfos[i].CaptureDays <= 10 && captureInfos[i].OvernightStays >= 1 {
- // fmt.Println(captureInfos[i].DocumentNumber)
- // fmt.Println("璇ヤ汉鍛樺嚭鐜板ぉ鏁颁负", captureInfos[i].CaptureDays)
- // fmt.Println("璇ヤ汉鍛樿繃澶滃ぉ鏁颁负", captureInfos[i].OvernightStays)
- //}
captureInfos[i].Status = data.SetStatus(captureDays, ruleInfo)
if captureInfos[i].OvernightStays >= 5 && (captureInfos[i].CaptureDays <= 14 && captureInfos[i].CaptureDays >= 5) {
captureInfos[i].Status = "resident"
}
- //if captureInfos[i].Status == "resident" {
- // residentCount++
- //}
+ //fmt.Println("SetStatus: ", captureInfos[i].Status)
age, err := db.QueryAgeById(captureInfos[i].DocumentNumber)
if err != nil {
logger.Error("QueryAgeById ERROR", err)
}
captureInfos[i].Age = age
- data.SetFrequentAddress(&captureInfos[i])
- //fmt.Println("captureInfos[i].Age: ", captureInfos[i].Age)
+ captureInfos[i].FrequentAddress = data.GetFrequentAddress(captureInfos[i].CaptureDetail)
+ //fmt.Println("CaptureDetail: ", captureInfos[i].DocumentNumber, captureInfos[i].CaptureDays, captureInfos[i].CaptureDetail)
}
//fmt.Println("residentCount: ", residentCount)
- if err != nil {
- logger.Error("MatchAllTargets Error", err)
- }
- if len(captureInfos) == 0 {
- continue
- }
//fmt.Println("captureInfosQ: ", captureInfos)
for _, identity := range labeManage {
switch identity.Name {
case "鏈嶅姟浜哄憳":
identity, attribute := CreateLinearModel(captureInfos, communityID, 2.68, identity.ValidDays, identity.Id)
+
errIdentity := db.UpdateDBPersonLabel(identity)
if errIdentity != nil {
logger.Error("UpdateDBPersonLabel Error", errIdentity)
}
+
captureInfos = attribute
}
}
+
identity := CreateProcessModel(captureInfos, 30, communityID, labeManage)
errIdentity := db.UpdateDBPersonLabel(identity)
if errIdentity != nil {
logger.Error("UpdateDBPersonLabel Error", errIdentity)
}
+
//continue
- //fmt.Println("captureInfos: ", captureInfos)
- postCaptureInfos := data.ProcessData(captureInfos, personStatus, ruleInfo, communityID)
- //fmt.Println("postCaptureInfos: ", postCaptureInfos)
- //fmt.Println("鍏辫繃婊ゆ潯鏁帮細", len(captureInfos)-len(postCaptureInfos))
+
+ postCaptureInfos := data.ProcessData(captureInfos, personStatusList, ruleInfo, communityID)
+ for _, inf := range postCaptureInfos {
+ fmt.Println("---->pause prepare: capture ", inf.DocumentNumber, inf.Status, inf.FrequentAddress)
+ //return
+ //time.Sleep(time.Second * 10)
+
+ //fmt.Println("inf: ", inf.DocumentNumber, inf.Status, inf.FrequentAddress, inf.LastAppearanceStatusTime)
+ }
+ fmt.Println("鍏辨洿鏂版。妗堟暟锛�", len(postCaptureInfos))
+ //fmt.Println("----->captureInfos: ", len(captureInfos))
+ //continue
UpdatePersonInfoErr := db.UpdatePersonInfo(postCaptureInfos, communityID)
if UpdatePersonInfoErr != nil {
logger.Error("MatchPermanentResidentTargets Error: ", UpdatePersonInfoErr)
--
Gitblit v1.8.0