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

Correção nos dados gráfico

Browse Source
This commit is contained in:
Klupp Dev Server 2023-07-14 22:06:25 +02:00
parent 30336c3111
commit d61eb4ab14
3 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/AbstractRepository.php
View File

@ -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"
);

28
app/Repositories/Med5min/Med5minRepository.php
View File

@ -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;
@ -217,7 +216,7 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
->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("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;
}
}

24
composer.json
View File

@ -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": {