Smart/smartEnergyView-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Moving Average Endpoint Implementation.

Browse Source
This commit is contained in:
Djonathan 2022-07-11 18:28:23 -03:00
parent dbdb64f507
commit 846b07c741
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Pld.php
View File

@ -14,7 +14,7 @@ use OwenIt\Auditing\Auditable;
class Pld extends Model implements Auditing
{
use HasFactory, SoftDeletes, Auditable;
use HasFactory, Auditable;
protected $table = "pld";
@ -42,5 +42,4 @@ class Pld extends Model implements Auditing
return $date->format('d/m/Y H:i:s');
}
}

26
app/Repositories/Pld/PldRepository.php
View File

@ -159,18 +159,19 @@ class PldRepository extends AbstractRepository implements PldContractInterface
'pld.submercado as submarket',
DB::raw("AVG(pld.valor) as value"),
DB::raw("pld.mes_ref as year_month"),
DB::raw("TO_CHAR(TO_DATE(pld.mes_ref, 'YYMM'::text)::timestamp with time zone, 'MM/YYYY'::text) as year_month_formatted"),
DB::raw("TO_CHAR(TO_DATE(pld.mes_ref, 'YYMM'::text)::timestamp with time zone, 'MM/YYYY'::text) as year_month_formatted")
];
$i = 0;
foreach ($params['filters'] as $param) {
if ($param['field'] === $field) {
$params['filters'][$i]['field'] = "TO_CHAR(TO_DATE(pld.{$param['field']}, 'YYMM'), 'MM/YYYY')";
}
$i++;
}
$fields2 = ['day_formatted',
'day_calc',
'submarket',
'year_month',
'year_month_formatted',
'value',
DB::raw('avg(value) over(ORDER BY day_formatted) as mMovel')
];
return $this->execute($fields, $params)
$query = $this->execute($fields)
->groupBy(
DB::raw("(to_char(('1899-12-30'::date + ('1 day'::interval day * (pld.dia_num)::double precision)), 'DD'::text))"),
DB::raw("('1899-12-30'::date + ('1 day'::interval day * (pld.dia_num)::double precision))"),
@ -178,9 +179,12 @@ class PldRepository extends AbstractRepository implements PldContractInterface
"pld.mes_ref",
DB::raw("(to_char((to_date(pld.mes_ref, 'YYMM'::text))::timestamp with time zone, 'MM/YYYY'::text))")
)
->orderByRaw("('1899-12-30'::date + ('1 day'::interval day * (pld.dia_num)::double precision))")
->get();
->orderByRaw("('1899-12-30'::date + ('1 day'::interval day * (pld.dia_num)::double precision))");
return $this->execute($fields2, $params)
->from($query, 'plds')
->orderBy('day_calc', 'asc')
->get();
}
public function getConsumptionBySchedule($params, $field = "dia_num"): Collection|array