From 2e2e065ffcf79b90e2e42ec999886ef7e8f29fb7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 10 二月 2025 16:36:24 +0800
Subject: [PATCH] 昼伏夜出完善
---
models/accessRegularity.go | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/models/accessRegularity.go b/models/accessRegularity.go
index 78274b8..54d5850 100644
--- a/models/accessRegularity.go
+++ b/models/accessRegularity.go
@@ -105,11 +105,12 @@
// 鏌ユ壘鎸囧畾鏃堕棿鑼冨洿鍐呭嚭琛岃繃鐨勬。妗堢紪鍙�
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)
err := db.GetDB().Raw(`
SELECT
document_number,
frequent_address,
+ community_id,
FROM
snapshot_count_summary
WHERE
@@ -117,16 +118,29 @@
AND (p.community_id IN ?
OR p.org_id IN ?)
AND p.status IN ?
- `, startDate, m.AreaIds, m.OrgIds, m.IdentityType).Scan(&baseFilter).Error
+ `, startDate.Unix(), m.AreaIds, m.OrgIds, m.IdentityType).Scan(&baseFilter).Error
if err != nil {
logger.Warnf(err.Error())
}
+ esCli := db.GetEsClient()
for _, p := range baseFilter {
// 璋冪敤es鍒嗘瀽姝や汉鐨勫嚭琛岃寰嬫槸鍚︾鍚堟潯浠讹紝 杩斿洖绗﹀悎鏉′欢鐨勬鏁板拰鏈�鍚庝竴娆＄鍚堟潯浠剁殑鏃堕棿
+ sTime := startDate.Format(time.DateTime)
+ eTime := time.Now().Format(time.DateTime)
+ captures, err := service.QueryEsRecord(esCli, sTime, eTime, nil, []interface{}{p.CommunityId}, []string{p.DocumentNumber})
+ if len(captures) == 0 || err != nil {
+ continue
+ }
+
+ // 鏍规嵁鎶撴媿鏃堕棿鍜屽嚭鍏ユ柟鍚戯紝璁＄畻绗﹀悎瑙勫垯鍐呯殑鍑哄叆娆℃暟
+ hitCount := 0
+
+ //for _, c := range captures {
+ // captureTime, err := time.ParseInLocation(time.DateTime, c.PicDate, time.Local)
+ //}
// 鍐欐暟鎹簱
- var hitCount int
result := &db.ModelTaskResults{
Title: m.Task.Name,
Event: fmt.Sprintf("%s %d娆�", m.Task.Name, hitCount),
@@ -136,7 +150,7 @@
OrgID: p.OrgId,
ObjectIds: p.DocumentNumber,
Location: p.FrequentAddress,
- PicDate: time.Unix(p.LastAppearanceTime, 0).Format("2006-01-02 15:04:05"),
+ PicDate: time.Unix(p.LastAppearanceTime, 0).Format(time.DateTime),
FirstPersonID: p.DocumentNumber,
}
--
Gitblit v1.8.0