From 10ea676b8624fc0a564fbdd0e08bf91d11fa5dab Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 23 Nov 2023 09:46:44 +0800
Subject: [PATCH] * Modify method to get metric cycle.

---
 module/metric/model.php | 15 ++++++++-------
 module/metric/zen.php   |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/metric/model.php b/module/metric/model.php
index fef56befbd..ac7eef9597 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -1486,18 +1486,19 @@ class metricModel extends model
      * 获取度量项的收集周期。
      * Get collect cycle of metric.
      *
-     * @param  array  $results
+     * @param  array|object $record
      * @access public
      * @return string|null
      */
-    public function getMetricCycle($results)
+    public function getMetricCycle($record)
     {
-        $firstRecord = (object)current($results);
+        $record = (object)$record;
+
+        if(isset($record->year) && !isset($record->month) && !isset($record->week)) return 'year';
+        if(isset($record->year, $record->month) && !isset($record->day)) return 'month';
+        if(isset($record->year, $record->month, $record->day)) return 'day';
+        if(isset($record->year, $record->week)) return 'week';
 
-        foreach($this->config->metric->dateList as $date)
-        {
-            if(isset($firstRecord->$date)) return $date;
-        }
         return null;
     }
 }
diff --git a/module/metric/zen.php b/module/metric/zen.php
index 6cdf6018e3..6128701329 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -188,7 +188,8 @@ class metricZen extends metric
 
             $system = (int)$this->metric->isSystemMetric($results);
 
-            $cycle = $this->metric->getMetricCycle($results);
+            $firstRecord = (object)current($results);
+            $cycle = $this->metric->getMetricCycle($firstRecord);
             $this->metric->clearOutDatedRecords($code, $cycle);
 
             foreach($results as $record)