dbms_init...1

This commit is contained in:
choi.jh 2025-06-18 13:31:28 +09:00
parent e437c1e3cd
commit 47f4267fce
31 changed files with 123 additions and 99 deletions

View File

@ -11,7 +11,9 @@ $routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}
//authFilter는 추가적인 작업이 필요 //authFilter는 추가적인 작업이 필요
//1. app/Filters/AuthFilter.php //1. app/Filters/AuthFilter.php
//2. Config/Filters.php -> $aliases = ['authFilter' => AuthFilter::class] //2. Config/Filters.php -> $aliases = ['authFilter' => AuthFilter::class]
$routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) {}); $routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) {
$routes->cli('billing', 'Payment::billing');
});
$routes->group('', ['namespace' => 'App\Controllers'], function ($routes) { $routes->group('', ['namespace' => 'App\Controllers'], function ($routes) {
$routes->get('/', 'Home::index'); $routes->get('/', 'Home::index');
$routes->group('auth', ['namespace' => 'App\Controllers\Auth'], function ($routes) { $routes->group('auth', ['namespace' => 'App\Controllers\Auth'], function ($routes) {

View File

@ -0,0 +1,77 @@
<?php
namespace App\Controllers\CLI;
use App\Controllers\BaseController;
use App\Services\Customer\ServiceService;
use App\Services\Customer\ServiceItemService;
use App\Services\Customer\ServicePaymentService;
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use Psr\Log\LoggerInterface;
class Payment extends BaseController
{
private $_db = null;
private ?ServiceService $_serviceService = null;
private ?ServiceItemService $_servicItemeService = null;
private ?ServicePaymentService $_servicePaymentService = null;
public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
{
parent::initController($request, $response, $logger);
// $this->_db = \Config\Database::connect();
}
public function getServiceService(): ServiceService
{
if (!$this->_serviceService) {
$this->_serviceService = new ServiceService($this->request);
}
return $this->_serviceService;
}
public function getServiceItemService(): ServiceItemService
{
if (!$this->_servicItemeService) {
$this->_servicItemeService = new ServiceItemService($this->request);
}
return $this->_servicItemeService;
}
public function getServicePaymentService(): ServicePaymentService
{
if (!$this->_servicePaymentService) {
$this->_servicePaymentService = new ServicePaymentService($this->request);
}
return $this->_servicePaymentService;
}
public function billing(): void
{
//Transaction Start
$this->getServiceService()->getModel()->transStart();
try {
//서비스중인 서버중 결제일이 오늘인 서비스 확인
//결제일이 오늘이 서비스를 모두 연장처리
$this->getServiceService()->extendBillingAt(date('Y-m-d'), DEFAULTS['STATUS']);
//결제일이 오늘보다 큰 서비스가져오기
foreach ($this->getServiceService()->getEntities(['billing_at >' => date("Y-m-d")]) as $serviceEntity) {
echo $serviceEntity->getPK() . ":" . $serviceEntity->getBillingAt() . "\n";
foreach ($this->getServiceItemService()->getEntities(['serviceinfo_uid' => $serviceEntity->getPK()]) as $itemEntity) {
if ($itemEntity->getBillingCycle() == "month") {
//결제정보 ServicePaymentService에 신규등록
$this->getServicePaymentService()->createPaymentByServiceItem($itemEntity);
}
}
}
// echo $this->getServiceService()->getModel()->getLastQuery() . "\n";
log_message("notice", "Billing 작업을 완료하였습니다.");
$this->getServiceService()->getModel()->transCommit();
} catch (\Exception $e) {
//Transaction Rollback
$this->getServiceService()->getModel()->transRollback();
log_message(
"error",
"Billing 작업을 실패하였습니다.\n--------------\n" .
$e->getMessage() .
"\n--------------\n"
);
}
}
}

View File

@ -34,7 +34,7 @@ CREATE TABLE `accountinfo` (
PRIMARY KEY (`uid`), PRIMARY KEY (`uid`),
KEY `FK_clientinfo_TO_accountinfo` (`clientinfo_uid`), KEY `FK_clientinfo_TO_accountinfo` (`clientinfo_uid`),
CONSTRAINT `FK_clientinfo_TO_accountinfo` FOREIGN KEY (`clientinfo_uid`) REFERENCES `clientinfo` (`uid`) CONSTRAINT `FK_clientinfo_TO_accountinfo` FOREIGN KEY (`clientinfo_uid`) REFERENCES `clientinfo` (`uid`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='예치금계좌'; ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='예치금계좌';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -43,7 +43,7 @@ CREATE TABLE `accountinfo` (
LOCK TABLES `accountinfo` WRITE; LOCK TABLES `accountinfo` WRITE;
/*!40000 ALTER TABLE `accountinfo` DISABLE KEYS */; /*!40000 ALTER TABLE `accountinfo` DISABLE KEYS */;
INSERT INTO `accountinfo` VALUES (1,1,'5월예치금입금','Test111',100000,'default',NULL,'2025-05-29 06:08:43'),(2,1,'5월예치금출금','Test111',50000,'out',NULL,'2025-05-29 06:09:07'); INSERT INTO `accountinfo` VALUES (1,1,'5월예치금입금','Test111',100000,'default','2025-06-17 02:09:08','2025-05-29 06:08:43'),(2,1,'5월예치금출금','Test111',50000,'out','2025-06-17 02:08:21','2025-05-29 06:09:07'),(3,3,'테스트입금333','Test333',100000,'default',NULL,'2025-06-17 02:11:41');
/*!40000 ALTER TABLE `accountinfo` ENABLE KEYS */; /*!40000 ALTER TABLE `accountinfo` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -76,7 +76,7 @@ CREATE TABLE `clientinfo` (
LOCK TABLES `clientinfo` WRITE; LOCK TABLES `clientinfo` WRITE;
/*!40000 ALTER TABLE `clientinfo` DISABLE KEYS */; /*!40000 ALTER TABLE `clientinfo` DISABLE KEYS */;
INSERT INTO `clientinfo` VALUES (1,'user','Test111','1111','test111@co.kr',50000,0,0,'default','2025-05-29 06:09:07','2025-05-29 06:07:37'),(2,'user,vip','Test222','222','test222@co.kr',0,50,0,'default','2025-05-29 06:10:10','2025-05-29 06:07:54'),(3,'user,vip,reseller','Test333','3333','test333@co.kr',0,0,50000,'default','2025-05-29 06:10:55','2025-05-29 06:08:07'),(4,'user','Test444','4444','test444@co.kr',0,0,0,'default','2025-06-09 07:38:48','2025-05-29 06:08:17'); INSERT INTO `clientinfo` VALUES (1,'user','Test111','1111','test111@co.kr',50000,0,0,'default','2025-05-29 06:09:07','2025-05-29 06:07:37'),(2,'user,vip','Test222','222','test222@co.kr',0,50,0,'default','2025-05-29 06:10:10','2025-05-29 06:07:54'),(3,'user,vip,reseller','Test333','3333','test333@co.kr',100000,0,50000,'default','2025-06-17 02:11:41','2025-05-29 06:08:07'),(4,'user','Test444','4444','test444@co.kr',0,0,0,'default','2025-06-09 07:38:48','2025-05-29 06:08:17');
/*!40000 ALTER TABLE `clientinfo` ENABLE KEYS */; /*!40000 ALTER TABLE `clientinfo` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -634,7 +634,7 @@ CREATE TABLE `serviceinfo_payment` (
KEY `FK_clientinfo_TO_serviceinfo_payment` (`ownerinfo_uid`), KEY `FK_clientinfo_TO_serviceinfo_payment` (`ownerinfo_uid`),
CONSTRAINT `FK_clientinfo_TO_serviceinfo_payment` FOREIGN KEY (`ownerinfo_uid`) REFERENCES `clientinfo` (`uid`), CONSTRAINT `FK_clientinfo_TO_serviceinfo_payment` FOREIGN KEY (`ownerinfo_uid`) REFERENCES `clientinfo` (`uid`),
CONSTRAINT `FK_serviceinfo_TO_serviceinfo_payment` FOREIGN KEY (`serviceinfo_uid`) REFERENCES `serviceinfo` (`uid`) CONSTRAINT `FK_serviceinfo_TO_serviceinfo_payment` FOREIGN KEY (`serviceinfo_uid`) REFERENCES `serviceinfo` (`uid`)
) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='결제정보'; ) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8 COMMENT='결제정보';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -748,4 +748,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-06-17 11:04:42 -- Dump completed on 2025-06-18 13:10:28

View File

@ -2,7 +2,6 @@
namespace App\Services; namespace App\Services;
use CodeIgniter\HTTP\IncomingRequest;
use App\Libraries\LogCollector; use App\Libraries\LogCollector;
abstract class CommonService abstract class CommonService
@ -10,16 +9,20 @@ abstract class CommonService
private $_serviceDatas = []; private $_serviceDatas = [];
private $_model = null; private $_model = null;
private $_classNames = []; private $_classNames = [];
protected ?IncomingRequest $request = null; private $_request = null;
protected function __construct(?IncomingRequest $_request = null) protected function __construct(mixed $_request = null)
{ {
$this->request = $_request; $this->_request = $_request;
} }
abstract public function getModelClass(): mixed; abstract public function getModelClass(): mixed;
abstract public function getEntityClass(): mixed; abstract public function getEntityClass(): mixed;
abstract public function getFormFields(): array; abstract public function getFormFields(): array;
abstract public function getFilterFields(): array; abstract public function getFilterFields(): array;
abstract public function getBatchJobFields(): array; abstract public function getBatchJobFields(): array;
final public function getRequest(): mixed
{
return $this->_request;
}
public function getIndexFields(): array public function getIndexFields(): array
{ {
return $this->getFormFields(); return $this->getFormFields();
@ -39,10 +42,6 @@ abstract class CommonService
{ {
$this->_serviceDatas[$name] = $value; $this->_serviceDatas[$name] = $value;
} }
final public function getRequest(): IncomingRequest|null
{
return $this->request;
}
final protected function addClassName(string $className): void final protected function addClassName(string $className): void
{ {
$this->_classNames[] = $className; $this->_classNames[] = $className;

View File

@ -4,14 +4,11 @@ namespace App\Services\Customer;
use App\Entities\Customer\AccountEntity; use App\Entities\Customer\AccountEntity;
use App\Models\Customer\AccountModel; use App\Models\Customer\AccountModel;
use CodeIgniter\HTTP\IncomingRequest;
use App\Entities\Customer\ClientEntity; use App\Entities\Customer\ClientEntity;
class AccountService extends CustomerService class AccountService extends CustomerService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Account'); $this->addClassName('Account');

View File

@ -2,16 +2,12 @@
namespace App\Services\Customer; namespace App\Services\Customer;
use CodeIgniter\HTTP\IncomingRequest;
use App\Entities\Customer\ClientEntity; use App\Entities\Customer\ClientEntity;
use App\Models\Customer\ClientModel; use App\Models\Customer\ClientModel;
class ClientService extends CustomerService class ClientService extends CustomerService
{ {
public function __construct(mixed $request = null)
protected ?IncomingRequest $request = null;
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Client'); $this->addClassName('Client');

View File

@ -4,14 +4,11 @@ namespace App\Services\Customer;
use App\Entities\Customer\CouponEntity; use App\Entities\Customer\CouponEntity;
use App\Models\Customer\CouponModel; use App\Models\Customer\CouponModel;
use CodeIgniter\HTTP\IncomingRequest;
use App\Entities\Customer\ClientEntity; use App\Entities\Customer\ClientEntity;
class CouponService extends CustomerService class CouponService extends CustomerService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Coupon'); $this->addClassName('Coupon');

View File

@ -16,13 +16,12 @@ use App\Services\Equipment\Part\LineService;
use App\Services\Equipment\Part\RamService; use App\Services\Equipment\Part\RamService;
use App\Services\Equipment\Part\SoftwareService; use App\Services\Equipment\Part\SoftwareService;
use App\Services\Equipment\Part\StorageService; use App\Services\Equipment\Part\StorageService;
use CodeIgniter\HTTP\IncomingRequest;
abstract class CustomerService extends CommonService abstract class CustomerService extends CommonService
{ {
private ?ClientService $_clientService = null; private ?ClientService $_clientService = null;
private $_equipmentService = []; private $_equipmentService = [];
protected function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Customer'); $this->addClassName('Customer');

View File

@ -4,14 +4,11 @@ namespace App\Services\Customer;
use App\Entities\Customer\PointEntity; use App\Entities\Customer\PointEntity;
use App\Models\Customer\PointModel; use App\Models\Customer\PointModel;
use CodeIgniter\HTTP\IncomingRequest;
use App\Entities\Customer\ClientEntity; use App\Entities\Customer\ClientEntity;
class PointService extends CustomerService class PointService extends CustomerService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Point'); $this->addClassName('Point');

View File

@ -5,13 +5,11 @@ namespace App\Services\Customer;
use App\Entities\Customer\ServiceHistoryEntity; use App\Entities\Customer\ServiceHistoryEntity;
use App\Models\Customer\ServiceHistoryModel; use App\Models\Customer\ServiceHistoryModel;
use App\Services\Customer\ServiceService; use App\Services\Customer\ServiceService;
use CodeIgniter\HTTP\IncomingRequest;
class ServiceHistoryService extends CustomerService class ServiceHistoryService extends CustomerService
{ {
protected ?IncomingRequest $request = null;
private ?ServiceService $_serviceService = null; private ?ServiceService $_serviceService = null;
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('ServiceHistory'); $this->addClassName('ServiceHistory');

View File

@ -5,13 +5,11 @@ namespace App\Services\Customer\ServiceItemLink;
use App\Entities\Customer\ServiceItemEntity; use App\Entities\Customer\ServiceItemEntity;
use App\Entities\Equipment\Part\IpEntity; use App\Entities\Equipment\Part\IpEntity;
use App\Services\Equipment\Part\IpService; use App\Services\Equipment\Part\IpService;
use CodeIgniter\HTTP\IncomingRequest;
class ServiceItemLinkIpService extends ServiceItemLinkService class ServiceItemLinkIpService extends ServiceItemLinkService
{ {
protected ?IncomingRequest $request = null;
private ?IpService $_ipService = null; private ?IpService $_ipService = null;
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
} }

View File

@ -3,12 +3,10 @@
namespace App\Services\Customer\ServiceItemLink; namespace App\Services\Customer\ServiceItemLink;
use App\Services\Customer\ServiceItemService; use App\Services\Customer\ServiceItemService;
use CodeIgniter\HTTP\IncomingRequest;
abstract class ServiceItemLinkService extends ServiceItemService abstract class ServiceItemLinkService extends ServiceItemService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
} }

View File

@ -7,13 +7,11 @@ use App\Models\Customer\ServiceItemModel;
use App\Services\Customer\CustomerService; use App\Services\Customer\CustomerService;
use App\Services\Customer\ServicePaymentService; use App\Services\Customer\ServicePaymentService;
use App\Services\Customer\ServiceService; use App\Services\Customer\ServiceService;
use CodeIgniter\HTTP\IncomingRequest;
class ServiceItemService extends CustomerService class ServiceItemService extends CustomerService
{ {
protected ?IncomingRequest $request = null;
private ?ServiceService $_serviceService = null; private ?ServiceService $_serviceService = null;
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('ServiceItem'); $this->addClassName('ServiceItem');

View File

@ -2,8 +2,6 @@
namespace App\Services\Customer; namespace App\Services\Customer;
use CodeIgniter\HTTP\IncomingRequest;
use App\Entities\Customer\ServiceItemEntity; use App\Entities\Customer\ServiceItemEntity;
use App\Entities\Customer\ServicePaymentEntity; use App\Entities\Customer\ServicePaymentEntity;
use App\Models\Customer\ServicePaymentModel; use App\Models\Customer\ServicePaymentModel;
@ -11,9 +9,8 @@ use App\Services\Customer\ServiceService;
class ServicePaymentService extends CustomerService class ServicePaymentService extends CustomerService
{ {
protected ?IncomingRequest $request = null;
private ?ServiceService $_serviceService = null; private ?ServiceService $_serviceService = null;
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('ServicePayment'); $this->addClassName('ServicePayment');

View File

@ -7,14 +7,12 @@ use App\Entities\Equipment\CodeEntity;
use App\Models\Customer\ServiceModel; use App\Models\Customer\ServiceModel;
use App\Services\Equipment\CodeService; use App\Services\Equipment\CodeService;
use CodeIgniter\HTTP\IncomingRequest;
class ServiceService extends CustomerService class ServiceService extends CustomerService
{ {
protected ?IncomingRequest $request = null;
private ?CodeService $_codeService = null; private ?CodeService $_codeService = null;
private ?string $_searchIP = null; private ?string $_searchIP = null;
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Service'); $this->addClassName('Service');
@ -93,14 +91,14 @@ class ServiceService extends CustomerService
//기본 기능부분 //기본 기능부분
//다음 달로 결제일을 연장합니다. //다음 달로 결제일을 연장합니다.
public function extendBillingAt(ServiceEntity $entity): bool final public function extendBillingAt(string $billing_at, string $status): bool
{ {
$sql = "UPDATE serviceinfo SET billing_at = $sql = "UPDATE serviceinfo SET billing_at =
IF(DAY(billing_at) > DAY(LAST_DAY(billing_at)), IF(DAY(billing_at) > DAY(LAST_DAY(billing_at)),
LAST_DAY(DATE_ADD(billing_at, INTERVAL 1 MONTH)), LAST_DAY(DATE_ADD(billing_at, INTERVAL 1 MONTH)),
DATE_ADD(billing_at, INTERVAL 1 MONTH) DATE_ADD(billing_at, INTERVAL 1 MONTH)
) WHERE uid = ?"; ) WHERE billing_at = ? AND status = ?";
return $this->getModel()->query($sql, [$entity->getPK()]); return $this->getModel()->query($sql, [$billing_at, $status]);
} }
public function create(array $formDatas, mixed $entity = null): ServiceEntity public function create(array $formDatas, mixed $entity = null): ServiceEntity
{ {

View File

@ -4,13 +4,11 @@ namespace App\Services\Equipment;
use App\Entities\Equipment\CodeEntity; use App\Entities\Equipment\CodeEntity;
use App\Models\Equipment\CodeModel; use App\Models\Equipment\CodeModel;
use CodeIgniter\HTTP\IncomingRequest;
use App\Services\Equipment\EquipmentService; use App\Services\Equipment\EquipmentService;
class CodeService extends EquipmentService class CodeService extends EquipmentService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Code'); $this->addClassName('Code');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment;
use App\Entities\Equipment\DomainEntity; use App\Entities\Equipment\DomainEntity;
use App\Models\Equipment\DomainModel; use App\Models\Equipment\DomainModel;
use CodeIgniter\HTTP\IncomingRequest;
class DomainService extends EquipmentService class DomainService extends EquipmentService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Domain'); $this->addClassName('Domain');

View File

@ -3,11 +3,10 @@
namespace App\Services\Equipment; namespace App\Services\Equipment;
use App\Services\CommonService; use App\Services\CommonService;
use CodeIgniter\HTTP\IncomingRequest;
abstract class EquipmentService extends CommonService abstract class EquipmentService extends CommonService
{ {
protected function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Equipment'); $this->addClassName('Equipment');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\CpuEntity; use App\Entities\Equipment\Part\CpuEntity;
use App\Models\Equipment\Part\CpuModel; use App\Models\Equipment\Part\CpuModel;
use CodeIgniter\HTTP\IncomingRequest;
class CpuService extends PartService class CpuService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Cpu'); $this->addClassName('Cpu');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\DefenceEntity; use App\Entities\Equipment\Part\DefenceEntity;
use App\Models\Equipment\Part\DefenceModel; use App\Models\Equipment\Part\DefenceModel;
use CodeIgniter\HTTP\IncomingRequest;
class DefenceService extends PartService class DefenceService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Defence'); $this->addClassName('Defence');

View File

@ -5,12 +5,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\IpEntity; use App\Entities\Equipment\Part\IpEntity;
use App\Entities\Equipment\Part\LineEntity; use App\Entities\Equipment\Part\LineEntity;
use App\Models\Equipment\Part\IpModel; use App\Models\Equipment\Part\IpModel;
use CodeIgniter\HTTP\IncomingRequest;
class IpService extends PartService class IpService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Ip'); $this->addClassName('Ip');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\LineEntity; use App\Entities\Equipment\Part\LineEntity;
use App\Models\Equipment\Part\LineModel; use App\Models\Equipment\Part\LineModel;
use CodeIgniter\HTTP\IncomingRequest;
class LineService extends PartService class LineService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Line'); $this->addClassName('Line');

View File

@ -3,11 +3,10 @@
namespace App\Services\Equipment\Part; namespace App\Services\Equipment\Part;
use App\Services\Equipment\EquipmentService; use App\Services\Equipment\EquipmentService;
use CodeIgniter\HTTP\IncomingRequest;
abstract class PartService extends EquipmentService abstract class PartService extends EquipmentService
{ {
protected function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Part'); $this->addClassName('Part');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\RamEntity; use App\Entities\Equipment\Part\RamEntity;
use App\Models\Equipment\Part\RamModel; use App\Models\Equipment\Part\RamModel;
use CodeIgniter\HTTP\IncomingRequest;
class RamService extends PartService class RamService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Ram'); $this->addClassName('Ram');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\SoftwareEntity; use App\Entities\Equipment\Part\SoftwareEntity;
use App\Models\Equipment\Part\SoftwareModel; use App\Models\Equipment\Part\SoftwareModel;
use CodeIgniter\HTTP\IncomingRequest;
class SoftwareService extends PartService class SoftwareService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Software'); $this->addClassName('Software');

View File

@ -4,12 +4,10 @@ namespace App\Services\Equipment\Part;
use App\Entities\Equipment\Part\StorageEntity; use App\Entities\Equipment\Part\StorageEntity;
use App\Models\Equipment\Part\StorageModel; use App\Models\Equipment\Part\StorageModel;
use CodeIgniter\HTTP\IncomingRequest;
class StorageService extends PartService class StorageService extends PartService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Storage'); $this->addClassName('Storage');

View File

@ -4,13 +4,11 @@ namespace App\Services\Equipment;
use App\Entities\Equipment\ServerEntity; use App\Entities\Equipment\ServerEntity;
use App\Models\Equipment\ServerModel; use App\Models\Equipment\ServerModel;
use CodeIgniter\HTTP\IncomingRequest;
use App\Services\Equipment\EquipmentService; use App\Services\Equipment\EquipmentService;
class ServerService extends EquipmentService class ServerService extends EquipmentService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('Server'); $this->addClassName('Server');

View File

@ -5,12 +5,11 @@ namespace App\Services;
use App\Entities\MyLogEntity; use App\Entities\MyLogEntity;
use App\Models\MyLogModel; use App\Models\MyLogModel;
use App\Services\Auth\AuthService; use App\Services\Auth\AuthService;
use CodeIgniter\HTTP\IncomingRequest;
use App\Libraries\LogCollector; use App\Libraries\LogCollector;
class MyLogService extends CommonService class MyLogService extends CommonService
{ {
public function __construct(?IncomingRequest $request = null) public function __construct(mixed $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('MyLog'); $this->addClassName('MyLog');

View File

@ -4,15 +4,13 @@ namespace App\Services;
use App\Models\UserSNSModel; use App\Models\UserSNSModel;
use App\Entities\UserSNSEntity; use App\Entities\UserSNSEntity;
use CodeIgniter\HTTP\IncomingRequest;
// use Google\Service\AndroidEnterprise\Resource\Users; // use Google\Service\AndroidEnterprise\Resource\Users;
class UserSNSService extends CommonService class UserSNSService extends CommonService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);;
$this->addClassName('UserSNS'); $this->addClassName('UserSNS');
} }
public function getModelClass(): UserSNSModel public function getModelClass(): UserSNSModel

View File

@ -4,12 +4,10 @@ namespace App\Services;
use App\Entities\UserEntity; use App\Entities\UserEntity;
use App\Models\UserModel; use App\Models\UserModel;
use CodeIgniter\HTTP\IncomingRequest;
class UserService extends CommonService class UserService extends CommonService
{ {
protected ?IncomingRequest $request = null; public function __construct(mixed $request = null)
public function __construct(?IncomingRequest $request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->addClassName('User'); $this->addClassName('User');

View File

@ -47,7 +47,7 @@
<div class="row align-items-start p-0"> <div class="row align-items-start p-0">
<div class="col text-start"><?= $item['item_type'] ?></div> <div class="col text-start"><?= $item['item_type'] ?></div>
<div class="col text-nowrap"><?= $item['item_uid'] ?></div> <div class="col text-nowrap"><?= $item['item_uid'] ?></div>
<div class="col text-end"><?= number_format($item['amount']) ?>원</div> <div class="col text-end text-nowrap"><?= number_format($item['amount']) ?>원</div>
</div> </div>
</li> </li>
<?php endforeach; ?> <?php endforeach; ?>