Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#51383,doing,0.8h] fix get records with vision.

Browse Source
This commit is contained in:
qixinzhi
2024-06-19 18:36:48 +08:00
committed by 宋辰轩
parent 810ee82c04
commit 83f75a9ff2
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+14 -25
View File
@@ -715,35 +715,24 @@ class metricModel extends model
if(!$metric) return array();
$dataFields = $this->getMetricRecordDateField($metric);
$visions = explode(',', $vision);
$result = array();
foreach($visions as $vision)
if($vision == 'rnd')
{
if($vision == 'rnd')
{
$records = $this->metricTao->fetchMetricRecordsWithOption($code, $dataFields, $options, $pager);
if(empty($records)) return array();
$records = $this->metricTao->fetchMetricRecordsWithOption($code, $dataFields, $options, $pager);
if(empty($records)) return array();
foreach($records as $index => $record)
{
$record = (array)$record;
$record['value'] = (float)$record['value'];
$result = $this->mergeRecord($record, $result);
}
}
else
foreach($records as $index => $record)
{
$otherVisionResult = $this->getResultByCode($code, $options, 'realtime', $pager, $vision);
foreach($otherVisionResult as $record)
{
$result = $this->mergeRecord($record, $result);
}
$record = (array)$record;
$record['value'] = (float)$record['value'];
$result[] = $record;
}
return $result;
}
return $result;
return $this->getResultByCode($code, $options, 'realtime', $pager, $vision);
}
/**
@@ -779,14 +768,14 @@ class metricModel extends model
{
$record = (array)$record;
$uniqueKeys = array();
$ignoreFields = $this->config->metric->ignoreFields;
$ignoreLibFields = $this->config->metric->ignoreLibFields;
foreach($record as $field => $value)
{
if(in_array($field, $ignoreFields) || empty($value)) continue;
if(in_array($field, $ignoreLibFields) || empty($value)) continue;
$uniqueKeys[] = $field . $value;
}
return implode('_', $uniqueKeys);
return empty($uniqueKeys) ? 'none' : implode('_', $uniqueKeys);
}
/**