From d61eb4ab14e46f08c1d34c4da8ec0cad410fb6fd Mon Sep 17 00:00:00 2001 From: Klupp Dev Server Date: Fri, 14 Jul 2023 22:06:25 +0200 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20nos=20dados=20gr=C3=A1fico?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/AbstractRepository.php | 2 +- .../Med5min/Med5minRepository.php | 38 ++++++++----------- composer.json | 24 +++++++++++- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/app/Repositories/AbstractRepository.php b/app/Repositories/AbstractRepository.php index 2cafd15..c9a7d41 100644 --- a/app/Repositories/AbstractRepository.php +++ b/app/Repositories/AbstractRepository.php @@ -39,7 +39,7 @@ abstract class AbstractRepository { $model = app()->make($this->model); - if (!$model instanceof Model) { + if (!($model instanceof Model)) { throw new Exception( "Class {$this->model} must be an instance of Illuminate\\Database\\Eloquent\\Model" ); diff --git a/app/Repositories/Med5min/Med5minRepository.php b/app/Repositories/Med5min/Med5minRepository.php index c706fcc..c3184f3 100644 --- a/app/Repositories/Med5min/Med5minRepository.php +++ b/app/Repositories/Med5min/Med5minRepository.php @@ -7,7 +7,6 @@ namespace App\Repositories\Med5min; use App\Helpers\Helpers; use App\Models\Med5min; use App\Repositories\AbstractRepository; -use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Arr; @@ -184,7 +183,7 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt // 'YYYY/MM' // ) // )) - // ) as dia_data"), + // ) as dia_data"), // DB::raw("TO_CHAR((date('1899-12-30') + interval '1' day * med_5min.dia_num), 'DD/MM/YYYY') as day_formatted"), DB::raw(" (med_5min.dia_num::INTEGER - extract(day from ( @@ -213,11 +212,11 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt $groupBy = $this->groupField($typeField, $type); $result = $this->execute($fields, $params) - ->groupBy($groupBy) - ->orderBy(DB::raw("dia_num_month, med_5min.ponto")) - ->get(); + ->groupBy($groupBy) + ->orderBy(DB::raw("dia_num_month, med_5min.ponto")) + ->get(); - foreach($result as $row) { + foreach ($result as $row) { $row['dia_num'] = $row['dia_num_month']; unset($row['dia_num_month']); } @@ -245,42 +244,37 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt $field = [ -// DB::raw("(SUM(med_5min.ativa_consumo)/SQRT(((SUM(med_5min.ativa_consumo)^2) + (SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2)))) as FP"), DB::raw(" ( SUM(med_5min.ativa_consumo) / - SQRT( - SUM(med_5min.ativa_consumo)^2 - + - SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2 - ) + CASE WHEN SQRT(SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2) <> 0 + THEN SQRT(SUM(med_5min.reativa_consumo+med_5min.reativa_geracao)^2) + ELSE NULL + END ) as FP"), DB::raw("0.92 as F_ref") ]; return $collection->merge($field); - - }, function ($collection, $value) use($period) { + }, function ($collection, $value) use ($period) { $multiplyBy = 1; - if($period === 5) { + if ($period === 5) { $multiplyBy = 12; - }else if($period === 15) { + } else if ($period === 15) { $multiplyBy = 4; } $field = [ - DB::raw("(CASE WHEN (((med_5min.minuto-5)/60) >= 18 AND ((med_5min.minuto-5)/60) < 21 AND extract( dow from date '1899-12-30' + cast (med_5min.dia_num as integer)) BETWEEN 1 AND 5) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END)*1.05 as dem_tolerancia"), - DB::raw("SUM(med_5min.ativa_consumo)*".$multiplyBy." AS dem_reg"), + DB::raw("(CASE WHEN (((med_5min.minuto-5)/60) >= 18 AND ((med_5min.minuto-5)/60) < 21 AND extract( dow from date '1899-12-30' + cast (med_5min.dia_num as integer)) BETWEEN 1 AND 5) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END)*1.05 as dem_tolerancia"), + DB::raw("SUM(med_5min.ativa_consumo)*" . $multiplyBy . " AS dem_reg"), DB::raw("(CASE WHEN (((med_5min.minuto-5)/60) >= 18 AND ((med_5min.minuto-5)/60) <= 21 AND extract( dow from date '1899-12-30' + cast (med_5min.dia_num as integer)) BETWEEN 1 AND 5) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END) as dem_cont") ]; return $collection->merge($field); - })->all(); - } public function groupField($typeField, $type = null): array @@ -295,7 +289,7 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt array_splice($fields, 3); } - if($type === '1_mes') { + if ($type === '1_mes') { $fields = ["med_5min.ponto", "dia_num_month", "day_formatted"]; } @@ -306,6 +300,4 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt return $fields; } - - } diff --git a/composer.json b/composer.json index 3c3c71b..a8057d8 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,10 @@ "name": "laravel/laravel", "type": "project", "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], + "keywords": [ + "framework", + "laravel" + ], "license": "MIT", "require": { "php": "^8.1", @@ -52,7 +55,24 @@ ], "post-create-project-cmd": [ "@php artisan key:generate --ansi" - ] + ], + "cached": [ + "@php artisan optimize --ansi", + "@php artisan view:clear --ansi", + "@php artisan view:cache --ansi", + "@php artisan route:clear --ansi", + "@php artisan event:cache --ansi" + ], + "clear-cached": [ + "@php artisan optimize:clear", + "@php artisan cache:clear --ansi", + "@php artisan view:clear --ansi", + "@php artisan route:clear --ansi", + "@php artisan event:clear --ansi", + "@php artisan config:clear --ansi", + "@php artisan schedule:clear-cache --ansi" + ], + "dev": "@php artisan serve --host=0.0.0.0 --port=8080 --ansi" }, "extra": { "laravel": {