..

app/JsonRpc/Service/CampusService.php

@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\JsonRpc\Service;
-
-use Aether\AetherCrudService;
-use Aether\AetherModel;
-use Aether\AetherValidator;
-use Aether\Exception\BusinessException;
-use App\Model\Campus;
-use App\Validator\CampusValidator;
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\RpcServer\Annotation\RpcService;
-use MicroService\Contract\CampusServiceInterface;
-
-#[RpcService(
-    name: 'CampusService',
-    server: 'jsonrpc-http',
-    protocol: 'jsonrpc-http',
-    publishTo: 'nacos'
-)]
-class CampusService extends AetherCrudService implements CampusServiceInterface
-{
-    #[Inject]
-    protected Campus $model;
-
-    #[Inject]
-    protected CampusValidator $validator;
-
-    public function getCampusById(int $id): array
-    {
-        $campus = Campus::find($id);
-        if (! $campus || $campus->status != 1) {
-            throw new BusinessException('校区不存在或已禁用', 10001);
-        }
-        return $campus->toArray();
-    }
-
-    public function getCampusesByIds(array $ids): array
-    {
-        return Campus::whereIn('id', $ids)
-            ->enabled()
-            ->get()
-            ->toArray();
-    }
-
-    public function getCampusesByParentId(int $parentId): array
-    {
-        return Campus::where('parent_id', $parentId)
-            ->enabled()
-            ->get()
-            ->toArray();
-    }
-
-    public function getProvinces(): array
-    {
-        return Campus::level(1)
-            ->enabled()
-            ->orderBy('name')
-            ->get(['id', 'name', 'province'])
-            ->toArray();
-    }
-
-    public function getCitiesByProvince(string $province): array
-    {
-        return Campus::level(2)
-            ->province($province)
-            ->enabled()
-            ->orderBy('name')
-            ->get(['id', 'name', 'city'])
-            ->toArray();
-    }
-
-    protected function getModel(): AetherModel
-    {
-        return $this->model;
-    }
-
-    protected function getValidator(): AetherValidator
-    {
-        return $this->validator;
-    }
-}

app/JsonRpc/Service/DataService.php

@@ -4,29 +4,66 @@ declare(strict_types=1);
 
 namespace App\JsonRpc\Service;
 
-use Aether\AetherCrudService;
-use Aether\AetherModel;
-use Aether\AetherValidator;
 use Aether\Exception\BusinessException;
+use App\Model\Campus;
 use App\Model\Teacher;
-use App\Validator\TeacherValidator;
+use App\Validator\CampusValidator;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\RpcServer\Annotation\RpcService;
-use MicroService\Contract\TeacherServiceInterface;
+use MicroService\Contract\DataServiceInterface;
 
-#[RpcService(
-    name: 'DataTeacher',
-    server: 'jsonrpc-http',
-    protocol: 'jsonrpc-http',
-    publishTo: 'nacos'
-)]
-class TeacherService extends AetherCrudService implements TeacherServiceInterface
+#[RpcService(name: 'DataService', server: 'jsonrpc-http', protocol: 'jsonrpc-http', publishTo: 'nacos')]
+class DataService implements DataServiceInterface
 {
     #[Inject]
-    protected Teacher $model;
+    protected Campus $campusModel;
 
     #[Inject]
-    protected TeacherValidator $validator;
+    protected CampusValidator $campusValidator;
+
+    public function getCampusById(int $id): array
+    {
+        $campus = Campus::find($id);
+        if (! $campus || $campus->status != 1) {
+            throw new BusinessException('校区不存在或已禁用', 10001);
+        }
+        return $campus->toArray();
+    }
+
+    public function getCampusesByIds(array $ids): array
+    {
+        return Campus::whereIn('id', $ids)
+            ->enabled()
+            ->get()
+            ->toArray();
+    }
+
+    public function getCampusesByParentId(int $parentId): array
+    {
+        return Campus::where('parent_id', $parentId)
+            ->enabled()
+            ->get()
+            ->toArray();
+    }
+
+    public function getProvinces(): array
+    {
+        return Campus::level(1)
+            ->enabled()
+            ->orderBy('name')
+            ->get(['id', 'name', 'province'])
+            ->toArray();
+    }
+
+    public function getCitiesByProvince(string $province): array
+    {
+        return Campus::level(2)
+            ->province($province)
+            ->enabled()
+            ->orderBy('name')
+            ->get(['id', 'name', 'city'])
+            ->toArray();
+    }
 
     public function getTeacherById(int $id): array
     {
@@ -96,14 +133,4 @@ class TeacherService extends AetherCrudService implements TeacherServiceInterfac
             'list' => $list,
         ];
     }
-
-    protected function getModel(): AetherModel
-    {
-        return $this->model;
-    }
-
-    protected function getValidator(): AetherValidator
-    {
-        return $this->validator;
-    }
 }