aether/hyperf_data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
Aether
2025-09-29 10:15:17 +08:00
parent e7c5d7d098
commit 9a1c120c4f
7 changed files with 107 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
app/JsonRpc/Service/DataService.php
View File

@@ -8,6 +8,8 @@ use Aether\Exception\BusinessException;
use App\Model\Campus;
use App\Model\Teacher;
use App\Validator\CampusValidator;
use App\Validator\TeacherValidator;
use Exception;
use Hyperf\Di\Annotation\Inject;
use Hyperf\RpcServer\Annotation\RpcService;
use MicroService\Contract\DataServiceInterface;
@@ -21,12 +23,24 @@ class DataService implements DataServiceInterface
#[Inject]
protected CampusValidator $campusValidator;
#[Inject]
protected Teacher $teacherModel;
#[Inject]
protected TeacherValidator $teacherValidator;
/**
* 获取校区列表.
*/
public function getCampuses(array $data): array
{
// TODO list 方法存在问题
return $this->campusModel->list($data);
}
/**
* 获取校区详情.
* @throws BusinessException
*/
public function getCampusBy(int $id): array
{
$campus = $this->campusModel->find($id);
@@ -36,6 +50,10 @@ class DataService implements DataServiceInterface
return $campus->toArray();
}
/**
* 创建校区.
* @throws Exception
*/
public function createCampus(array $data): int
{
$this->campusValidator->scene('create', $data)->check();
@@ -43,54 +61,44 @@ class DataService implements DataServiceInterface
return $campus->id;
}
/**
* 更新校区.
* @throws Exception
*/
public function updateCampus(int $id, array $data): int
{
$this->campusValidator->scene('update', $data)->check();
return $this->campusModel->updateById($id, $data);
}
/**
* 删除校区.
* @throws Exception
*/
public function deleteCampus(int $id): bool
{
return $this->campusModel->deleteById($id);
}
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)
return $this->campusModel->level(1)
->enabled()
->orderBy('name')
->get(['id', 'name', 'province'])
->toArray();
}
/**
* 根据省份获取城市列表.
* @throws BusinessException
*/
public function getCitiesByProvince(string $province): array
{
return Campus::level(2)
return $this->campusModel->level(2)
->province($province)
->enabled()
->orderBy('name')
@@ -98,97 +106,54 @@ class DataService implements DataServiceInterface
->toArray();
}
public function getTeacherById(int $id): array
/**
* 获取教师列表.
*/
public function getTeachers(array $data): array
{
$teacher = Teacher::find($id);
return $this->teacherModel->list($data);
}
/**
* 获取教师详情.
* @throws BusinessException
*/
public function getTeacherBy(int $id): array
{
$teacher = $this->teacherModel->find($id);
if (! $teacher || $teacher->status != 1) {
throw new BusinessException('教师不存在或已禁用', 10101);
throw new BusinessException('教师不存在或已禁用', 10001);
}
return $teacher->toArray();
}
public function getTeachersByIds(array $ids): array
{
return Teacher::whereIn('id', $ids)
->enabled()
->orderBy('sort_order', 'asc')
->get()
->toArray();
}
public function getTeachersByCampusId(int $campusId, int $page = 1, int $size = 20): array
{
$query = Teacher::campusId($campusId)
->enabled()
->orderBy('sort_order', 'asc');
$total = $query->count();
$list = $query->forPage($page, $size)->get()->toArray();
return [
'total' => $total,
'page' => $page,
'size' => $size,
'list' => $list,
];
}
public function getTeachersBySubject(string $subject, int $page = 1, int $size = 20): array
{
$query = Teacher::subject($subject)
->enabled()
->orderBy('sort_order', 'asc');
$total = $query->count();
$list = $query->forPage($page, $size)->get()->toArray();
return [
'total' => $total,
'page' => $page,
'size' => $size,
'list' => $list,
];
}
public function searchTeachers(string $keyword, int $page = 1, int $size = 20): array
{
$query = Teacher::search($keyword)
->enabled()
->orderBy('sort_order', 'asc');
$total = $query->count();
$list = $query->forPage($page, $size)->get()->toArray();
return [
'total' => $total,
'page' => $page,
'size' => $size,
'list' => $list,
];
}
public function getTeachers(): array
{
// TODO: Implement getTeachers() method.
}
public function getTeacherBy(int $id): array
{
// TODO: Implement getTeacherBy() method.
}
/**
* 创建教师.
* @throws Exception
*/
public function createTeacher(array $data): int
{
// TODO: Implement createTeacher() method.
$this->teacherValidator->scene('create', $data)->check();
$teacher = $this->teacherModel->create($data);
return $teacher->id;
}
/**
* 更新教师.
* @throws Exception
*/
public function updateTeacher(int $id, array $data): int
{
// TODO: Implement updateTeacher() method.
$this->teacherValidator->scene('update', $data)->check();
return $this->teacherModel->updateById($id, $data);
}
/**
* 删除教师.
* @throws Exception
*/
public function deleteTeacher(int $id): bool
{
// TODO: Implement deleteTeacher() method.
return $this->teacherModel->deleteById($id);
}
}

11
app/Model/Teacher.php
View File

@@ -42,7 +42,7 @@ class Teacher extends AetherModel
'introduction',
'campus_id',
'status',
'sort_order',
'sort',
];
protected array $casts = [
@@ -51,12 +51,19 @@ class Teacher extends AetherModel
'gender' => 'integer',
'campus_id' => 'integer',
'status' => 'integer',
'sort_order' => 'integer',
'sort' => 'integer',
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
protected array|bool|string $sortable = 'sort';
protected array $search = [
'name' => 'like',
'campus_id' => '=',
];
/**
* 所属校区.
*/

9
app/Validator/TeacherValidator.php
View File

@@ -18,13 +18,12 @@ class TeacherValidator extends AetherValidator
'gender' => 'nullable|integer|in:1,2',
'avatar' => 'nullable|url|max:255',
'title' => 'nullable|string|max:100',
'major_subject' => 'required|string|max:100',
'teaching_style' => 'nullable|string',
'teach_subject' => 'nullable|string|max:100',
'style' => 'nullable|string',
'introduction' => 'nullable|string',
],
'messages' => [
'name.required' => '教师姓名不能为空',
'major_subject.required' => '主讲科目不能为空',
'age.min' => '年龄不能小于18岁',
'age.max' => '年龄不能大于65岁',
'gender.in' => '性别只能是1(男)或2(女)',
@@ -39,7 +38,7 @@ class TeacherValidator extends AetherValidator
'gender' => 'nullable|integer|in:1,2',
'avatar' => 'nullable|url|max:255',
'title' => 'nullable|string|max:100',
'major_subject' => 'nullable|string|max:100',
'teach_subject' => 'nullable|string|max:100',
],
'messages' => [
'id.required' => '教师ID不能为空',
@@ -54,7 +53,7 @@ class TeacherValidator extends AetherValidator
'id' => 'nullable|integer|min:1',
'name' => 'nullable|string|max:50',
'campus_id' => 'nullable|integer|min:0',
'major_subject' => 'nullable|string|max:100',
'teach_subject' => 'nullable|string|max:100',
'status' => 'nullable|integer|in:0,1',
'page' => 'nullable|integer|min:1',
'size' => 'nullable|integer|min:1|max',