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

Correction in the R/MWh Cost function.

Browse Source
This commit is contained in:
Djonathan 2022-06-29 12:38:38 -03:00
parent dc6d9465e9
commit f1f6c69062
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Repositories/Economy/EconomyRepository.php
View File

@ -101,7 +101,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
public function getCostMWhEconomy($params) public function getCostMWhEconomy($params)
{ {
$field = [ $field = [
DB::raw("TO_CHAR(TO_DATE(economia.mes, 'YYMM'), 'MM/YYYY') as mes"), DB::raw("TO_DATE(economia.mes, 'YYMM') as mes"),
DB::raw("SUM(economia.custo_unit) as custo_unit"), DB::raw("SUM(economia.custo_unit) as custo_unit"),
"economia.dad_estimado" "economia.dad_estimado"
]; ];
@ -118,7 +118,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
->orderBy('dad_estimado') ->orderBy('dad_estimado')
->get(); ->get();
return static::checkDate($result); return collect(static::checkDate($result))->transform(fn($value) => Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))->all();;
} }
@ -126,9 +126,10 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
{ {
$year = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes']) $year = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
->explode('/')->offsetGet(1)))->unique()->toArray(); ->explode('-')->offsetGet(0)))->unique()->toArray();
$month = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes']) $month = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
->explode('/')->offsetGet(0)))->unique()->toArray(); ->explode('-')->offsetGet(1)))->unique()->toArray();
$month_stat = end($month); $month_stat = end($month);
$date_stat = current($year); $date_stat = current($year);
$date_end = end($year); $date_end = end($year);
@ -141,7 +142,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
$date = []; $date = [];
foreach ($daterange as $date1) { foreach ($daterange as $date1) {
$date[] = $date1->format('m/Y'); $date[] = $date1->format('Y-m'.'-01');
} }
$arr = collect($value)->toArray(); $arr = collect($value)->toArray();
@ -153,8 +154,8 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
} }
usort($arr, function ($a, $b, $i = 'mes') { usort($arr, function ($a, $b, $i = 'mes') {
$t1 = strtotime(str_replace('/', '-', $a[$i])); $t1 = strtotime($a[$i]);
$t2 = strtotime(str_replace('/', '-', $b[$i])); $t2 = strtotime($b[$i]);
return $t1 - $t2; return $t1 - $t2;
}); });

4
routes/api.php
View File

@ -31,6 +31,8 @@ Route::middleware(['auth:sanctum', 'verified'])->group(function () {
Route::post('pld', [\App\Http\Controllers\PldController::class, 'index']); Route::post('pld', [\App\Http\Controllers\PldController::class, 'index']);
Route::post('units', [\App\Http\Controllers\ClientController::class, 'index']); Route::post('units', [\App\Http\Controllers\ClientController::class, 'index']);
Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']);
}); });
Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () { Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () {
@ -73,8 +75,6 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () {
Route::post('notify', [\App\Http\Controllers\NotificationController::class, 'notify']); Route::post('notify', [\App\Http\Controllers\NotificationController::class, 'notify']);
Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']);
Route::get('news', [\App\Http\Controllers\NewsController::class, 'send']); Route::get('news', [\App\Http\Controllers\NewsController::class, 'send']);
}); });