From ab87b463817227e213535d26556ee8a617d647ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Fri, 23 May 2025 18:57:08 +0900
Subject: [PATCH] dbms_init...1

---
 app/Controllers/Admin/Equipment/ServerController.php |  2 +-
 app/Database/erp2.vuerd.json                         | 12 ++++++------
 app/Language/en/Equipment/Server.php                 |  8 ++++++++
 app/Models/Equipment/ServerModel.php                 |  2 ++
 app/Services/Equipment/ServerService.php             |  5 +++--
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php
index 4562f09..a070989 100644
--- a/app/Controllers/Admin/Equipment/ServerController.php
+++ b/app/Controllers/Admin/Equipment/ServerController.php
@@ -65,7 +65,7 @@ class ServerController extends EquipmentController
     protected function index_process(): array
     {
         $fields = [
-            'fields' => ['code', 'type', 'model', 'CPU', 'RAM',  'DISK', 'status'],
+            'fields' => ['code', 'type', 'model', 'CPU', 'RAM',  'DISK', "raid", 'status'],
         ];
         $this->init('index',  $fields);
         // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임
diff --git a/app/Database/erp2.vuerd.json b/app/Database/erp2.vuerd.json
index 1f6cfa0..8071809 100644
--- a/app/Database/erp2.vuerd.json
+++ b/app/Database/erp2.vuerd.json
@@ -4,9 +4,9 @@
   "settings": {
     "width": 4000,
     "height": 4000,
-    "scrollTop": -1560.1004,
-    "scrollLeft": -1690.2815,
-    "zoomLevel": 1,
+    "scrollTop": -1710.2928,
+    "scrollLeft": -1510.0458,
+    "zoomLevel": 0.31,
     "show": 511,
     "database": 4,
     "databaseName": "",
@@ -7462,8 +7462,8 @@
         "name": "raid",
         "comment": "",
         "dataType": "VARCHAR(10)",
-        "default": "",
-        "options": 0,
+        "default": "'default'",
+        "options": 8,
         "ui": {
           "keys": 0,
           "widthName": 60,
@@ -7472,7 +7472,7 @@
           "widthDefault": 60
         },
         "meta": {
-          "updateAt": 1747993559888,
+          "updateAt": 1747993949848,
           "createAt": 1747993531109
         }
       }
diff --git a/app/Language/en/Equipment/Server.php b/app/Language/en/Equipment/Server.php
index 2facb01..07fff54 100644
--- a/app/Language/en/Equipment/Server.php
+++ b/app/Language/en/Equipment/Server.php
@@ -6,6 +6,7 @@ return [
     'type'          => "종류",
     'model'         => "모델",
     'price'         => "금액",
+    'raid'          => "RAID",
     'description'   => "설명",
     'status'        => "상태",
     'updated_at'    => "수정일",
@@ -35,6 +36,13 @@ return [
     "12,13,14세대 PC"      => "12,13,14세대 PC",
     "12,13,14세대 MiniPC"  => "12,13,14세대 MiniPC",
   ],
+  "RAID"        => [
+    'default'      => "없음",
+    "RAID0"    => "RAID0",
+    "RAID1"    => "RAID1",
+    "RAID5"    => "RAID5",
+    "RAID6"    => "RAID6",
+  ],
   "STATUS"        => [
     'default'      => "사용가능",
     "pause"    => "일시정지",
diff --git a/app/Models/Equipment/ServerModel.php b/app/Models/Equipment/ServerModel.php
index fca9a2e..3e7e27c 100644
--- a/app/Models/Equipment/ServerModel.php
+++ b/app/Models/Equipment/ServerModel.php
@@ -16,6 +16,7 @@ class ServerModel extends EquipmentModel
         "code",
         "type",
         "model",
+        "raid",
         "description",
         "status",
         "updated_at"
@@ -33,6 +34,7 @@ class ServerModel extends EquipmentModel
             case "code":
             case "model":
             case "type":
+            case "raid":
                 $rule = "required|trim|string";
                 break;
             default:
diff --git a/app/Services/Equipment/ServerService.php b/app/Services/Equipment/ServerService.php
index 892dc07..12e6e81 100644
--- a/app/Services/Equipment/ServerService.php
+++ b/app/Services/Equipment/ServerService.php
@@ -29,17 +29,18 @@ class ServerService extends EquipmentService
             "code",
             "type",
             "model",
+            "raid",
             "status",
             "description",
         ];
     }
     public function getFilterFields(): array
     {
-        return ["type", 'model', 'status'];
+        return ["type", 'model',  "raid", 'status'];
     }
     public function getBatchJobFields(): array
     {
-        return ["type", 'model', 'status'];
+        return ["type", 'model',  "raid", 'status'];
     }
     //서비스에서 사용중인 서버를 occupied로 변경
     public function setOccupied(ServerEntity $entity): ServerEntity