From ae0b543bf1151792783137ae4b82b69503376d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A0=82=E5=90=89=E8=AF=83=E5=BE=B7=E6=8B=89=E6=9B=BC?=
 =?UTF-8?q?=E6=9F=A5=E7=9A=84=E8=8B=B1=E8=B1=AA?= <devhalo@163.com>
Date: Fri, 7 Aug 2026 14:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=B1=BB=E5=9E=8B=E5=A5=91?=
 =?UTF-8?q?=E7=BA=A6=E6=94=B6=E6=95=9B=E5=88=B0=E6=95=B0=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=B9=B6=E6=B8=85=E7=90=86=E5=86=97=E4=BD=99=E5=A5=91?=
 =?UTF-8?q?=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Course/CourseServiceInterface.php         |  18 -
 src/DataService/DataService.php               |   7 +-
 src/DataService/DataServiceInterface.php      |   7 +
 src/DataService/Exam/ExamServiceInterface.php | 503 ------------------
 src/DataService/Exam/GufenPaperInterface.php  |   9 -
 src/ExamService/CampusRelationInterface.php   |   8 +-
 src/ExamService/QuestionCategoryInterface.php |   2 +
 src/NoticeService/NoticeService.php           |   4 +-
 src/NoticeService/NoticeServiceInterface.php  |   2 -
 src/NoticeService/NoticeStatsInterface.php    |  12 -
 src/NoticeService/NoticeStatsLogInterface.php |  26 -
 11 files changed, 15 insertions(+), 583 deletions(-)
 delete mode 100644 src/DataService/Course/CourseServiceInterface.php
 delete mode 100644 src/DataService/Exam/ExamServiceInterface.php
 delete mode 100644 src/DataService/Exam/GufenPaperInterface.php
 delete mode 100644 src/NoticeService/NoticeStatsInterface.php
 delete mode 100644 src/NoticeService/NoticeStatsLogInterface.php

diff --git a/src/DataService/Course/CourseServiceInterface.php b/src/DataService/Course/CourseServiceInterface.php
deleted file mode 100644
index 8a34700..0000000
--- a/src/DataService/Course/CourseServiceInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Dhd\Micro\Interface\DataService\Course;
-
-/**
- * 课程服务接口
- */
-interface CourseServiceInterface
-{
-    /**
-     * 根据教师ID获取课程列表
-     * @param int $teacherId 教师ID
-     * @param string $platform 平台 admin-后台 app-APP
-     */
-    public function getCoursesByTeacherId(int $teacherId, string $platform = 'app'): array;
-}
diff --git a/src/DataService/DataService.php b/src/DataService/DataService.php
index 6e0e219..34238d4 100644
--- a/src/DataService/DataService.php
+++ b/src/DataService/DataService.php
@@ -6,9 +6,6 @@
 
 namespace Dhd\Micro\Interface\DataService;
 
-use Dhd\Micro\Interface\DataService\Course\CourseServiceInterface;
-use Dhd\Micro\Interface\DataService\Exam\ExamServiceInterface;
-
 interface DataService extends
     DataServiceInterface,
     AgreementInterface,
@@ -24,6 +21,4 @@ interface DataService extends
     ExcelHeaderFieldsInterface,
     DictionaryInterface,
     MajorsInterface,
-    GuideNavInterface,
-    CourseServiceInterface,
-    ExamServiceInterface {}
+    GuideNavInterface {}
diff --git a/src/DataService/DataServiceInterface.php b/src/DataService/DataServiceInterface.php
index 3773409..0dea1fb 100644
--- a/src/DataService/DataServiceInterface.php
+++ b/src/DataService/DataServiceInterface.php
@@ -54,4 +54,11 @@ interface DataServiceInterface
 
     // 批量更新校区排序
     public function batchUpdateCampusSort(array $sorts): bool;
+
+    /**
+     * 获取招考类型（公告类型统一由数据中心提供）.
+     * @param int $regionId 招考地区ID，0=全部
+     * @return array 招考类型列表
+     */
+    public function appGetExamTypes(int $regionId = 0): array;
 }
diff --git a/src/DataService/Exam/ExamServiceInterface.php b/src/DataService/Exam/ExamServiceInterface.php
deleted file mode 100644
index 4b44028..0000000
--- a/src/DataService/Exam/ExamServiceInterface.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-
-namespace Dhd\Micro\Interface\DataService\Exam;
-
-interface ExamServiceInterface extends GufenPaperInterface
-{
-    // 练习相关
-    /**
-     * 获取练习列表.
-     * @param int $userId 用户ID
-     * @return array 练习列表
-     */
-    public function getPracticeList(int $userId): array;
-
-    /**
-     * 获取练习详情.
-     * @param int $userId 用户ID
-     * @param int $id 练习ID
-     * @return array 练习详情
-     */
-    public function getPracticeDetail(int $userId, int $id): array;
-
-    // 考试类型相关
-
-    /**
-     * 获取考试类型列表.
-     * @param array $params
-     * @return array
-     */
-    public function getExamTypeList(array $params): array;
-
-    /**
-     * 获取考试类型详情.
-     * @param int $id 考试类型ID
-     * @return array 考试类型详情
-     */
-    public function getExamTypeDetail(int $id): array;
-
-    // 题目素材相关
-
-    /**
-     * 获取素材列表.
-     * @param array $params
-     * @return array
-     */
-    public function getQuestionMaterialList(array $params): array;
-
-    /**
-     * 获取素材详情.
-     * @param int $id
-     * @return array
-     */
-    public function getQuestionMaterialDetail(int $id): array;
-
-    /**
-     * 创建素材.
-     * @param array $params
-     * @return bool 创建结果
-     */
-    public function createQuestionMaterial(array $params): bool;
-
-    /**
-     * 更新素材.
-     * @param int $id 素材ID
-     * @param array $params
-     * @return bool 更新结果
-     */
-    public function updateQuestionMaterial(int $id, array $params): bool;
-
-    /**
-     * 删除素材.
-     * @param int $id 素材ID
-     * @return bool 删除结果
-     */
-    public function deleteQuestionMaterial(int $id): bool;
-
-    // 题目相关
-
-    /**
-     * 获取题目列表.
-     * @param array $params
-     * @return array
-     */
-    public function getQuestionList(array $params): array;
-
-    /**
-     * 获取题目详情.
-     * @param int $id
-     * @return array
-     */
-    public function getQuestionDetail(int $id): array;
-
-    /**
-     * 创建题目.
-     * @param array $params
-     * @return bool 创建结果
-     */
-    public function createQuestion(array $params): bool;
-
-    /**
-     * 更新题目.
-     * @param int $id 题目ID
-     * @param array $params
-     * @return bool 更新结果
-     */
-    public function updateQuestion(int $id, array $params): bool;
-
-    /**
-     * 删除题目.
-     * @param int $id 素材ID
-     * @return bool 删除结果
-     */
-    public function deleteQuestion(int $id): bool;
-
-    /**
-     * 搜索题目.
-     * @param array $params
-     * @return array
-     */
-    public function searchQuestion(array $params): array;
-
-    // 题目选项相关
-
-    /**
-     * 批量创建题目选项.
-     * @param int $questionId
-     * @param array $options
-     * @return bool
-     */
-    public function batchCreateQuestionOptions(int $questionId, array $options): bool;
-
-    /**
-     * 调整题目选项排序.
-     * @param int $questionId
-     * @param array $sortData
-     * @return bool
-     */
-    public function adjustQuestionOptionSort(int $questionId, array $sortData): bool;
-
-    /**
-     * 删除题目选项.
-     * @param int $questionId
-     * @return bool
-     */
-    public function deleteQuestionOptionsByQuestionId(int $questionId): bool;
-
-    // 题库相关
-
-    /**
-     * 获取题库列表.
-     * @param array $params
-     * @return array
-     */
-    public function getQuestionStoreList(array $params): array;
-
-    /**
-     * 获取题库详情.
-     * @param int $id
-     * @return array
-     */
-    public function getQuestionStoreDetail(int $id): array;
-
-    /**
-     * 创建题库.
-     * @param array $params
-     * @return bool 创建结果
-     */
-    public function createQuestionStore(array $params): bool;
-
-    /**
-     * 更新题库.
-     * @param int $id 题库ID
-     * @param array $params
-     * @return bool 更新结果
-     */
-    public function updateQuestionStore(int $id, array $params): bool;
-
-    /**
-     * 删除题库.
-     * @param int $id 题库ID
-     * @return bool 删除结果
-     */
-    public function deleteQuestionStore(int $id): bool;
-
-    // 题型相关
-
-    /**
-     * 获取题型列表.
-     * @param array $params
-     * @return array
-     */
-    public function getQuestionTypeList(array $params): array;
-
-    /**
-     * 获取题型详情.
-     * @param int $id
-     * @return array
-     */
-    public function getQuestionTypeDetail(int $id): array;
-
-    /**
-     * 创建题型.
-     * @param array $params
-     * @return bool 创建结果
-     */
-    public function createQuestionType(array $params): bool;
-
-    /**
-     * 删除题型.
-     * @param int $id 题型ID
-     * @return bool 删除结果
-     */
-    public function updateQuestionType(int $id, array $params): bool;
-
-    /**
-     * 删除题型.
-     * @param int $id 题型ID
-     * @return bool 删除结果
-     */
-    public function deleteQuestionType(int $id): bool;
-
-    // 科目相关
-
-    /**
-     * 获取科目列表.
-     * @param array $params
-     * @return array
-     */
-    public function getSubjectList(array $params): array;
-
-    /**
-     * 获取科目详情.
-     * @param int $id
-     * @return array
-     */
-    public function getSubjectDetail(int $id): array;
-
-    // 用户试卷记录相关
-
-    /**
-     * 开始考试（创建试卷记录）.
-     * @param array $params
-     *                      - user_id: 用户ID
-     *                      - paper_id: 试卷ID
-     * @return array 试卷记录信息
-     */
-    public function startExam(array $params): array;
-
-    /**
-     * 提交试卷.
-     * @param array $params
-     *                      - record_id: 试卷记录ID
-     *                      - user_id: 用户ID（验证权限）
-     * @return array 考试结果
-     */
-    public function submitExam(array $params): array;
-
-    /**
-     * 获取用户试卷记录列表.
-     * @param array $params
-     *                      - user_id: 用户ID
-     *                      - page: 页码
-     *                      - size: 每页条数
-     *                      - status: 状态筛选
-     * @return array 分页记录
-     */
-    public function getUserRecords(array $params): array;
-
-    /**
-     * 获取试卷记录详情.
-     * @param int $recordId 记录ID
-     * @param int $userId 用户ID（验证权限）
-     * @return array 详情信息
-     */
-    public function getRecordDetail(int $recordId, int $userId): array;
-
-    /**
-     * 获取用户考试记录列表.
-     * @param array $params
-     * @return array
-     */
-    public function getUserExamRecords(array $params): array;
-
-    /**
-     * 获取考试记录详情.
-     * @param int $recordId 考试记录ID
-     * @param int $userId 用户ID（验证权限）
-     * @return array 详情信息
-     */
-    public function getExamRecordDetail(int $recordId, int $userId): array;
-
-    // 试卷相关
-
-    // 试卷相关
-    /**
-     * 创建试卷.
-     * @param array $params
-     * @return bool
-     */
-    public function createPaper(array $params): bool;
-
-    /**
-     * 更新试卷.
-     * @param int $id 试卷ID
-     * @param array $params
-     * @return bool
-     */
-    public function updatePaper(int $id, array $params): bool;
-
-    /**
-     * 添加题目到试卷.
-     * @param int $paperId
-     * @param array $questionData
-     * @return bool
-     */
-    public function addQuestionsToPaper(int $paperId, array $questionData): bool;
-
-    /**
-     * 从试卷中移除题目.
-     * @param int $paperId
-     * @param array $questionIds
-     * @return bool
-     */
-    public function removeQuestionsFromPaper(int $paperId, array $questionIds): bool;
-
-    /**
-     * 获取试卷详情.
-     * @param int $id
-     * @return array
-     */
-    public function getPaperDetail(int $id): array;
-
-    // 试卷生成相关
-
-    /**
-     * 根据策略生成试卷.
-     * @param array $params
-     * @return array
-     */
-    public function generateByStrategy(array $params): array;
-
-    /**
-     * 手动生成试卷.
-     * @param array $params
-     * @return array
-     */
-    public function generateManual(array $params): array;
-
-    // 素材相关
-
-    /**
-     * 获取素材列表.
-     * @param array $params
-     * @return array
-     */
-    public function getMaterialList(array $params): array;
-
-    /**
-     * 获取素材详情.
-     * @param int $id
-     * @return array
-     */
-    public function getMaterialDetail(int $id): array;
-
-    /**
-     * 创建素材.
-     * @param array $params
-     * @return bool
-     */
-    public function createMaterial(array $params): bool;
-
-    /**
-     * 更新素材.
-     * @param int $id 素材ID
-     * @param array $params
-     * @return bool
-     */
-    public function updateMaterial(int $id, array $params): bool;
-
-    /**
-     * 删除素材.
-     * @param int $id 素材ID
-     * @return bool
-     */
-    public function deleteMaterial(int $id): bool;
-
-    // 题目标签关联相关
-
-    /**
-     * 添加题目标签.
-     * @param int $questionId
-     * @param array $tagIds
-     * @return bool
-     */
-    public function attachQuestionTags(int $questionId, array $tagIds): bool;
-
-    /**
-     * 删除题目标签.
-     * @param int $questionId
-     * @param array $tagIds
-     * @return bool
-     */
-    public function detachQuestionTags(int $questionId, array $tagIds = []): bool;
-
-    /**
-     * 获取题目标签.
-     * @param int $questionId
-     * @return array
-     */
-    public function getQuestionTags(int $questionId): array;
-
-    /**
-     * 获取用户错题列表.
-     * @param array $params
-     *                      - user_id: 用户ID
-     *                      - page: 页码
-     *                      - size: 每页条数
-     *                      - subject_id: 科目筛选
-     * @return array 分页错题列表
-     */
-    public function getUserWrongQuestions(array $params): array;
-
-    /**
-     * 标记错题为已掌握
-     * @param int $userId 用户ID
-     * @param int $wrongId 错题ID
-     * @return bool 操作结果
-     */
-    public function markAsMastered(int $userId, int $wrongId): bool;
-
-    /**
-     * 添加错题笔记.
-     * @param array $params
-     *                      - wrong_id: 错题ID
-     *                      - user_id: 用户ID
-     *                      - note: 笔记内容
-     * @return bool 操作结果
-     */
-    public function addNote(array $params): bool;
-
-    /**
-     * 获取题目错误统计
-     * @param int $userId 用户ID
-     * @param int $questionId 题目ID
-     * @return array 统计信息
-     */
-    public function getErrorStats(int $userId, int $questionId): array;
-
-
-    /**
-     * 保存用户答题记录.
-     * @param array $params
-     *                      - user_id: 用户ID
-     *                      - record_id: 试卷记录ID
-     *                      - question_id: 题目ID
-     *                      - user_answer: 用户答案
-     * @return bool 操作结果
-     */
-    public function saveAnswer(array $params): bool;
-
-    /**
-     * 获取试卷内用户答题记录.
-     * @param int $userId 用户ID
-     * @param int $recordId 试卷记录ID
-     * @return array 答题记录列表
-     */
-    public function getByRecordId(int $userId, int $recordId): array;
-
-    /**
-     * 批量更新题目得分.
-     * @param array $params
-     *                      - record_id: 试卷记录ID
-     *                      - scores: 得分数据 [{question_id: 1, score: 5, is_correct: true}, ...]
-     * @return bool 操作结果
-     */
-    public function batchUpdateScores(array $params): bool;
-
-
-    public function getCategoryList(array $params): array;
-
-    public function getSubQuestionCategoryList(array $data): array;
-
-    public function getCategoryDetail(int $id): array;
-
-    public function getCategoriesByIds(array $ids): array;
-
-    public function createCategory(array $params): array;
-
-    public function updateCategory(int $id, array $params): array;
-
-    public function deleteCategory(int $id): array;
-
-    public function getCategoryTree(array $ids = []): array;
-
-    public function getCategoryOptions(): array;
-
-    /**
-     * 查询指定分类下的题库数量
-     * @param int $categoryId 分类ID
-     * @return int 题库数量
-     */
-    public function getQuestionCountByCategory(int $categoryId): int;
-}
diff --git a/src/DataService/Exam/GufenPaperInterface.php b/src/DataService/Exam/GufenPaperInterface.php
deleted file mode 100644
index 0e5d188..0000000
--- a/src/DataService/Exam/GufenPaperInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Dhd\Micro\Interface\DataService\Exam;
-
-interface GufenPaperInterface
-{
-    //更新估分职位信息
-    public function editGufenPosition(array $params): array;
-}
diff --git a/src/ExamService/CampusRelationInterface.php b/src/ExamService/CampusRelationInterface.php
index 6c606fa..e02b6bd 100644
--- a/src/ExamService/CampusRelationInterface.php
+++ b/src/ExamService/CampusRelationInterface.php
@@ -7,12 +7,12 @@ namespace Dhd\Micro\Interface\ExamService;
 interface CampusRelationInterface
 {
     /**
-     * 获取地区的考试类型
+     * 获取考区关联信息（校区/考试类型/科目/题型分类）.
      */
-    public function getExamTypesByCampus(int $campusId): array;
+    public function getCampusRelationData(int $campusId = 1, int $examTypeId = 1, int $subjectId = 1, int $userId = 0): array;
 
     /**
-     * 获取考试类型的科目
+     * 按条件获取题型分类树.
      */
-    public function getSubjectsByExamType(int $examTypeId): array;
+    public function getCategoriesByConditions(int $campusId, int $examTypeId, int $subjectId): array;
 }
diff --git a/src/ExamService/QuestionCategoryInterface.php b/src/ExamService/QuestionCategoryInterface.php
index 63707fb..298f7d2 100644
--- a/src/ExamService/QuestionCategoryInterface.php
+++ b/src/ExamService/QuestionCategoryInterface.php
@@ -8,6 +8,8 @@ interface QuestionCategoryInterface
 {
     public function getCategoryList(array $params): array;
 
+    public function getSubQuestionCategoryList(array $data): array;
+
     public function getCategoryDetail(int $id): array;
 
     public function getCategoriesByIds(array $ids): array;
diff --git a/src/NoticeService/NoticeService.php b/src/NoticeService/NoticeService.php
index 2cfb7cb..a0c56ec 100644
--- a/src/NoticeService/NoticeService.php
+++ b/src/NoticeService/NoticeService.php
@@ -12,8 +12,6 @@ interface NoticeService extends
     NoticePositionInterface,
     NoticePositionHistoryInterface,
     NoticePositionCollectInterface,
-    NoticePositionPkInterface,
-    NoticeStatsInterface,
-    NoticeStatsLogInterface
+    NoticePositionPkInterface
 {
 }
diff --git a/src/NoticeService/NoticeServiceInterface.php b/src/NoticeService/NoticeServiceInterface.php
index 6c23ee1..4b22418 100644
--- a/src/NoticeService/NoticeServiceInterface.php
+++ b/src/NoticeService/NoticeServiceInterface.php
@@ -9,8 +9,6 @@ interface NoticeServiceInterface
     // 公告管理
     public function getList(array $params): array;
 
-    public function appGetNoticeTypes(int $regionId = 0): array;
-
     public function appGetList(array $params): array;
 
     public function officialGetList(array $params): array;
diff --git a/src/NoticeService/NoticeStatsInterface.php b/src/NoticeService/NoticeStatsInterface.php
deleted file mode 100644
index f0b7918..0000000
--- a/src/NoticeService/NoticeStatsInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Dhd\Micro\Interface\NoticeService;
-
-/**
- * 公告统计聚合契约（空，预留）
- */
-interface NoticeStatsInterface
-{
-}
diff --git a/src/NoticeService/NoticeStatsLogInterface.php b/src/NoticeService/NoticeStatsLogInterface.php
deleted file mode 100644
index 22bbd8a..0000000
--- a/src/NoticeService/NoticeStatsLogInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Dhd\Micro\Interface\NoticeService;
-
-interface NoticeStatsLogInterface
-{
-    // 记录浏览日志
-    public function logView(int $noticeId): int;
-
-    // 记录分享日志
-    public function logShare(int $noticeId): int;
-
-    // 记录点赞日志
-    public function logLike(int $noticeId): int;
-
-    // 记录取消点赞日志
-    public function logCancelLike(int $noticeId): int;
-
-    // 记录下载日志
-    public function logDownload(int $noticeId, int $attachmentId): int;
-
-    // 获取公告的统计日志
-    public function getLogsByNoticeId(int $noticeId, array $params = []): array;
-}