From 5034d870cd46307df5bb242d392a22edc8c5f059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Mon, 26 May 2025 17:59:58 +0900 Subject: [PATCH] dbms_init...1 --- .../Admin/Customer/ServiceController.php | 9 ----- .../Admin/Equipment/ServerController.php | 6 ++-- app/Entities/Customer/ServiceEntity.php | 14 -------- app/Helpers/Customer/ServiceHelper.php | 35 ------------------- app/Services/Equipment/Link/LinkService.php | 4 +-- 5 files changed, 5 insertions(+), 63 deletions(-) diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index f026198..f87942f 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -77,15 +77,6 @@ class ServiceController extends CustomerController 'fields' => ['clientinfo_uid', 'type', 'billing_at', 'rack', 'LINE', 'SERVER', 'IP', 'CPU', 'RAM', 'DISK', 'SOFTWARE', 'DEFENCE', 'start_at', 'status'], ]; $this->init('index', $fields); - // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임 return parent::index_process(); - // $entities = []; - // foreach (parent::index_process() as $entity) { - // $entity->setPartEntities("CPU", $this->getCpuService()->getPartEntities($entity)); - // $entity->setPartEntities("RAM", $this->getRamService()->getPartEntities($entity)); - // $entity->setPartEntities("DISK", $this->getDiskService()->getPartEntities($entity)); - // $entities[] = $entity; - // } - // return $entities; } } diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index d5acb20..84b955e 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -71,9 +71,9 @@ class ServerController extends EquipmentController // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임 $entities = []; foreach (parent::index_process() as $entity) { - $entity->setPartEntities("CPU", $this->getCpuService()->getPartEntities($entity)); - $entity->setPartEntities("RAM", $this->getRamService()->getPartEntities($entity)); - $entity->setPartEntities("DISK", $this->getDiskService()->getPartEntities($entity)); + $entity->setPartEntities("CPU", $this->getCpuService()->getAdapterEntities($entity)); + $entity->setPartEntities("RAM", $this->getRamService()->getAdapterEntities($entity)); + $entity->setPartEntities("DISK", $this->getDiskService()->getAdapterEntities($entity)); $entities[] = $entity; } return $entities; diff --git a/app/Entities/Customer/ServiceEntity.php b/app/Entities/Customer/ServiceEntity.php index 2a28cec..c474eb8 100644 --- a/app/Entities/Customer/ServiceEntity.php +++ b/app/Entities/Customer/ServiceEntity.php @@ -2,24 +2,10 @@ namespace App\Entities\Customer; -use App\Entities\Equipment\PartEntity; use App\Models\Customer\ServiceModel; class ServiceEntity extends CustomerEntity { const PK = ServiceModel::PK; const TITLE = ServiceModel::TITLE; - - public function getPartEntities(string $type): array - { - return $this->attributes[$type] ?? []; - } - public function setPartEntities(string $type, array $partEntities): void - { - if (!isset($this->attributes[$type])) { - $this->attributes[$type] = []; - } - $this->attributes[$type] = $partEntities; - // $this->attributes[$type] = array_unique($this->attributes[$type], SORT_REGULAR); - } } diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index cc81f82..6185e2d 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -13,39 +13,4 @@ class ServiceHelper extends CustomerHelper parent::__construct($request); $this->setTitleField(field: ServiceModel::TITLE); } - public function getFieldView(string $field, array $viewDatas, array $extras = []): string - { - $value = $viewDatas['entity']->$field ?? ""; - switch ($field) { - case "LINE": - case "SERVER": - case "IP": - case "CPU": - case "RAM": - case "DISK": - case "DEFENCE": - case "SOFTWARE": - $temps = []; - foreach ($viewDatas['entity']->getPartEntities($field) as $partEntity) { - $temps[] = "
" . $partEntity->getTitle() . "
"; - } - $extras = ["class" => "btn btn-outline btn-primary btn-circle", "target" => "_self", ...$extras]; - $temps[] = form_label( - '변경', - $field, - [ - "data-src" => "/admin/customer/link/" . strtolower($field) . "?&serviceinfo_uid={$viewDatas['entity']->getPK()}", - "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras - ] - ); - $value = implode("", $temps); - break; - default: - $value = parent::getFieldView($field, $viewDatas, $extras); - break; - } - return $value; - } } diff --git a/app/Services/Equipment/Link/LinkService.php b/app/Services/Equipment/Link/LinkService.php index 3cedd43..8c6c23e 100644 --- a/app/Services/Equipment/Link/LinkService.php +++ b/app/Services/Equipment/Link/LinkService.php @@ -17,11 +17,11 @@ abstract class LinkService extends EquipmentService } abstract protected function getAdapterService(): mixed; abstract protected function getAdapterField(): string; - final public function getPartEntities(ServerEntity $serverEntity): array + final public function getAdapterEntities(ServerEntity $serverEntity): array { $entities = []; foreach ($this->getEntities(['serverinfo_uid' => $serverEntity->getPK()]) as $entity) { - $entities[] = $this->getAdapterService()->getEntity($entity->getPartInfoUID()); + $entities[] = $this->getAdapterService()->getEntity($entity->getAdapterInfoUID()); } return $entities; }