diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7c41db7..de3e889 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -150,6 +150,19 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au }); }); $routes->group('equipment', ['namespace' => 'App\Controllers\Admin\Equipment'], function ($routes) { + $routes->group('switch', ['namespace' => 'App\Controllers\Admin\Equipment'], function ($routes) { + $routes->get('/', 'SwitchController::index', []); + $routes->get('create', 'SwitchController::create_form'); + $routes->post('create', 'SwitchController::create'); + $routes->get('modify/(:alphanum)', 'SwitchController::modify_form/$1'); + $routes->post('modify/(:alphanum)', 'SwitchController::modify/$1'); + $routes->get('view/(:alphanum)', 'SwitchController::view/$1'); + $routes->get('delete/(:alphanum)', 'SwitchController::delete/$1'); + $routes->get('toggle/(:alphanum)/(:any)', 'SwitchController::toggle/$1/$2'); + $routes->post('batchjob', 'SwitchController::batchjob'); + $routes->post('batchjob_delete', 'SwitchController::batchjob_delete'); + $routes->get('download/(:alpha)', 'SwitchController::download/$1'); + }); $routes->group('code', ['namespace' => 'App\Controllers\Admin\Equipment'], function ($routes) { $routes->get('/', 'CodeController::index', []); $routes->get('create', 'CodeController::create_form'); @@ -176,19 +189,6 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->post('batchjob_delete', 'ServerController::batchjob_delete'); $routes->get('download/(:alpha)', 'ServerController::download/$1'); }); - $routes->group('domain', ['namespace' => 'App\Controllers\Admin\Equipment'], function ($routes) { - $routes->get('/', 'DomainController::index', []); - $routes->get('create', 'DomainController::create_form'); - $routes->post('create', 'DomainController::create'); - $routes->get('modify/(:num)', 'DomainController::modify_form/$1'); - $routes->post('modify/(:num)', 'DomainController::modify/$1'); - $routes->get('view/(:num)', 'DomainController::view/$1'); - $routes->get('delete/(:num)', 'DomainController::delete/$1'); - $routes->get('toggle/(:num)/(:any)', 'DomainController::toggle/$1/$2'); - $routes->post('batchjob', 'DomainController::batchjob'); - $routes->post('batchjob_delete', 'DomainController::batchjob_delete'); - $routes->get('download/(:alpha)', 'DomainController::download/$1'); - }); $routes->group('part', ['namespace' => 'App\Controllers\Admin\Equipment\Part'], function ($routes) { $routes->group('line', ['namespace' => 'App\Controllers\Admin\Equipment\Part'], function ($routes) { $routes->get('/', 'LineController::index', []); @@ -272,6 +272,19 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->get('delete/(:num)', 'StorageController::delete/$1'); $routes->get('toggle/(:num)/(:any)', 'StorageController::toggle/$1/$2'); }); + $routes->group('domain', ['namespace' => 'App\Controllers\Admin\Equipment\Part'], function ($routes) { + $routes->get('/', 'DomainController::index', []); + $routes->get('create', 'DomainController::create_form'); + $routes->post('create', 'DomainController::create'); + $routes->get('modify/(:num)', 'DomainController::modify_form/$1'); + $routes->post('modify/(:num)', 'DomainController::modify/$1'); + $routes->get('view/(:num)', 'DomainController::view/$1'); + $routes->get('delete/(:num)', 'DomainController::delete/$1'); + $routes->get('toggle/(:num)/(:any)', 'DomainController::toggle/$1/$2'); + $routes->post('batchjob', 'DomainController::batchjob'); + $routes->post('batchjob_delete', 'DomainController::batchjob_delete'); + $routes->get('download/(:alpha)', 'DomainController::download/$1'); + }); }); }); }); diff --git a/app/Controllers/Admin/Customer/AccountController.php b/app/Controllers/Admin/Customer/AccountController.php index ee31ef1..123268b 100644 --- a/app/Controllers/Admin/Customer/AccountController.php +++ b/app/Controllers/Admin/Customer/AccountController.php @@ -30,7 +30,7 @@ class AccountController extends CustomerController public function getHelper(): AccountHelper { if (!$this->_helper) { - $this->_helper = new AccountHelper($this->request); + $this->_helper = new AccountHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index d0d0fd1..63a3099 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -31,7 +31,7 @@ class ClientController extends CustomerController public function getHelper(): ClientHelper { if (!$this->_helper) { - $this->_helper = new ClientHelper($this->request); + $this->_helper = new ClientHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/CouponController.php b/app/Controllers/Admin/Customer/CouponController.php index 2c3d5d7..92c4abb 100644 --- a/app/Controllers/Admin/Customer/CouponController.php +++ b/app/Controllers/Admin/Customer/CouponController.php @@ -30,7 +30,7 @@ class CouponController extends CustomerController public function getHelper(): CouponHelper { if (!$this->_helper) { - $this->_helper = new CouponHelper($this->request); + $this->_helper = new CouponHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/PointController.php b/app/Controllers/Admin/Customer/PointController.php index 4c20f74..b79b300 100644 --- a/app/Controllers/Admin/Customer/PointController.php +++ b/app/Controllers/Admin/Customer/PointController.php @@ -30,7 +30,7 @@ class PointController extends CustomerController public function getHelper(): PointHelper { if (!$this->_helper) { - $this->_helper = new PointHelper($this->request); + $this->_helper = new PointHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 20203c6..8366c05 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -35,7 +35,7 @@ class ServiceController extends CustomerController public function getHelper(): ServiceHelper { if (!$this->_helper) { - $this->_helper = new ServiceHelper($this->request); + $this->_helper = new ServiceHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/ServiceHistoryController.php b/app/Controllers/Admin/Customer/ServiceHistoryController.php index b62537a..98739d5 100644 --- a/app/Controllers/Admin/Customer/ServiceHistoryController.php +++ b/app/Controllers/Admin/Customer/ServiceHistoryController.php @@ -34,7 +34,7 @@ class ServiceHistoryController extends CustomerController public function getHelper(): ServiceHistoryHelper { if (!$this->_helper) { - $this->_helper = new ServiceHistoryHelper($this->request); + $this->_helper = new ServiceHistoryHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/ServiceItemController.php b/app/Controllers/Admin/Customer/ServiceItemController.php index 7412e5a..b5b8092 100644 --- a/app/Controllers/Admin/Customer/ServiceItemController.php +++ b/app/Controllers/Admin/Customer/ServiceItemController.php @@ -46,7 +46,7 @@ class ServiceItemController extends CustomerController public function getHelper(): ServiceItemHelper { if (!$this->_helper) { - $this->_helper = new ServiceItemHelper($this->request); + $this->_helper = new ServiceItemHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Customer/ServicePaymentController.php b/app/Controllers/Admin/Customer/ServicePaymentController.php index f7ea716..191d535 100644 --- a/app/Controllers/Admin/Customer/ServicePaymentController.php +++ b/app/Controllers/Admin/Customer/ServicePaymentController.php @@ -39,7 +39,7 @@ class ServicePaymentController extends CustomerController public function getHelper(): ServicePaymentHelper { if (!$this->_helper) { - $this->_helper = new ServicePaymentHelper($this->request); + $this->_helper = new ServicePaymentHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/CodeController.php b/app/Controllers/Admin/Equipment/CodeController.php index 6bf5873..f08651a 100644 --- a/app/Controllers/Admin/Equipment/CodeController.php +++ b/app/Controllers/Admin/Equipment/CodeController.php @@ -30,7 +30,7 @@ class CodeController extends EquipmentController public function getHelper(): CodeHelper { if (!$this->_helper) { - $this->_helper = new CodeHelper($this->request); + $this->_helper = new CodeHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/CpuController.php b/app/Controllers/Admin/Equipment/Part/CpuController.php index 3b981fe..dc78335 100644 --- a/app/Controllers/Admin/Equipment/Part/CpuController.php +++ b/app/Controllers/Admin/Equipment/Part/CpuController.php @@ -30,7 +30,7 @@ class CpuController extends PartController public function getHelper(): CpuHelper { if (!$this->_helper) { - $this->_helper = new CpuHelper($this->request); + $this->_helper = new CpuHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/DefenceController.php b/app/Controllers/Admin/Equipment/Part/DefenceController.php index 12b9206..a096a53 100644 --- a/app/Controllers/Admin/Equipment/Part/DefenceController.php +++ b/app/Controllers/Admin/Equipment/Part/DefenceController.php @@ -30,7 +30,7 @@ class DefenceController extends PartController public function getHelper(): DefenceHelper { if (!$this->_helper) { - $this->_helper = new DefenceHelper($this->request); + $this->_helper = new DefenceHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/DomainController.php b/app/Controllers/Admin/Equipment/Part/DomainController.php similarity index 81% rename from app/Controllers/Admin/Equipment/DomainController.php rename to app/Controllers/Admin/Equipment/Part/DomainController.php index bee1901..98296ea 100644 --- a/app/Controllers/Admin/Equipment/DomainController.php +++ b/app/Controllers/Admin/Equipment/Part/DomainController.php @@ -1,16 +1,15 @@ _helper) { - $this->_helper = new DomainHelper($this->request); + $this->_helper = new DomainHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/IpController.php b/app/Controllers/Admin/Equipment/Part/IpController.php index 26c1e24..53752d2 100644 --- a/app/Controllers/Admin/Equipment/Part/IpController.php +++ b/app/Controllers/Admin/Equipment/Part/IpController.php @@ -33,7 +33,7 @@ class IpController extends PartController public function getHelper(): IpHelper { if (!$this->_helper) { - $this->_helper = new IpHelper($this->request); + $this->_helper = new IpHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/LineController.php b/app/Controllers/Admin/Equipment/Part/LineController.php index 3af1e08..8cffed5 100644 --- a/app/Controllers/Admin/Equipment/Part/LineController.php +++ b/app/Controllers/Admin/Equipment/Part/LineController.php @@ -34,7 +34,7 @@ class LineController extends PartController public function getHelper(): LineHelper { if (!$this->_helper) { - $this->_helper = new LineHelper($this->request); + $this->_helper = new LineHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/RamController.php b/app/Controllers/Admin/Equipment/Part/RamController.php index 924a465..50c31f6 100644 --- a/app/Controllers/Admin/Equipment/Part/RamController.php +++ b/app/Controllers/Admin/Equipment/Part/RamController.php @@ -30,7 +30,7 @@ class RamController extends PartController public function getHelper(): RamHelper { if (!$this->_helper) { - $this->_helper = new RamHelper($this->request); + $this->_helper = new RamHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/SoftwareController.php b/app/Controllers/Admin/Equipment/Part/SoftwareController.php index dc77601..1b556bf 100644 --- a/app/Controllers/Admin/Equipment/Part/SoftwareController.php +++ b/app/Controllers/Admin/Equipment/Part/SoftwareController.php @@ -31,7 +31,7 @@ class SoftwareController extends PartController public function getHelper(): SoftwareHelper { if (!$this->_helper) { - $this->_helper = new SoftwareHelper($this->request); + $this->_helper = new SoftwareHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/Part/StorageController.php b/app/Controllers/Admin/Equipment/Part/StorageController.php index 0c83b4a..29eca95 100644 --- a/app/Controllers/Admin/Equipment/Part/StorageController.php +++ b/app/Controllers/Admin/Equipment/Part/StorageController.php @@ -30,7 +30,7 @@ class StorageController extends PartController public function getHelper(): StorageHelper { if (!$this->_helper) { - $this->_helper = new StorageHelper($this->request); + $this->_helper = new StorageHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index 2f8575a..b54d66a 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -30,7 +30,7 @@ class ServerController extends EquipmentController public function getHelper(): ServerHelper { if (!$this->_helper) { - $this->_helper = new ServerHelper($this->request); + $this->_helper = new ServerHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/Equipment/SwitchController.php b/app/Controllers/Admin/Equipment/SwitchController.php new file mode 100644 index 0000000..c519ad1 --- /dev/null +++ b/app/Controllers/Admin/Equipment/SwitchController.php @@ -0,0 +1,44 @@ +content_title = lang("{$this->getService()->getClassName()}.title"); + $this->class_path .= $this->getService()->getClassName(); + $this->uri_path .= strtolower($this->getService()->getClassName('/')) . '/'; + // $this->view_path .= strtolower($this->getService()->getClassName()) . DIRECTORY_SEPARATOR; + + } + public function getService(): SwitchService + { + if (!$this->_service) { + $this->_service = new SwitchService(); + } + return $this->_service; + } + public function getHelper(): SwitchHelper + { + if (!$this->_helper) { + $this->_helper = new SwitchHelper(); + } + return $this->_helper; + } + //Index,FieldForm관련 + protected function setOrderByForList(): void + { + //OrderBy 처리 + $this->getService()->getModel()->orderBy('code', 'ASC', false); + parent::setOrderByForList(); + } +} diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php index aea4aba..6050250 100644 --- a/app/Controllers/Admin/Home.php +++ b/app/Controllers/Admin/Home.php @@ -34,7 +34,7 @@ class Home extends AdminController public function getHelper(): mixed { if (!$this->_helper) { - $this->_helper = new HomeHelper($this->request); + $this->_helper = new HomeHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/MyLogController.php b/app/Controllers/Admin/MyLogController.php index 044890d..7749c91 100644 --- a/app/Controllers/Admin/MyLogController.php +++ b/app/Controllers/Admin/MyLogController.php @@ -32,7 +32,7 @@ class MyLogController extends AdminController public function getHelper(): MyLogHelper { if (!$this->_helper) { - $this->_helper = new MyLogHelper($this->request); + $this->_helper = new MyLogHelper(); } return $this->_helper; } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index cfac38e..3e530ae 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -35,7 +35,7 @@ class UserController extends AdminController public function getHelper(): UserHelper { if (!$this->_helper) { - $this->_helper = new UserHelper($this->request); + $this->_helper = new UserHelper(); } return $this->_helper; } diff --git a/app/Controllers/Auth/AuthController.php b/app/Controllers/Auth/AuthController.php index bb2ffd0..df93d67 100644 --- a/app/Controllers/Auth/AuthController.php +++ b/app/Controllers/Auth/AuthController.php @@ -28,7 +28,7 @@ abstract class AuthController extends CommonController final public function getHelper(): mixed { if (!$this->_helper) { - $this->_helper = new AuthHelper($this->request); + $this->_helper = new AuthHelper(); } return $this->_helper; } @@ -36,7 +36,7 @@ abstract class AuthController extends CommonController protected function getResultSuccess(string $message = MESSAGES["SUCCESS"], ?string $actionTemplate = null): RedirectResponse|string { switch ($this->getAction()) { - case 'create': + case 'create': //Login처리 $result = redirect()->to($this->getMyAuth()->popPreviousUrl())->with('error', $message); break; default: diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index f0d4787..e66c81a 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -225,7 +225,7 @@ abstract class CommonController extends BaseController final protected function getResultFail(string $message = MESSAGES["FAILED"]): RedirectResponse { LogCollector::debug($message); - $this->getMyLogService()->save($this->getService(), __FUNCTION__, $this->getMyAuth(), $message); + $this->getMyLogService()->save($this->getService()->getClassName(), __FUNCTION__, $message); if ($this->request->getMethod() === 'POST') { return redirect()->back()->withInput()->with('error', $message); } @@ -236,7 +236,7 @@ abstract class CommonController extends BaseController switch ($this->getAction()) { case 'create': case 'modify': - $this->getMyLogService()->save($this->getService(), __FUNCTION__, $this->getMyAuth(), $message); + $this->getMyLogService()->save($this->getService()->getClassName(), __FUNCTION__, $message); $result = $this->view($this->entity->getPK()); break; case 'create_form': diff --git a/app/Database/erp2_2.vuerd.json b/app/Database/erp2_2.vuerd.json index babb1d5..b2ebaa1 100644 --- a/app/Database/erp2_2.vuerd.json +++ b/app/Database/erp2_2.vuerd.json @@ -4,8 +4,8 @@ "settings": { "width": 3000, "height": 3000, - "scrollTop": -1073.1953, - "scrollLeft": -842.6417, + "scrollTop": -1480.1953, + "scrollLeft": -994.6025, "zoomLevel": 0.79, "show": 511, "database": 4, @@ -50,7 +50,8 @@ "B8haiEbPc1lRBWTv1g25G", "0WXrjcyXXGeoAVM2VB8s2", "eLGlqJ4z_woGP6CLZEuUr", - "JoMB-mb6p6NoHpiAvjD2y" + "JoMB-mb6p6NoHpiAvjD2y", + "IsMoJXzvtuoOFFt93qS0w" ], "relationshipIds": [ "gAVYXWnBSnCw-0ieO4Mil", @@ -64,11 +65,12 @@ "I80TuGxKm3tXIO_EO2PSm", "o8yw46vm30cC7wl9cRMdo", "ocWjncqwtYkP02mw4A0-8", - "6oBuPqT-ikPI7X8a05Trv", "Hj5AZkoYGvM_syvnqMeOi", "dgALp3F5aQw7gy6h_Ejcl", "cRqZmxohkCGd_FTkg1rhI", - "e74Cc4zZztxyoazM_ssbu" + "e74Cc4zZztxyoazM_ssbu", + "Y-MNlBi4tzmX_zwrY0zTc", + "my7misDXaAqlgb4tiABJn" ], "indexIds": [], "memoIds": [] @@ -259,14 +261,14 @@ ], "ui": { "x": 1699.7701, - "y": 1476.0173, + "y": 1519.0553, "zIndex": 2, "widthName": 60, "widthComment": 60, "color": "" }, "meta": { - "updateAt": 1750828981836, + "updateAt": 1750900809322, "createAt": 1745819764137 } }, @@ -813,11 +815,11 @@ "NzxkmndrTbH7xb6fbnGV7", "f1hR1JRFHBHwiJSSX34gw", "Vf3bNvvEPfu1zCs4rcHTU", - "O7aGU_LJxCO1NeNVWbB-J", + "PLQrLZGFiiPQDZSYpU-Rc", + "9DIj0WNLrGT8VCHZuRkCz", "SGWWOOHjCF81V4O5tUiJu", "uuDbJDSDQLey7Km1W9hlJ", "Gb6fmS40Q3wvnvD1HMTqR", - "_UFwKNcesG423815BIYBi", "FJtEzmrQUsMMbrWbzr8IR", "hQ5EOPiUpDbVpWQwawtw4", "9o7wfPp7WK2nZoxkDZ9Y1", @@ -841,7 +843,10 @@ "Fx2k158yi9P2l5An09ae1", "f1hR1JRFHBHwiJSSX34gw", "Vf3bNvvEPfu1zCs4rcHTU", + "AU5HgX9gt97EPfq5SoKnd", "O7aGU_LJxCO1NeNVWbB-J", + "PLQrLZGFiiPQDZSYpU-Rc", + "9DIj0WNLrGT8VCHZuRkCz", "SGWWOOHjCF81V4O5tUiJu", "uuDbJDSDQLey7Km1W9hlJ", "Gb6fmS40Q3wvnvD1HMTqR", @@ -866,7 +871,7 @@ "color": "" }, "meta": { - "updateAt": 1750828883842, + "updateAt": 1750900805222, "createAt": 1748485662214 } }, @@ -961,6 +966,7 @@ "name": "codeinfo", "comment": "코드표", "columnIds": [ + "tARrLvK20dCKOxfLKu-T_", "FMB1Pw8d7ED0xlrEAdVok", "G1UKbUmdA5cmhcVHaqrTj", "UIl3k8fn-kPZvaWKIMtKY", @@ -969,6 +975,7 @@ ], "seqColumnIds": [ "WsOgvUtYTLLdAhcZUJZFQ", + "tARrLvK20dCKOxfLKu-T_", "FMB1Pw8d7ED0xlrEAdVok", "G1UKbUmdA5cmhcVHaqrTj", "UIl3k8fn-kPZvaWKIMtKY", @@ -976,17 +983,50 @@ "Zdn5DgG2lzu4VQtI-iaxa" ], "ui": { - "x": 1695.8469, - "y": 1219.7775, + "x": 1700.9101, + "y": 1295.7268, "zIndex": 2508, "widthName": 60, "widthComment": 60, "color": "" }, "meta": { - "updateAt": 1750828939206, + "updateAt": 1750900811726, "createAt": 1749526993705 } + }, + "IsMoJXzvtuoOFFt93qS0w": { + "id": "IsMoJXzvtuoOFFt93qS0w", + "name": "switchinfo", + "comment": "스위치코드표", + "columnIds": [ + "dsz0no4QmTBs-HMbe_HtT", + "sVypeCGZk-JXvsbwc93Rw", + "QEXGVSZ3sjvmtUCdgXl6_", + "4Koam7FHw2_rCXSUBEQJB", + "d7HNONWncNoqDRCl4-Y0N", + "qOLH2re1rmaG-63c08R8x" + ], + "seqColumnIds": [ + "dsz0no4QmTBs-HMbe_HtT", + "sVypeCGZk-JXvsbwc93Rw", + "QEXGVSZ3sjvmtUCdgXl6_", + "4Koam7FHw2_rCXSUBEQJB", + "d7HNONWncNoqDRCl4-Y0N", + "qOLH2re1rmaG-63c08R8x" + ], + "ui": { + "x": 1697.685, + "y": 1073.243, + "zIndex": 2509, + "widthName": 60, + "widthComment": 74, + "color": "" + }, + "meta": { + "updateAt": 1750900814178, + "createAt": 1750898626895 + } } }, "tableColumnEntities": { @@ -6457,7 +6497,7 @@ "comment": "", "dataType": "VARCHAR(20)", "default": "'default'", - "options": 8, + "options": 0, "ui": { "keys": 0, "widthName": 60, @@ -6466,7 +6506,7 @@ "widthDefault": 60 }, "meta": { - "updateAt": 1749527110533, + "updateAt": 1750900710654, "createAt": 1749527110533 } }, @@ -6517,16 +6557,16 @@ "comment": "서버코드", "dataType": "VARCHAR(20)", "default": "", - "options": 14, + "options": 12, "ui": { - "keys": 1, + "keys": 0, "widthName": 60, "widthComment": 60, "widthDataType": 75, "widthDefault": 60 }, "meta": { - "updateAt": 1749527292426, + "updateAt": 1750900705990, "createAt": 1749527129380 } }, @@ -6539,7 +6579,7 @@ "default": "", "options": 8, "ui": { - "keys": 2, + "keys": 0, "widthName": 60, "widthComment": 60, "widthDataType": 75, @@ -7209,6 +7249,206 @@ "updateAt": 1750829284686, "createAt": 1750829265309 } + }, + "sVypeCGZk-JXvsbwc93Rw": { + "id": "sVypeCGZk-JXvsbwc93Rw", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "code", + "comment": "switch코드", + "dataType": "VARCHAR(20)", + "default": "", + "options": 12, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750900683983, + "createAt": 1750898653166 + } + }, + "QEXGVSZ3sjvmtUCdgXl6_": { + "id": "QEXGVSZ3sjvmtUCdgXl6_", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "status", + "comment": "", + "dataType": "VARCHAR(20)", + "default": "'default'", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750898653167, + "createAt": 1750898653167 + } + }, + "4Koam7FHw2_rCXSUBEQJB": { + "id": "4Koam7FHw2_rCXSUBEQJB", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "updated_at", + "comment": "", + "dataType": "TIMESTAMP", + "default": "", + "options": 0, + "ui": { + "keys": 0, + "widthName": 62, + "widthComment": 60, + "widthDataType": 65, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750898653167, + "createAt": 1750898653167 + } + }, + "d7HNONWncNoqDRCl4-Y0N": { + "id": "d7HNONWncNoqDRCl4-Y0N", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "created_at", + "comment": "", + "dataType": "TIMESTAMP", + "default": "CURRENT_TIMESTAMP", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 65, + "widthDefault": 122 + }, + "meta": { + "updateAt": 1750898653167, + "createAt": 1750898653167 + } + }, + "qOLH2re1rmaG-63c08R8x": { + "id": "qOLH2re1rmaG-63c08R8x", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "deleted_at", + "comment": "", + "dataType": "TIMESTAMP", + "default": "", + "options": 0, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 65, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750898653167, + "createAt": 1750898653167 + } + }, + "AU5HgX9gt97EPfq5SoKnd": { + "id": "AU5HgX9gt97EPfq5SoKnd", + "tableId": "B8haiEbPc1lRBWTv1g25G", + "name": "switch", + "comment": "switch코드", + "dataType": "VARCHAR(20)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750898732189, + "createAt": 1750898732189 + } + }, + "dsz0no4QmTBs-HMbe_HtT": { + "id": "dsz0no4QmTBs-HMbe_HtT", + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "name": "uid", + "comment": "", + "dataType": "INT", + "default": "", + "options": 11, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750900686550, + "createAt": 1750900670007 + } + }, + "tARrLvK20dCKOxfLKu-T_": { + "id": "tARrLvK20dCKOxfLKu-T_", + "tableId": "JoMB-mb6p6NoHpiAvjD2y", + "name": "uid", + "comment": "", + "dataType": "INT", + "default": "", + "options": 11, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750900703062, + "createAt": 1750900698112 + } + }, + "PLQrLZGFiiPQDZSYpU-Rc": { + "id": "PLQrLZGFiiPQDZSYpU-Rc", + "tableId": "B8haiEbPc1lRBWTv1g25G", + "name": "switchinfo_uid", + "comment": "switch코드", + "dataType": "INT", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 77, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750900869604, + "createAt": 1750900764368 + } + }, + "9DIj0WNLrGT8VCHZuRkCz": { + "id": "9DIj0WNLrGT8VCHZuRkCz", + "tableId": "B8haiEbPc1lRBWTv1g25G", + "name": "codeinfo_uid", + "comment": "server코드", + "dataType": "INT", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 70, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1750900874920, + "createAt": 1750900801840 + } } }, "relationshipEntities": { @@ -7530,8 +7770,8 @@ "columnIds": [ "FMB1Pw8d7ED0xlrEAdVok" ], - "x": 1695.8469, - "y": 1307.7775, + "x": 1697.1127, + "y": 1340.0307, "direction": 1 }, "end": { @@ -7540,7 +7780,7 @@ "O7aGU_LJxCO1NeNVWbB-J" ], "x": 1457.1138999999998, - "y": 1231.9058, + "y": 1366.5724666666667, "direction": 2 }, "meta": { @@ -7687,6 +7927,90 @@ "updateAt": 1750829265309, "createAt": 1750829265309 } + }, + "FHzw49BTN_7RwEJXeKdhl": { + "id": "FHzw49BTN_7RwEJXeKdhl", + "identification": false, + "relationshipType": 16, + "startRelationshipType": 2, + "start": { + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "columnIds": [ + "sVypeCGZk-JXvsbwc93Rw" + ], + "x": 1696.4192, + "y": 1116.281, + "direction": 1 + }, + "end": { + "tableId": "B8haiEbPc1lRBWTv1g25G", + "columnIds": [ + "AU5HgX9gt97EPfq5SoKnd" + ], + "x": 1457.1138999999998, + "y": 1115.9058, + "direction": 2 + }, + "meta": { + "updateAt": 1750898732189, + "createAt": 1750898732189 + } + }, + "Y-MNlBi4tzmX_zwrY0zTc": { + "id": "Y-MNlBi4tzmX_zwrY0zTc", + "identification": false, + "relationshipType": 8, + "startRelationshipType": 2, + "start": { + "tableId": "IsMoJXzvtuoOFFt93qS0w", + "columnIds": [ + "dsz0no4QmTBs-HMbe_HtT" + ], + "x": 1697.685, + "y": 1173.243, + "direction": 1 + }, + "end": { + "tableId": "B8haiEbPc1lRBWTv1g25G", + "columnIds": [ + "PLQrLZGFiiPQDZSYpU-Rc" + ], + "x": 1457.1138999999998, + "y": 1115.9058, + "direction": 2 + }, + "meta": { + "updateAt": 1750900764369, + "createAt": 1750900764369 + } + }, + "my7misDXaAqlgb4tiABJn": { + "id": "my7misDXaAqlgb4tiABJn", + "identification": false, + "relationshipType": 8, + "startRelationshipType": 2, + "start": { + "tableId": "JoMB-mb6p6NoHpiAvjD2y", + "columnIds": [ + "tARrLvK20dCKOxfLKu-T_" + ], + "x": 1700.9101, + "y": 1395.7268, + "direction": 1 + }, + "end": { + "tableId": "B8haiEbPc1lRBWTv1g25G", + "columnIds": [ + "9DIj0WNLrGT8VCHZuRkCz" + ], + "x": 1457.1138999999998, + "y": 1347.9058, + "direction": 2 + }, + "meta": { + "updateAt": 1750900801840, + "createAt": 1750900801840 + } } }, "indexEntities": {}, diff --git a/app/Entities/Customer/ServiceEntity.php b/app/Entities/Customer/ServiceEntity.php index 7ba975f..d2db41d 100644 --- a/app/Entities/Customer/ServiceEntity.php +++ b/app/Entities/Customer/ServiceEntity.php @@ -17,19 +17,18 @@ class ServiceEntity extends CustomerEntity { return intval($this->attributes['user_uid']); } + public function getSwitchUID(): string + { + return $this->attributes['switchinfo_uid']; + } + public function getCodeUID(): string + { + return $this->attributes['codeinfo_uid']; + } public function getTitle(): string { return "S" . $this->getPK(); } - public function getSwitch(): string - { - return $this->attributes['switch']; - } - //서버코드 - public function getCode(): string - { - return $this->attributes['code']; - } public function getType(): string { return $this->attributes['type']; diff --git a/app/Entities/Equipment/CodeEntity.php b/app/Entities/Equipment/CodeEntity.php index bfe0900..d852c7c 100644 --- a/app/Entities/Equipment/CodeEntity.php +++ b/app/Entities/Equipment/CodeEntity.php @@ -10,4 +10,9 @@ class CodeEntity extends EquipmentEntity const TITLE = CodeModel::TITLE; const STATUS_AVAILABLE = "default"; const STATUS_OCCUPIED = "occupied"; + + public function getCode(): string + { + return $this->attributes['code']; + } } diff --git a/app/Entities/Equipment/DomainEntity.php b/app/Entities/Equipment/Part/DomainEntity.php similarity index 63% rename from app/Entities/Equipment/DomainEntity.php rename to app/Entities/Equipment/Part/DomainEntity.php index ce08ca0..de45045 100644 --- a/app/Entities/Equipment/DomainEntity.php +++ b/app/Entities/Equipment/Part/DomainEntity.php @@ -1,10 +1,10 @@ attributes['code']; + } +} diff --git a/app/Helpers/AuthHelper.php b/app/Helpers/AuthHelper.php index b9faba2..22d7ada 100644 --- a/app/Helpers/AuthHelper.php +++ b/app/Helpers/AuthHelper.php @@ -2,13 +2,11 @@ namespace App\Helpers; -use CodeIgniter\HTTP\IncomingRequest; use App\Models\UserModel; class AuthHelper extends CommonHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(UserModel::TITLE); diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 9e68eb4..b618b61 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -319,7 +319,9 @@ class CommonHelper ); $value = $this->getFieldForm($field, $value, $viewDatas, $extras); } else { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } } break; diff --git a/app/Helpers/Customer/AccountHelper.php b/app/Helpers/Customer/AccountHelper.php index 935f85d..c51fd15 100644 --- a/app/Helpers/Customer/AccountHelper.php +++ b/app/Helpers/Customer/AccountHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\AccountModel; -use CodeIgniter\HTTP\IncomingRequest; class AccountHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(AccountModel::TITLE); @@ -21,7 +19,9 @@ class AccountHelper extends CustomerHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index b97ebff..4f7c6c6 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\ClientModel; -use CodeIgniter\HTTP\IncomingRequest; class ClientHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(ClientModel::TITLE); diff --git a/app/Helpers/Customer/CouponHelper.php b/app/Helpers/Customer/CouponHelper.php index 4fdcf0f..1991b00 100644 --- a/app/Helpers/Customer/CouponHelper.php +++ b/app/Helpers/Customer/CouponHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\CouponModel; -use CodeIgniter\HTTP\IncomingRequest; class CouponHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(CouponModel::TITLE); @@ -21,7 +19,9 @@ class CouponHelper extends CustomerHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/Customer/CustomerHelper.php b/app/Helpers/Customer/CustomerHelper.php index dee7172..33f0380 100644 --- a/app/Helpers/Customer/CustomerHelper.php +++ b/app/Helpers/Customer/CustomerHelper.php @@ -3,11 +3,10 @@ namespace App\Helpers\Customer; use App\Helpers\CommonHelper; -use CodeIgniter\HTTP\IncomingRequest; abstract class CustomerHelper extends CommonHelper { - protected function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); } diff --git a/app/Helpers/Customer/PointHelper.php b/app/Helpers/Customer/PointHelper.php index 2db937b..adbad8e 100644 --- a/app/Helpers/Customer/PointHelper.php +++ b/app/Helpers/Customer/PointHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\PointModel; -use CodeIgniter\HTTP\IncomingRequest; class PointHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: PointModel::TITLE); @@ -22,7 +20,9 @@ class PointHelper extends CustomerHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index dc6b80a..26bd456 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -4,12 +4,10 @@ namespace App\Helpers\Customer; use App\Entities\Equipment\CodeEntity; use App\Models\Customer\ServiceModel; -use CodeIgniter\HTTP\IncomingRequest; class ServiceHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServiceModel::TITLE); diff --git a/app/Helpers/Customer/ServiceHistoryHelper.php b/app/Helpers/Customer/ServiceHistoryHelper.php index 5d3bb20..5ed23de 100644 --- a/app/Helpers/Customer/ServiceHistoryHelper.php +++ b/app/Helpers/Customer/ServiceHistoryHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\ServiceHistoryModel; -use CodeIgniter\HTTP\IncomingRequest; class ServiceHistoryHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServiceHistoryModel::TITLE); diff --git a/app/Helpers/Customer/ServiceItemHelper.php b/app/Helpers/Customer/ServiceItemHelper.php index 1b42a7d..e5105ae 100644 --- a/app/Helpers/Customer/ServiceItemHelper.php +++ b/app/Helpers/Customer/ServiceItemHelper.php @@ -2,15 +2,13 @@ namespace App\Helpers\Customer; -use App\Entities\Equipment\DomainEntity; +use App\Entities\Equipment\Part\DomainEntity; use App\Entities\Equipment\Part\IpEntity; use App\Models\Customer\ServiceItemModel; -use CodeIgniter\HTTP\IncomingRequest; class ServiceItemHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServiceItemModel::TITLE); diff --git a/app/Helpers/Customer/ServicePaymentHelper.php b/app/Helpers/Customer/ServicePaymentHelper.php index 15f0537..5bd724c 100644 --- a/app/Helpers/Customer/ServicePaymentHelper.php +++ b/app/Helpers/Customer/ServicePaymentHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Customer; use App\Models\Customer\ServicePaymentModel; -use CodeIgniter\HTTP\IncomingRequest; class ServicePaymentHelper extends CustomerHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServicePaymentModel::TITLE); @@ -33,7 +31,9 @@ class ServicePaymentHelper extends CustomerHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $value ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : ""; + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/Equipment/CodeHelper.php b/app/Helpers/Equipment/CodeHelper.php index 063d4fb..def9a39 100644 --- a/app/Helpers/Equipment/CodeHelper.php +++ b/app/Helpers/Equipment/CodeHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment; use App\Models\Equipment\CodeModel; -use CodeIgniter\HTTP\IncomingRequest; class CodeHelper extends EquipmentHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: CodeModel::TITLE); diff --git a/app/Helpers/Equipment/DomainHelper.php b/app/Helpers/Equipment/DomainHelper.php deleted file mode 100644 index 04e5196..0000000 --- a/app/Helpers/Equipment/DomainHelper.php +++ /dev/null @@ -1,16 +0,0 @@ -setTitleField(field: DomainModel::TITLE); - } -} diff --git a/app/Helpers/Equipment/EquipmentHelper.php b/app/Helpers/Equipment/EquipmentHelper.php index 72dec4b..fc41676 100644 --- a/app/Helpers/Equipment/EquipmentHelper.php +++ b/app/Helpers/Equipment/EquipmentHelper.php @@ -3,11 +3,10 @@ namespace App\Helpers\Equipment; use App\Helpers\CommonHelper; -use CodeIgniter\HTTP\IncomingRequest; abstract class EquipmentHelper extends CommonHelper { - protected function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); } diff --git a/app/Helpers/Equipment/Part/CpuHelper.php b/app/Helpers/Equipment/Part/CpuHelper.php index fb55e44..7b97006 100644 --- a/app/Helpers/Equipment/Part/CpuHelper.php +++ b/app/Helpers/Equipment/Part/CpuHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\CpuModel; -use CodeIgniter\HTTP\IncomingRequest; class CpuHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: CpuModel::TITLE); diff --git a/app/Helpers/Equipment/Part/DefenceHelper.php b/app/Helpers/Equipment/Part/DefenceHelper.php index fc9331b..e08f979 100644 --- a/app/Helpers/Equipment/Part/DefenceHelper.php +++ b/app/Helpers/Equipment/Part/DefenceHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\DefenceModel; -use CodeIgniter\HTTP\IncomingRequest; class DefenceHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: DefenceModel::TITLE); diff --git a/app/Helpers/Equipment/Part/DomainHelper.php b/app/Helpers/Equipment/Part/DomainHelper.php new file mode 100644 index 0000000..258f658 --- /dev/null +++ b/app/Helpers/Equipment/Part/DomainHelper.php @@ -0,0 +1,14 @@ +setTitleField(field: DomainModel::TITLE); + } +} diff --git a/app/Helpers/Equipment/Part/IpHelper.php b/app/Helpers/Equipment/Part/IpHelper.php index 8031d33..b806f56 100644 --- a/app/Helpers/Equipment/Part/IpHelper.php +++ b/app/Helpers/Equipment/Part/IpHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\IpModel; -use CodeIgniter\HTTP\IncomingRequest; class IpHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: IpModel::TITLE); diff --git a/app/Helpers/Equipment/Part/LineHelper.php b/app/Helpers/Equipment/Part/LineHelper.php index 2bc1299..fe0ffee 100644 --- a/app/Helpers/Equipment/Part/LineHelper.php +++ b/app/Helpers/Equipment/Part/LineHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\LineModel; -use CodeIgniter\HTTP\IncomingRequest; class LineHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: LineModel::TITLE); diff --git a/app/Helpers/Equipment/Part/PartHelper.php b/app/Helpers/Equipment/Part/PartHelper.php index 96fdff6..36d9267 100644 --- a/app/Helpers/Equipment/Part/PartHelper.php +++ b/app/Helpers/Equipment/Part/PartHelper.php @@ -3,11 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Helpers\Equipment\EquipmentHelper; -use CodeIgniter\HTTP\IncomingRequest; abstract class PartHelper extends EquipmentHelper { - protected function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); } diff --git a/app/Helpers/Equipment/Part/RamHelper.php b/app/Helpers/Equipment/Part/RamHelper.php index c65eacf..cb95768 100644 --- a/app/Helpers/Equipment/Part/RamHelper.php +++ b/app/Helpers/Equipment/Part/RamHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\RamModel; -use CodeIgniter\HTTP\IncomingRequest; class RamHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: RamModel::TITLE); diff --git a/app/Helpers/Equipment/Part/SoftwareHelper.php b/app/Helpers/Equipment/Part/SoftwareHelper.php index 442960a..85709dc 100644 --- a/app/Helpers/Equipment/Part/SoftwareHelper.php +++ b/app/Helpers/Equipment/Part/SoftwareHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\SoftwareModel; -use CodeIgniter\HTTP\IncomingRequest; class SoftwareHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: SoftwareModel::TITLE); diff --git a/app/Helpers/Equipment/Part/StorageHelper.php b/app/Helpers/Equipment/Part/StorageHelper.php index cee6d35..64a021a 100644 --- a/app/Helpers/Equipment/Part/StorageHelper.php +++ b/app/Helpers/Equipment/Part/StorageHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment\Part; use App\Models\Equipment\Part\StorageModel; -use CodeIgniter\HTTP\IncomingRequest; class StorageHelper extends PartHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: StorageModel::TITLE); diff --git a/app/Helpers/Equipment/ServerHelper.php b/app/Helpers/Equipment/ServerHelper.php index 002e2f2..c07f5e7 100644 --- a/app/Helpers/Equipment/ServerHelper.php +++ b/app/Helpers/Equipment/ServerHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers\Equipment; use App\Models\Equipment\ServerModel; -use CodeIgniter\HTTP\IncomingRequest; class ServerHelper extends EquipmentHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServerModel::TITLE); diff --git a/app/Helpers/Equipment/SwitchHelper.php b/app/Helpers/Equipment/SwitchHelper.php new file mode 100644 index 0000000..16f1fae --- /dev/null +++ b/app/Helpers/Equipment/SwitchHelper.php @@ -0,0 +1,14 @@ +setTitleField(field: SwitchModel::TITLE); + } +} diff --git a/app/Helpers/HomeHelper.php b/app/Helpers/HomeHelper.php index d8b8192..3936096 100644 --- a/app/Helpers/HomeHelper.php +++ b/app/Helpers/HomeHelper.php @@ -3,12 +3,10 @@ namespace App\Helpers; use App\Models\Customer\ServicePaymentModel; -use CodeIgniter\HTTP\IncomingRequest; class HomeHelper extends CommonHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(field: ServicePaymentModel::TITLE); @@ -51,7 +49,9 @@ class HomeHelper extends CommonHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/MyLogHelper.php b/app/Helpers/MyLogHelper.php index 08c2597..551513d 100644 --- a/app/Helpers/MyLogHelper.php +++ b/app/Helpers/MyLogHelper.php @@ -2,13 +2,11 @@ namespace App\Helpers; -use CodeIgniter\HTTP\IncomingRequest; use App\Models\MyLogModel; class MyLogHelper extends CommonHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(MyLogModel::TITLE); @@ -21,7 +19,9 @@ class MyLogHelper extends CommonHelper break; default: if (in_array($field, $viewDatas['control']['filter_fields'])) { - $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) { + $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle(); + } } break; } diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php index 356e28f..0f28f11 100644 --- a/app/Helpers/UserHelper.php +++ b/app/Helpers/UserHelper.php @@ -2,13 +2,11 @@ namespace App\Helpers; -use CodeIgniter\HTTP\IncomingRequest; use App\Models\UserModel; class UserHelper extends CommonHelper { - protected ?IncomingRequest $request = null; - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->setTitleField(UserModel::TITLE); diff --git a/app/Language/en/Customer/Service.php b/app/Language/en/Customer/Service.php index eb38b02..75085b0 100644 --- a/app/Language/en/Customer/Service.php +++ b/app/Language/en/Customer/Service.php @@ -8,8 +8,8 @@ return [ 'title' => "서비스명", 'type' => "서비스형식", 'location' => "위치", - 'switch' => "스위치코드", - 'code' => "서버코드", + 'switchinfo_uid' => "스위치코드", + 'codeinfo_uid' => "서버코드", 'raid' => "RAID", 'billing_at' => "결제일", 'start_at' => "개통일", @@ -33,10 +33,6 @@ return [ 'type' => "default", 'status' => 'default' ], - "SWITCH" => [ - "R35P10" => "R35P10", - "R45P20" => "R45P20", - ], "LOCATION" => [ "default" => "치바", "tokyo" => "도쿄", diff --git a/app/Language/en/Equipment/Switch.php b/app/Language/en/Equipment/Switch.php new file mode 100644 index 0000000..703ce6b --- /dev/null +++ b/app/Language/en/Equipment/Switch.php @@ -0,0 +1,18 @@ + "Switch정보", + 'label' => [ + 'code' => "코드", + 'status' => "사용여부", + 'updated_at' => "수정일", + 'created_at' => "작성일", + 'deleted_at' => "삭제일", + ], + 'DEFAULTS' => [ + 'status' => 'default', + ], + "STATUS" => [ + 'default' => "사용가능", + 'occupied' => "서비스중", + ], +]; diff --git a/app/Models/Customer/ServiceModel.php b/app/Models/Customer/ServiceModel.php index 0f4bb2e..a6fa5b3 100644 --- a/app/Models/Customer/ServiceModel.php +++ b/app/Models/Customer/ServiceModel.php @@ -18,8 +18,8 @@ class ServiceModel extends CustomerModel "user_uid", "type", "location", - "switch", - "code", + "switchinfo_uid", + "codeinfo_uid", "raid", "billing_at", "start_at", @@ -39,12 +39,12 @@ class ServiceModel extends CustomerModel case "clientinfo_uid": case "ownerinfo_uid": case "user_uid": + case "switchinfo_uid": + case "codeinfo_uid": $rule = "required|numeric"; break; case "type": case "location": - case "switch": - case "code": case "status": $rule = "required|trim|string"; break; diff --git a/app/Models/Equipment/CodeModel.php b/app/Models/Equipment/CodeModel.php index bcd0b8d..b3ca413 100644 --- a/app/Models/Equipment/CodeModel.php +++ b/app/Models/Equipment/CodeModel.php @@ -7,11 +7,10 @@ use App\Entities\Equipment\CodeEntity; class CodeModel extends EquipmentModel { const TABLE = "codeinfo"; - const PK = "code"; + const PK = "uid"; const TITLE = "code"; protected $table = self::TABLE; protected $primaryKey = self::PK; - protected $useAutoIncrement = false; protected $returnType = CodeEntity::class; protected $allowedFields = [ "code", @@ -28,14 +27,9 @@ class CodeModel extends EquipmentModel throw new \Exception(__FUNCTION__ . "=> field가 array 입니다.\n" . var_export($field, true)); } switch ($field) { - case $this->getPKField(): - // 수동입력인 경우 - if (!$this->useAutoIncrement) { - $rule = "required|regex_match[/^[0-9a-zA-Z]/]"; - $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; - } else { - $rule = "required|numeric"; - } + case "code": + $rule = "required|trim|min_length[4]|max_length[20]"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "status": $rule = "required|trim|string"; @@ -46,16 +40,4 @@ class CodeModel extends EquipmentModel } return $rule; } - protected function convertEntityData(string $action, string $field, array $formDatas, mixed $entity): mixed - { - switch ($field) { - case $this->getPKField(): - $entity->$field = $formDatas[$field]; - break; - default: - $entity = parent::convertEntityData($action, $field, $formDatas, $entity); - break; - } - return $entity; - } } diff --git a/app/Models/Equipment/Part/CpuModel.php b/app/Models/Equipment/Part/CpuModel.php index 9fe9db9..59f4cde 100644 --- a/app/Models/Equipment/Part/CpuModel.php +++ b/app/Models/Equipment/Part/CpuModel.php @@ -29,6 +29,7 @@ class CpuModel extends PartModel switch ($field) { case "model": $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "price": $rule = "required|numeric"; diff --git a/app/Models/Equipment/Part/DefenceModel.php b/app/Models/Equipment/Part/DefenceModel.php index 3c1a582..bd561f2 100644 --- a/app/Models/Equipment/Part/DefenceModel.php +++ b/app/Models/Equipment/Part/DefenceModel.php @@ -32,11 +32,15 @@ class DefenceModel extends PartModel } switch ($field) { case "model": + $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; + break; case "type": $rule = "required|trim|string"; break; case "ip": $rule = "required|trim|valid_ip[both]"; //ipv4 , ipv6 , both(ipv4,ipv6) + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "price": $rule = "required|numeric"; diff --git a/app/Models/Equipment/DomainModel.php b/app/Models/Equipment/Part/DomainModel.php similarity index 83% rename from app/Models/Equipment/DomainModel.php rename to app/Models/Equipment/Part/DomainModel.php index 07f4ae1..4aefb0d 100644 --- a/app/Models/Equipment/DomainModel.php +++ b/app/Models/Equipment/Part/DomainModel.php @@ -1,10 +1,10 @@ table}.{$field}]" : ""; + break; + case "price": + $rule = "required|numeric"; break; default: $rule = parent::getFormFieldRule($action, $field); diff --git a/app/Models/Equipment/Part/IpModel.php b/app/Models/Equipment/Part/IpModel.php index 6f329d4..2088b5d 100644 --- a/app/Models/Equipment/Part/IpModel.php +++ b/app/Models/Equipment/Part/IpModel.php @@ -31,11 +31,12 @@ class IpModel extends PartModel case "lineinfo_uid": $rule = "required|numeric"; break; - case "price": - $rule = "if_exist|numeric"; - break; case "ip": $rule = "required|trim|valid_ip[both]"; //ipv4 , ipv6 , both(ipv4,ipv6) + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; + break; + case "price": + $rule = "if_exist|numeric"; break; default: $rule = parent::getFormFieldRule($action, $field); diff --git a/app/Models/Equipment/Part/LineModel.php b/app/Models/Equipment/Part/LineModel.php index 18be5d2..575fadf 100644 --- a/app/Models/Equipment/Part/LineModel.php +++ b/app/Models/Equipment/Part/LineModel.php @@ -38,6 +38,9 @@ class LineModel extends PartModel $rule = "required|numeric"; break; case "title": + $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; + break; case "bandwith": case "type": $rule = "required|trim|string"; diff --git a/app/Models/Equipment/Part/RamModel.php b/app/Models/Equipment/Part/RamModel.php index 99071a7..5e0a085 100644 --- a/app/Models/Equipment/Part/RamModel.php +++ b/app/Models/Equipment/Part/RamModel.php @@ -30,6 +30,7 @@ class RamModel extends PartModel switch ($field) { case "model": $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "price": $rule = "required|numeric"; diff --git a/app/Models/Equipment/Part/SoftwareModel.php b/app/Models/Equipment/Part/SoftwareModel.php index c61118f..f473147 100644 --- a/app/Models/Equipment/Part/SoftwareModel.php +++ b/app/Models/Equipment/Part/SoftwareModel.php @@ -30,6 +30,9 @@ class SoftwareModel extends PartModel } switch ($field) { case "model": + $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; + break; case "type": $rule = "required|trim|string"; break; diff --git a/app/Models/Equipment/Part/StorageModel.php b/app/Models/Equipment/Part/StorageModel.php index 1266344..8b09787 100644 --- a/app/Models/Equipment/Part/StorageModel.php +++ b/app/Models/Equipment/Part/StorageModel.php @@ -29,6 +29,7 @@ class StorageModel extends PartModel switch ($field) { case "model": $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "price": $rule = "required|numeric"; diff --git a/app/Models/Equipment/ServerModel.php b/app/Models/Equipment/ServerModel.php index 6edf5d5..6962fc1 100644 --- a/app/Models/Equipment/ServerModel.php +++ b/app/Models/Equipment/ServerModel.php @@ -30,6 +30,7 @@ class ServerModel extends EquipmentModel switch ($field) { case "model": $rule = "required|trim|string"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; break; case "price": $rule = "required|numeric"; diff --git a/app/Models/Equipment/SwitchModel.php b/app/Models/Equipment/SwitchModel.php new file mode 100644 index 0000000..ebf8099 --- /dev/null +++ b/app/Models/Equipment/SwitchModel.php @@ -0,0 +1,44 @@ + field가 array 입니다.\n" . var_export($field, true)); + } + switch ($field) { + case $this->getPKField(): + case "code": + $rule = "required|trim|min_length[4]|max_length[20]"; + $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[{$this->table}.{$field}]" : ""; + break; + case "status": + $rule = "required|trim|string"; + break; + default: + $rule = parent::getFormFieldRule($action, $field); + break; + } + return $rule; + } +} diff --git a/app/Services/Auth/AuthService.php b/app/Services/Auth/AuthService.php index 08ef267..422215b 100644 --- a/app/Services/Auth/AuthService.php +++ b/app/Services/Auth/AuthService.php @@ -4,7 +4,6 @@ namespace App\Services\Auth; use App\Entities\UserEntity; use App\Services\CommonService; -use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\Session\Session; // 참고:https://github.com/SyntaxPhoenix/iloclient @@ -12,7 +11,7 @@ abstract class AuthService extends CommonService { private ?Session $_session = null; private $url_stack_name = "url_stack"; - protected function __construct(?IncomingRequest $request = null) + protected function __construct() { parent::__construct(); $this->addClassName('Auth'); diff --git a/app/Services/Auth/GoogleService.php b/app/Services/Auth/GoogleService.php index 17d72ff..41937c3 100644 --- a/app/Services/Auth/GoogleService.php +++ b/app/Services/Auth/GoogleService.php @@ -6,12 +6,11 @@ use App\Entities\UserEntity; use App\Models\UserModel; use App\Libraries\MySocket\GoogleSocket\CURL; use CodeIgniter\Exceptions\PageNotFoundException; -use CodeIgniter\HTTP\IncomingRequest; class GoogleService extends AuthService { private $_mySocket = null; - public function __construct(mixed $mySocket, ?IncomingRequest $request = null) + public function __construct(mixed $mySocket) { $this->_mySocket = $mySocket; parent::__construct(); diff --git a/app/Services/Auth/LocalService.php b/app/Services/Auth/LocalService.php index 4b649df..184b8f6 100644 --- a/app/Services/Auth/LocalService.php +++ b/app/Services/Auth/LocalService.php @@ -4,11 +4,10 @@ namespace App\Services\Auth; use App\Entities\UserEntity; use App\Models\UserModel; -use CodeIgniter\HTTP\IncomingRequest; class LocalService extends AuthService { - public function __construct(?IncomingRequest $request = null) + public function __construct() { parent::__construct(); $this->addClassName('Local'); diff --git a/app/Services/Customer/CustomerService.php b/app/Services/Customer/CustomerService.php index 569cb1f..103447f 100644 --- a/app/Services/Customer/CustomerService.php +++ b/app/Services/Customer/CustomerService.php @@ -6,8 +6,8 @@ use App\Entities\Customer\ClientEntity; use App\Services\CommonService; use App\Services\Customer\ClientService; -use App\Services\Equipment\DomainService; use App\Services\Equipment\ServerService; +use App\Services\Equipment\Part\DomainService; use App\Services\Equipment\Part\IpService; use App\Services\Equipment\Part\CpuService; use App\Services\Equipment\Part\DefenceService; diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index d2ce8d6..4560528 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -4,17 +4,19 @@ namespace App\Services\Customer; use App\Entities\Customer\ServiceEntity; use App\Entities\Equipment\CodeEntity; -use App\Entities\Equipment\Part\IpEntity; +use App\Entities\Equipment\SwitchEntity; use App\Models\Customer\ServiceModel; use App\Services\Customer\ServiceItemService; use App\Services\Equipment\CodeService; +use App\Services\Equipment\SwitchService; use App\Services\UserService; class ServiceService extends CustomerService { private ?UserService $_userService = null; private ?CodeService $_codeService = null; + private ?SwitchService $_switchService = null; private ?ServiceItemService $_serviceItemService = null; private ?ServicePaymentService $_servicePaymentService = null; private ?string $_searchIP = null; @@ -38,8 +40,8 @@ class ServiceService extends CustomerService "ownerinfo_uid", "type", "location", - "switch", - "code", + "switchinfo_uid", + "codeinfo_uid", "raid", "billing_at", "start_at", @@ -48,7 +50,7 @@ class ServiceService extends CustomerService } public function getFilterFields(): array { - return ["clientinfo_uid", 'ownerinfo_uid', 'user_uid', 'type', 'location', 'switch', 'code', 'raid', 'status']; + return ["clientinfo_uid", 'ownerinfo_uid', 'user_uid', 'type', 'location', 'switchinfo_uid', 'codeinfo_uid', 'raid', 'status']; } public function getBatchJobFields(): array { @@ -56,7 +58,7 @@ class ServiceService extends CustomerService } public function getIndexFields(): array { - return ['clientinfo_uid', 'ownerinfo_uid', 'type', 'location', 'switch', 'code', 'raid', 'billing_at', 'start_at', 'updated_at', 'status', 'user_uid']; + return ['clientinfo_uid', 'ownerinfo_uid', 'type', 'location', 'switchinfo_uid', 'codeinfo_uid', 'raid', 'billing_at', 'start_at', 'updated_at', 'status', 'user_uid']; } public function getUSerService(): UserService { @@ -72,6 +74,13 @@ class ServiceService extends CustomerService } return $this->_codeService; } + public function getSwitchService(): SwitchService + { + if (!$this->_switchService) { + $this->_switchService = new SwitchService(); + } + return $this->_switchService; + } public function getServiceItemService(): ServiceItemService { if (!$this->_serviceItemService) { @@ -118,9 +127,12 @@ class ServiceService extends CustomerService case 'user_uid': $options = $this->getUserService()->getEntities(); break; - case 'code': + case 'codeinfo_uid': $options = $this->getCodeService()->getEntities(); break; + case 'switchinfo_uid': + $options = $this->getSwitchService()->getEntities(); + break; default: $options = parent::getFormFieldOption($field, $options); break; @@ -193,6 +205,8 @@ class ServiceService extends CustomerService { //code의 경우 서비스중으로 설정작업 $this->getCodeService()->setStatus($formDatas['code'], CodeEntity::STATUS_OCCUPIED); + //switch의 경우 서비스중으로 설정작업 + $this->getCodeService()->setStatus($formDatas['switch'], SwitchEntity::STATUS_OCCUPIED); return parent::create($formDatas, $entity); } public function modify(mixed $entity, array $formDatas): ServiceEntity @@ -201,9 +215,16 @@ class ServiceService extends CustomerService if (array_key_exists('code', $formDatas) && $formDatas['code'] !== $entity->getCode()) { //기존 code의 경우 반환처리 $this->getCodeService()->setStatus($entity->getCode(), CodeEntity::STATUS_AVAILABLE); - //신규 설정된 coded의 경우 서비스중 변경처리 + //신규 설정된 code의 경우 서비스중 변경처리 $this->getCodeService()->setStatus($formDatas['code'], CodeEntity::STATUS_OCCUPIED); } + //switch가 기존과 다를경우 //toggle,batchjob의 경우 $formDatas에 switch가 없을수도 있음 + if (array_key_exists('switch', $formDatas) && $formDatas['switch'] !== $entity->getCode()) { + //기존 switch의 경우 반환처리 + $this->getSwitchService()->setStatus($entity->getCode(), SwitchEntity::STATUS_AVAILABLE); + //신규 설정된 switch의 경우 서비스중 변경처리 + $this->getSwitchService()->setStatus($formDatas['switch'], SwitchEntity::STATUS_OCCUPIED); + } //관리자가 바뀐경우 결제쪽에도 결제가 완료되지않은 것은 관리자를 변경해줘야함 if (array_key_exists('ownerinfo_uid', $formDatas) && $entity->getOwnerUID() !== intval($formDatas['ownerinfo_uid'])) { $this->getServicePaymentService()->modifyOwnerByService($entity, $formDatas['ownerinfo_uid']); @@ -214,6 +235,8 @@ class ServiceService extends CustomerService { //기존 code의 경우 반환처리 $this->getCodeService()->setStatus($entity->getCode(), CodeEntity::STATUS_AVAILABLE); + //기존 switch의 경우 반환처리 + $this->getSwitchService()->setStatus($entity->getCode(), SwitchEntity::STATUS_AVAILABLE); //Item들 삭제 foreach (SERVICE_ITEM_TYPES as $item_type => $label) { foreach ($entity->getItemEntities($item_type) as $itemEntity) { diff --git a/app/Services/Equipment/DomainService.php b/app/Services/Equipment/Part/DomainService.php similarity index 82% rename from app/Services/Equipment/DomainService.php rename to app/Services/Equipment/Part/DomainService.php index f1aa601..4ffbda8 100644 --- a/app/Services/Equipment/DomainService.php +++ b/app/Services/Equipment/Part/DomainService.php @@ -1,11 +1,11 @@ addClassName('Switch'); + } + public function getModelClass(): SwitchModel + { + return new SwitchModel(); + } + public function getEntityClass(): SwitchEntity + { + return new SwitchEntity(); + } + public function getFormFields(): array + { + return [ + "code", + "status", + ]; + } + public function getFilterFields(): array + { + return ['status']; + } + public function getBatchJobFields(): array + { + return ['status']; + } + public function getIndexFields(): array + { + return ['code', 'status']; + } + //상태변경 + public function setStatus(string $code, string $status): SwitchEntity + { + //code의 경우 사용가능/사용중으로 설정작업 + $entity = $this->getEntity($code); + if (!$entity) { + throw new \Exception("{$code}에 대한 Switch Port정보를 찾을수 없습니다."); + } + return $this->getModel()->modify($code, ['status' => $status]); + } +} diff --git a/app/Services/MyLogService.php b/app/Services/MyLogService.php index f51f12b..f66b3b3 100644 --- a/app/Services/MyLogService.php +++ b/app/Services/MyLogService.php @@ -69,11 +69,11 @@ class MyLogService extends CommonService } return $options; } - public function save($service, string $method, AuthService $myauth, string $title): MyLogEntity + public function save(string $class, string $method, string $title): MyLogEntity { $formDatas = [ - 'user_uid' => $myauth->getUIDByAuthInfo(), - 'class_name' => $service->getClassName(), + 'user_uid' => $this->getMyAuth()->getUIDByAuthInfo(), + 'class_name' => $class, 'method_name' => $method, 'title' => $title, 'content' => LogCollector::dump(), diff --git a/app/Views/layouts/admin/left_menu/equipment.php b/app/Views/layouts/admin/left_menu/equipment.php index 6f84ab8..4822cf3 100644 --- a/app/Views/layouts/admin/left_menu/equipment.php +++ b/app/Views/layouts/admin/left_menu/equipment.php @@ -5,6 +5,9 @@
+
+ Switch정보 +
Code정보
@@ -21,7 +24,7 @@ Software정보
- 도메인정보 + 도메인정보
CPU정보 diff --git a/app/Views/templates/admin/welcome_new.php b/app/Views/templates/admin/welcome_new.php index aa9ee8d..c5bc7aa 100644 --- a/app/Views/templates/admin/welcome_new.php +++ b/app/Views/templates/admin/welcome_new.php @@ -28,8 +28,8 @@ getListButton('new_service_view', $viewDatas, ['label' => $entity->getTitle()]) ?> getFieldView('ownerinfo_uid', $entity->getOwnerUID(), $viewDatas) ?> getFieldView('type', $entity->getType(), $viewDatas) ?> - getFieldView('code', $entity->getCode(), $viewDatas) ?> - getFieldView('switch', $entity->getSwitch(), $viewDatas) ?> + getFieldView('switchinfo_uid', $entity->getSwitchUID(), $viewDatas) ?> + getFieldView('codeinfo_uid', $entity->getCodeUID(), $viewDatas) ?> getFieldView('IP', null, $viewDatas) ?> getFieldView('DEFENCE', null, $viewDatas) ?> getFieldView('user_uid', $entity->getUserUID(), $viewDatas) ?>