From 3fe00ae3171ac30deef9ec9c020192fde36e2271 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 15:15:41 +0800
Subject: [PATCH] 修复托管条件
---
models/accessRegularity.go | 127 ++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 23 deletions(-)
diff --git a/models/accessRegularity.go b/models/accessRegularity.go
index 78274b8..dfb3986 100644
--- a/models/accessRegularity.go
+++ b/models/accessRegularity.go
@@ -94,7 +94,7 @@
return fmt.Errorf("task id:%s, %s timeRange Time range setting error. %+v", task.ID, task.Name, task.Rules)
}
- logger.Debugf("LocationModel init finish ...task id:%s, name:%s, rule:%+v", task.ID, task.Name, m)
+ logger.Debugf("AccessRegularity init finish ...task id:%s, name:%s, rule:%+v", task.ID, task.Name, m)
return nil
}
@@ -105,42 +105,62 @@
// 鏌ユ壘鎸囧畾鏃堕棿鑼冨洿鍐呭嚭琛岃繃鐨勬。妗堢紪鍙�
now := time.Now()
- startDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).AddDate(0, 0, -m.Duration).Unix()
+ startDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).AddDate(0, 0, -m.Duration)
+ endDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+
err := db.GetDB().Raw(`
SELECT
document_number,
frequent_address,
+ community_id,
+ org_id
FROM
snapshot_count_summary
WHERE
- last_appearance_time > ? ""
- AND (p.community_id IN ?
- OR p.org_id IN ?)
- AND p.status IN ?
- `, startDate, m.AreaIds, m.OrgIds, m.IdentityType).Scan(&baseFilter).Error
+ last_appearance_time > ?
+ AND (community_id IN ?
+ OR org_id IN ?)
+ AND status IN ?
+ `, startDate.Unix(), m.AreaIds, m.OrgIds, m.IdentityType).Scan(&baseFilter).Error
if err != nil {
logger.Warnf(err.Error())
}
+ logger.Debugf("task %s base filter result %d", m.Task.Name, len(baseFilter))
+ esCli := db.GetEsClient()
+ // 璋冪敤es鍒嗘瀽姝や汉鐨勫嚭琛岃寰嬫槸鍚︾鍚堟潯浠讹紝 杩斿洖绗﹀悎鏉′欢鐨勬鏁板拰鏈�鍚庝竴娆＄鍚堟潯浠剁殑鏃堕棿
+ sTime := startDate.Format(time.DateTime)
+ eTime := endDate.Format(time.DateTime)
+
for _, p := range baseFilter {
- // 璋冪敤es鍒嗘瀽姝や汉鐨勫嚭琛岃寰嬫槸鍚︾鍚堟潯浠讹紝 杩斿洖绗﹀悎鏉′欢鐨勬鏁板拰鏈�鍚庝竴娆＄鍚堟潯浠剁殑鏃堕棿
+ captures, err := service.QueryEsRecord(esCli, sTime, eTime, nil, []interface{}{p.CommunityId}, []string{p.DocumentNumber})
+ //logger.Debugf("task %s person %s captures %d", m.Task.Name, p.DocumentNumber, len(captures))
- // 鍐欐暟鎹簱
- var hitCount int
- result := &db.ModelTaskResults{
- Title: m.Task.Name,
- Event: fmt.Sprintf("%s %d娆�", m.Task.Name, hitCount),
- ModelID: m.Task.ModelID,
- ModelTaskID: m.Task.ID,
- CommunityId: p.CommunityId,
- OrgID: p.OrgId,
- ObjectIds: p.DocumentNumber,
- Location: p.FrequentAddress,
- PicDate: time.Unix(p.LastAppearanceTime, 0).Format("2006-01-02 15:04:05"),
- FirstPersonID: p.DocumentNumber,
+ if len(captures) == 0 || err != nil {
+ continue
}
+ //logger.Debugf("task %s person %s captures %+v", m.Task.Name, p.DocumentNumber, captures[0])
- results = append(results, result)
+ // 鏍规嵁鎶撴媿鏃堕棿鍜屽嚭鍏ユ柟鍚戯紝璁＄畻绗﹀悎瑙勫垯鍐呯殑鍑哄叆娆℃暟
+ hitCount, pd := countValidDays(captures, m.StartHour, m.EndHour, m.LastDirection)
+
+ if hitCount > m.Appearances {
+ // 鍐欐暟鎹簱
+ result := &db.ModelTaskResults{
+ Title: m.Task.Name,
+ Event: fmt.Sprintf("%s - %s 鏃堕棿娈靛唴, %s %d娆�", sTime, eTime, m.Task.Name, hitCount),
+ ModelID: m.Task.ModelID,
+ ModelTaskID: m.Task.ID,
+ CommunityId: p.CommunityId,
+ OrgID: p.OrgId,
+ ObjectIds: p.DocumentNumber,
+ Location: p.FrequentAddress,
+ PicDate: pd,
+ FirstPersonID: p.DocumentNumber,
+ }
+
+ results = append(results, result)
+ }
}
logger.Debugf("task %s last filter result %d", m.Task.Name, len(results))
@@ -154,10 +174,71 @@
func (m *RegularityModel) Shutdown() error {
// 娓呯悊璧勬簮
- fmt.Println("Shutting down LocationModel Model")
+ fmt.Println("Shutting down accessRegularityS Model")
return nil
}
func (m *RegularityModel) eventFormat() string {
return ""
}
+
+func countValidDays(records []*service.ESRecordInfo, startHour, endHour int, direction string) (int, string) {
+ layout := "2006-01-02 15:04:05" // 鏃堕棿鏍煎紡
+ lastDirectionMap := make(map[string]string) // 璁板綍鏈�鍚庝竴鏉� Direction
+ lastTimeMap := make(map[string]time.Time) // 璁板綍鏈�鍚庝竴鏉℃椂闂�
+ lastPicDate := ""
+
+ // 鍒ゆ柇鏄惁璺ㄥぉ
+ var isCrossDay bool
+ if endHour < startHour {
+ isCrossDay = true
+ }
+
+ for _, record := range records {
+ // 瑙ｆ瀽鏃堕棿
+ t, err := time.ParseInLocation(layout, record.PicDate, time.Local)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽鏃堕棿澶辫触:", err)
+ continue
+ }
+
+ // 鑾峰彇灏忔椂
+ hour := t.Hour()
+ var key string
+
+ if !isCrossDay {
+ // 鍒ゆ柇鏃堕棿鑼冨洿锛屽苟褰掑睘鍒版煇涓�澶�
+ if hour >= startHour && hour < endHour {
+ key = t.Format("2006-01-02")
+ } else {
+ continue // 涓嶅湪缁熻鑼冨洿鍐�
+ }
+ } else {
+ // 鍒ゆ柇鏃堕棿鑼冨洿锛屽苟褰掑睘鍒版煇涓�澶�
+ if hour >= startHour { // 21:00-23:59 褰掑睘褰撳ぉ
+ key = t.Format("2006-01-02")
+ } else if hour < endHour { // 00:00-02:59 褰掑睘鍓嶄竴澶�
+ key = t.AddDate(0, 0, -1).Format("2006-01-02")
+ } else {
+ continue // 涓嶅湪缁熻鑼冨洿鍐�
+ }
+ }
+
+ // 璁板綍璇ユ椂闂存鍐呯殑鏈�鍚庝竴鏉℃暟鎹�
+ if lastTime, exists := lastTimeMap[key]; !exists || t.After(lastTime) {
+ lastTimeMap[key] = t
+ lastDirectionMap[key] = record.CameraLocation.Direction
+ lastPicDate = record.PicDate
+ }
+ }
+
+ // 缁熻绗﹀悎鏉′欢
+ count := 0
+ for _, dir := range lastDirectionMap {
+ if dir == direction || direction == "" {
+ count++
+ }
+ }
+
+ return count, lastPicDate
+}
--
Gitblit v1.8.0