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

Merge branch 'master' of https://gitlab.com/kluppsoftware/smart-energia-api

Browse Source
This commit is contained in:
Ubuntu 2023-07-26 16:42:38 +00:00
commit 1ca66fc72d
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"
);

16
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;
@ -245,22 +244,19 @@ 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) {
$multiplyBy = 1;
@ -278,9 +274,7 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt
];
return $collection->merge($field);
})->all();
}
public function groupField($typeField, $type = null): array
@ -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": {