dbmsv3 init...1

2025-10-29 10:21:45 +09:00 · 2025-10-29 10:21:45 +09:00 · 7483a019b1
commit 7483a019b1
parent 475dcb0236
14 changed files with 88 additions and 36 deletions
--- a/app/Cells/MylogCell.php
+++ b/app/Cells/MylogCell.php
@ -0,0 +1,33 @@
+<?php
+
+namespace App\Cells;
+
+use App\Cells\CommonCell;
+use App\Services\MyLogService;
+
+class MylogCell extends CommonCell
+{
+
+  public function __construct()
+  {
+    parent::__construct(new MyLogService());
+  }
+
+  public function dashboard(array $params): string
+  {
+    $this->getService()->setAction(__FUNCTION__);
+    $this->getService()->setFormFields();
+    $this->getService()->setFormFilters();
+    $this->getService()->setFormRules();
+    $this->getService()->setFormOptions();
+    $this->getService()->setLimit(20);
+    $template = array_key_exists('template', $params) ? $params['template'] : __FUNCTION__;
+    return view('cells/mylog/' . $template, [
+      'myLogCellDatas' => [
+        'service' => $this->getService(),
+        'control' => $this->getService()->getControlDatas(),
+        'entities' => $this->getService()->getEntities(),
+      ]
+    ]);
+  }
+}
--- a/app/Controllers/Admin/Customer/ClientController.php
+++ b/app/Controllers/Admin/Customer/ClientController.php
@ -82,6 +82,8 @@ class ClientController extends CustomerController
            //기본값정의
            $this->getService()->setFormDatas($this->request->getGet());
            $this->getService()->setFormOptions();
+            //Return Url정의
+            $this->getMyAuth()->pushCurrentUrl($this->request->getUri()->getPath() . ($this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""));
            //일괄작업용 Fields정의
            $entity = $this->getService()->getEntity($uid);
            if (!$entity instanceof ClientEntity) {
--- a/app/Controllers/Admin/Customer/ServiceController.php
+++ b/app/Controllers/Admin/Customer/ServiceController.php
@ -150,7 +150,7 @@ class ServiceController extends CustomerController
            }
            $this->entity = $this->getService()->addeAlternativeServer($entity, $this->getService()->getFormDatas());
            $db->transCommit();
-            return "<script>alert('대체서버추가가 완료되었습니다.'); history.back();</script>";
+            return $this->getResultSuccess('대체서버 추가가 완료되었습니다.');
        } catch (\Exception $e) {
            $db->transRollback();
            return $this->getResultFail($e->getMessage());
--- a/app/Database/dbmsv3_test1.sql
+++ b/app/Database/dbmsv3_test1.sql
--- a/app/Processors/CommonProcessor.php
+++ b/app/Processors/CommonProcessor.php
@ -17,7 +17,7 @@ abstract class CommonProcessor

  final protected function setLog(string $title, string $status, ?string $context = null): void
  {
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title'  => $title,
      'status' => $status,
      'context' => $context
--- a/app/Processors/Customer/ServiceV1Processor.php
+++ b/app/Processors/Customer/ServiceV1Processor.php
@ -42,7 +42,7 @@ class ServiceV1Processor
      'payment_uid'   => $paymentEntity->getPK(),
    ]);
    // 6) 로그
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title'  => "{$entity->getTitle()} 서비스 추가",
      'status' => $entity->getStatus(),
    ]);
@ -75,7 +75,7 @@ class ServiceV1Processor
      'serverinfo_id' => $serverEntity->getPK()
    ]);
    // 6) 로그
-    $this->logService->getModel()->create(formDatas: [
+    $this->logService->create(formDatas: [
      'title'  => "{$entity->getTitle()} 서비스 수정",
      'status' => $entity->getStatus(),
    ]);
@ -100,7 +100,7 @@ class ServiceV1Processor
    // 3) 서비스 삭제
    $this->service->getModel()->delete($entity);
    // 4) 로그
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title'  => "[{$entity->getTitle()}] 서비스 해지",
      'status' => $entity->getStatus(),
    ]);
@ -127,7 +127,7 @@ class ServiceV1Processor
      ]
    );
    // 2) 로그
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title'  => "[{$entity->getTitle()}] 대체서버 추가",
      'status' => $entity->getStatus(),
    ]);
@ -141,26 +141,26 @@ class ServiceV1Processor
  {
    $this->db->transStart();
    // 1) 기존 메인서버정보 가져오기
-    $serverEntity = $this->serverService->getEntity($entity->getServerInfoUID());
-    if (!$serverEntity instanceof ServerEntity) {
+    $oldServerEntity = $this->serverService->getEntity($entity->getServerInfoUID());
+    if (!$oldServerEntity instanceof ServerEntity) {
      throw new \Exception(__METHOD__ . "에서 오류발생: {$entity->getServerInfoUID()}에 대한 서버정보를 찾을수 없습니다.");
    }
-    // 2) 메인서버 변경
-    $this->serverService->attachToService(
+    // 2) 대체서버 형식 변경
+    $serverEntity = $this->serverService->attachToService(
      $entity,
      $serverinfo_uid,
-      ['type' => $serverEntity->getType()]
+      ['type' => $oldServerEntity->getType()]
    );
+    // 3) 서비스 메인서버 변경
+    $entity = $this->service->getModel()->modify($entity, [
+      'title'         => $serverEntity->getCustomTitle(),
+      'serverinfo_uid' => $serverEntity->getPK()
+    ]);
    // 3) 금액 재계산 + 결제정보반영
    $entity = $this->service->setAmount($entity->getPK());
-    // 4) 서비스 FK 동기화
-    $entity = $this->service->getModel()->modify($entity, [
-      'title'         => $entity->getTitle(),
-      'serverinfo_id' => $serverEntity->getPK()
-    ]);
    // 5) 로그
-    $this->logService->getModel()->create([
-      'title'  => "[{$entity->getTitle()}] 메인서버변경",
+    $this->logService->create([
+      'title'  => "{$oldServerEntity->getCustomTitle()}=>{$serverEntity->getCustomTitle()} 메인서버변경",
      'status' => $entity->getStatus(),
    ]);
    $this->db->transComplete();
@ -178,7 +178,7 @@ class ServiceV1Processor
    $this->db->transStart();
    $this->serverService->detachFromService($serverinfo_uid);
    // 4) 로그
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title'  => "[{$entity->getTitle()}] 대체서버 해지",
      'status' => $entity->getStatus(),
    ]);
--- a/app/Processors/Equipment/ServerPartV1Processor.php
+++ b/app/Processors/Equipment/ServerPartV1Processor.php
@ -71,7 +71,7 @@ class ServerPartV1Processor
        // break;
    }
    // 4) 로그
-    $this->logService->getModel()->create(formDatas: [
+    $this->logService->create(formDatas: [
      'title'  => "{$entity->getTitle()} 서버파트 추가",
      'status' => $entity->getStatus(),
    ]);
@ -132,7 +132,7 @@ class ServerPartV1Processor
        // break;
    }
    // 4) 로그
-    $this->logService->getModel()->create(formDatas: [
+    $this->logService->create(formDatas: [
      'title'  => "{$entity->getTitle()} 서버파트 수정",
      'status' => $entity->getStatus(),
    ]);
@ -173,7 +173,7 @@ class ServerPartV1Processor
        // break;
    }
    // 4) 로그
-    $this->logService->getModel()->create(formDatas: [
+    $this->logService->create(formDatas: [
      'title'  => "{$entity->getTitle()} 서버파트 삭제",
      'status' => $entity->getStatus(),
    ]);
--- a/app/Processors/Equipment/ServerV1Processor.php
+++ b/app/Processors/Equipment/ServerV1Processor.php
@ -48,7 +48,7 @@ class ServerV1Processor
      $this->ipService->attachToServer($entity);
    }
    //5) Log처리
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title' => "[{$entity->getTitle()}] 서버 추가",
      'status' => $entity->getStatus()
    ]);
@ -96,7 +96,7 @@ class ServerV1Processor
      $this->serviceService->setAmount($entity->getServiceInfoUID());
    }
    //5) Log처리
-    $this->logService->getModel()->create([
+    $this->logService->create([
      'title' => "[{$entity->getTitle()}] 서버 정보변경",
      'status' => $entity->getStatus()
    ]);
@ -125,7 +125,7 @@ class ServerV1Processor
    // 3) 서버정보 삭제
    $this->service->getModel()->delete($entity->getPK());
    // 4) 로그
-    $this->logService->getModel()->create(formDatas: [
+    $this->logService->create(formDatas: [
      'title'  => "{$entity->getTitle()} 서버 삭제",
      'status' => $entity->getStatus(),
    ]);
--- a/app/Services/CommonService.php
+++ b/app/Services/CommonService.php
@ -140,7 +140,7 @@ abstract class CommonService
    {
        return $this->getModel()->getLastQuery();
    }
-    final protected function getEntity_process(mixed $entity): mixed
+    protected function getEntity_process(mixed $entity): mixed
    {
        return $entity;
    }
--- a/app/Views/admin/welcome/index.php
+++ b/app/Views/admin/welcome/index.php
@ -19,7 +19,7 @@
                    <?= $this->include("{$viewDatas['layout']}/welcome/new_service"); ?>
                    <?= $this->include("{$viewDatas['layout']}/welcome/stock"); ?>
                </div>
-                <div class="col-4"><?= $this->include("{$viewDatas['layout']}/welcome/user_history"); ?></div>
+                <div class="col-4"><?= $this->include("{$viewDatas['layout']}/welcome/mylog"); ?></div>
            </div>
            <!-- Layout Right End -->
        </td>
--- a/app/Views/admin/welcome/user_history.php
+++ b/app/Views/admin/welcome/user_history.php
@ -8,6 +8,6 @@
    </ul>
  </div>
  <div style="border-left: 1px solid black; border-right: 1px solid black; padding:20px;">
-    준비중....
+    <?= view_cell("\App\Cells\MylogCell::dashboard") ?>
  </div>
  <div class="layout_footer"></div>
--- a/app/Views/cells/mylog/dashboard.php
+++ b/app/Views/cells/mylog/dashboard.php
@ -0,0 +1,16 @@
+<table class="table table-bordered table-hover table-striped">
+  <tr>
+    <th class="text-center">작업일</th>
+    <th class="text-center">작업내역</th>
+    <th class="text-center">작업자</th>
+  </tr>
+  <?php foreach ($myLogCellDatas['entities'] as $entity): ?>
+    <?php $myLogCellDatas['entity'] = $entity; ?>
+    <tr>
+      <td class="text-center" nowrap><?= $myLogCellDatas['service']->getHelper()->getFieldView('created_at', $entity->created_at, $myLogCellDatas) ?></td>
+      <td class="text-start"><?= $myLogCellDatas['service']->getHelper()->getFieldView('title', $entity->title, $myLogCellDatas) ?></td>
+      <td class="text-center"><?= $myLogCellDatas['service']->getHelper()->getFieldView('user_uid', $entity->user_uid, $myLogCellDatas) ?></td>
+      </td>
+    </tr>
+  <?php endforeach ?>
+</table>
--- a/app/Views/cells/payment/detail.php
+++ b/app/Views/cells/payment/detail.php
@ -16,7 +16,7 @@
        <td class="text-center"><?= $serviceCellDatas['service']->getHelper()->getFieldView('create_at', $entity->getCreatedAt(), $serviceCellDatas) ?></td>
        <td class="text-center"><?= $serviceCellDatas['service']->getHelper()->getFieldView('amount', $entity->getAmount(), $serviceCellDatas) ?></td>
        <td class="text-center"><?= $serviceCellDatas['service']->getHelper()->getFieldView('title', $entity->getTitle(), $serviceCellDatas) ?></td>
-        <td class="text-start"><?= $serviceCellDatas['service']->getHelper()->getFieldView('content', nl2br($entity->getContent()), $serviceCellDatas) ?></td>
+        <td class="text-start"><?= $serviceCellDatas['service']->getHelper()->getFieldView('content', html_entity_decode($entity->getContent(), ENT_QUOTES, 'UTF-8'), $serviceCellDatas) ?></td>
        <td class="text-center"><?= $serviceCellDatas['service']->getHelper()->getFieldView('user_uid', $entity->getUserUID(), $serviceCellDatas) ?></td>
      </tr>
    <?php endforeach; ?>
--- a/app/Views/cells/service/detail.php
+++ b/app/Views/cells/service/detail.php
@ -9,7 +9,8 @@
    <?php foreach ($serviceCellDatas['entities'] as $entity): ?>
      <?php $serviceCellDatas['entity'] = $entity ?>
      <tr class="text-left">
-        <td class="text-center">
+        <td class="text-center" nowrap>
+          <div><?= $entity->getCode() ?></div>
          <div><?= $entity->getTitle() ?></div>
          <div><?= $serviceCellDatas['service']->getHelper()->getFieldView('site', $entity->getSite(), $serviceCellDatas) ?></div>
          <div><?= $serviceCellDatas['service']->getHelper()->getFieldView('location', $entity->getLocation(), $serviceCellDatas) ?></div>