From b6207787439e29b0fe899ba53de624b08506d211 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 13:28:50 +0800
Subject: [PATCH] 修复es查询的数据容量
---
models/accessRegularity.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/models/accessRegularity.go b/models/accessRegularity.go
index 452ecf4..70e23d8 100644
--- a/models/accessRegularity.go
+++ b/models/accessRegularity.go
@@ -148,7 +148,7 @@
// 鍐欐暟鎹簱
result := &db.ModelTaskResults{
Title: m.Task.Name,
- Event: fmt.Sprintf("%s %d娆�", m.Task.Name, hitCount),
+ Event: fmt.Sprintf("%s - %s 鏃堕棿娈靛唴, %s %d娆�", sTime, eTime, m.Task.Name, hitCount),
ModelID: m.Task.ModelID,
ModelTaskID: m.Task.ID,
CommunityId: p.CommunityId,
@@ -196,7 +196,7 @@
for _, record := range records {
// 瑙ｆ瀽鏃堕棿
- t, err := time.Parse(layout, record.PicDate)
+ t, err := time.ParseInLocation(layout, record.PicDate, time.Local)
if err != nil {
fmt.Println("瑙ｆ瀽鏃堕棿澶辫触:", err)
continue
@@ -208,7 +208,7 @@
if !isCrossDay {
// 鍒ゆ柇鏃堕棿鑼冨洿锛屽苟褰掑睘鍒版煇涓�澶�
- if hour >= startHour && hour < endHour {
+ if hour >= startHour && hour <= endHour {
key = t.Format("2006-01-02")
} else {
continue // 涓嶅湪缁熻鑼冨洿鍐�
@@ -217,7 +217,7 @@
// 鍒ゆ柇鏃堕棿鑼冨洿锛屽苟褰掑睘鍒版煇涓�澶�
if hour >= startHour { // 21:00-23:59 褰掑睘褰撳ぉ
key = t.Format("2006-01-02")
- } else if hour < endHour { // 00:00-02:59 褰掑睘鍓嶄竴澶�
+ } else if hour <= endHour { // 00:00-02:59 褰掑睘鍓嶄竴澶�
key = t.AddDate(0, 0, -1).Format("2006-01-02")
} else {
continue // 涓嶅湪缁熻鑼冨洿鍐�
--
Gitblit v1.8.0