feat(plan): 支持学案生成时指定单词数

- 在 AddLessonPlanReqVO 中新增 wordSize 字段
- 修改 LessonPlansService 接口及实现，支持 wordSize 参数
- 优化学案生成逻辑，按指定单词数切分词汇列表
- 更新前端 LessonPlanDialog，添加单词数输入框
- 修改生成学案接口及调用，传递 wordSize 参数
- 增加查询学生词汇掌握详情接口及实现
- 添加学生词汇统计展示组件及页面集成
- 调整词汇相关 Mapper，修正记忆强度条件范围
- 更新权限配置，允许访问学生单词详情接口

enlish-service/src/main/java/com/yinlihupo/enlish/service/config/SaTokenConfigure.java

@@ -37,6 +37,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                     .notMatch("/student/mastery/detail")
                     .notMatch("/unit/list")
                     .notMatch("/vocabulary/list")
+                    .notMatch("/vocabulary/student/detail")
                     .notMatch("/plan/download")
                     .notMatch("/login/**")
                     .check(r -> StpUtil.checkLogin());

enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/LessonPlanController.java

@@ -41,8 +41,9 @@ public class LessonPlanController {
     public Response<String> generateLessonPlan(@RequestBody AddLessonPlanReqVO addLessonPlanReqVO) {
         Integer studentId = addLessonPlanReqVO.getStudentId();
         Integer unitId = addLessonPlanReqVO.getUnitId();
+        Integer wordSize = addLessonPlanReqVO.getWordSize();
         try {
-            taskExecutor.execute(() -> lessonPlanService.generateLessonPlans(studentId, unitId));
+            taskExecutor.execute(() -> lessonPlanService.generateLessonPlans(studentId, unitId, wordSize));
             return Response.success("生成学案成功，请等待 10 分钟");
         } catch (Exception e) {
             log.error(e.getMessage());

enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/VocabularyController.java

@@ -1,6 +1,8 @@
 package com.yinlihupo.enlish.service.controller;
 
 import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
+import com.yinlihupo.enlish.service.model.vo.vocabulary.FindStudentWordDetailReqVO;
+import com.yinlihupo.enlish.service.model.vo.vocabulary.FindStudentWordDetailRspVO;
 import com.yinlihupo.enlish.service.model.vo.vocabulary.FindWordTitleReqVO;
 import com.yinlihupo.enlish.service.model.vo.vocabulary.FindWordTitleRspVO;
 import com.yinlihupo.enlish.service.service.VocabularyService;
@@ -30,4 +32,11 @@ public class VocabularyController {
                 .build();
         return Response.success(findWordTitleRspVO);
     }
+
+    @PostMapping("student/detail")
+    @ApiOperationLog(description = "查询学生单词详情")
+    public Response<FindStudentWordDetailRspVO> findStudentWordDetail(@RequestBody FindStudentWordDetailReqVO vo) {
+        return Response.success(vocabularyService.findStudentWordDetail(vo.getId()));
+    }
+
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/mapper/WordMasteryLogDOMapper.java

@@ -20,4 +20,8 @@ public interface WordMasteryLogDOMapper {
     List<WordMasteryLogDO> selectByStudentIdAndLimitTime(@Param("studentId") Integer studentId);
 
     List<WordMasteryLogDO> selectAllByStudentId(@Param("studentId") Integer studentId);
+
+    Integer selectMasteryCount(@Param("studentId") Integer studentId);
+
+    Integer selectNotMasteryCount(@Param("studentId") Integer studentId);
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/plan/AddLessonPlanReqVO.java

@@ -13,4 +13,5 @@ public class AddLessonPlanReqVO {
 
     private Integer studentId;
     private Integer unitId;
+    private Integer wordSize;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/vocabulary/FindStudentWordDetailReqVO.java

@@ -0,0 +1,15 @@
+package com.yinlihupo.enlish.service.model.vo.vocabulary;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindStudentWordDetailReqVO {
+
+    private Integer id;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/vocabulary/FindStudentWordDetailRspVO.java

@@ -0,0 +1,27 @@
+package com.yinlihupo.enlish.service.model.vo.vocabulary;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class FindStudentWordDetailRspVO {
+    /**
+     * 已掌握单词数
+     */
+    private Integer masteredWordCount;
+
+    /**
+     * 未掌握单词数
+     */
+    private Integer unmasteredWordCount;
+
+    /**
+     * 待审查单词数（推荐使用，简洁通用）
+     */
+    private Integer pendingReviewWordCount;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/LessonPlansService.java

@@ -5,7 +5,7 @@ import com.yinlihupo.enlish.service.domain.dataobject.LessonPlansDO;
 import java.util.List;
 
 public interface LessonPlansService {
-    void generateLessonPlans(Integer studentId, Integer unitId);
+    void generateLessonPlans(Integer studentId, Integer unitId, Integer wordSize);
 
     List<LessonPlansDO> findLessonPlans(List<Integer> ids);
 

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/VocabularyService.java

@@ -2,10 +2,13 @@ package com.yinlihupo.enlish.service.service;
 
 
 import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
+import com.yinlihupo.enlish.service.model.vo.vocabulary.FindStudentWordDetailRspVO;
 
 import java.util.List;
 
 public interface VocabularyService {
 
     List<VocabularyBankDO> findVocabularyBankDOListById(List<Integer> ids);
+
+    FindStudentWordDetailRspVO findStudentWordDetail(Integer studentId);
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java

@@ -37,15 +37,10 @@ public class LessonPlansServiceImpl implements LessonPlansService {
     @Resource
     private DifyArticleClient difyArticleClient;
 
-    @Value("${templates.plan.weekday}")
-    private String planWeekday;
-    @Value("${templates.plan.weekend}")
-    private String planWeekend;
-
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void generateLessonPlans(Integer studentId, Integer unitId) {
+    public void generateLessonPlans(Integer studentId, Integer unitId, Integer wordSize) {
         List<VocabularyBankDO> vocabularyBankDOS = vocabularyBankDOMapper.selectVocabularyBankDOAllByUnitId(unitId);
         UnitDO unitDO = unitDOMapper.selectByPrimaryKey(unitId);
         GradeUnitDO gradeUnitDO = gradeUnitDOMapper.selectByUnitId(unitId);
@@ -58,12 +53,19 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         int countGap = gapSize / 5;
 
         int syncSize = vocabularyBankDOS.size();
-        int countSync = syncSize / 5;
+        wordSize = wordSize <= 0 ? syncSize / 5 : wordSize;
         int checkTotal = 50;
         List<List<VocabularyBankDO>> weeksSync = new ArrayList<>();
         List<List<VocabularyBankDO>> weeksGap = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
-            List<VocabularyBankDO> syncVocabList = vocabularyBankDOS.subList(i * countSync, Math.min((i + 1) * countSync, syncSize));
+            List<VocabularyBankDO> syncVocabList;
+            if ((i + 1) * wordSize < syncSize) {
+                syncVocabList = vocabularyBankDOS.subList(i * wordSize, (i + 1) * wordSize);
+            } else if (i == 4) {
+                syncVocabList =  vocabularyBankDOS.subList(i * wordSize, syncSize);
+            } else {
+                syncVocabList = vocabularyBankDOS.subList((syncSize - i) * wordSize, Math.min((syncSize - i + 1) * wordSize, syncSize));
+            }
             List<VocabularyBankDO> gapVocabList = vocabularyBankListStudentNotMaster.subList(i * countGap, Math.min(i * countGap + countGap, gapSize));
             weeksSync.add(syncVocabList);
             weeksGap.add(gapVocabList);

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/vocabulary/VocabularyServiceImpl.java

@@ -2,6 +2,8 @@ package com.yinlihupo.enlish.service.service.vocabulary;
 
 import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
 import com.yinlihupo.enlish.service.domain.mapper.VocabularyBankDOMapper;
+import com.yinlihupo.enlish.service.domain.mapper.WordMasteryLogDOMapper;
+import com.yinlihupo.enlish.service.model.vo.vocabulary.FindStudentWordDetailRspVO;
 import com.yinlihupo.enlish.service.service.VocabularyService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -14,9 +16,19 @@ public class VocabularyServiceImpl implements VocabularyService {
 
     @Resource
     private VocabularyBankDOMapper vocabularyBankDOMapper;
+    @Resource
+    private WordMasteryLogDOMapper wordMasteryLogDOMapper;
 
     @Override
     public List<VocabularyBankDO> findVocabularyBankDOListById(List<Integer> ids) {
         return vocabularyBankDOMapper.selectVocabularyBankDOListByIds(ids);
     }
+
+    @Override
+    public FindStudentWordDetailRspVO findStudentWordDetail(Integer studentId) {
+        Integer wordMastery = wordMasteryLogDOMapper.selectMasteryCount(studentId);
+        Integer wordNotMastery = wordMasteryLogDOMapper.selectNotMasteryCount(studentId);
+        Integer total = vocabularyBankDOMapper.selectWordTotal();
+        return FindStudentWordDetailRspVO.builder().masteredWordCount(wordMastery).unmasteredWordCount(wordNotMastery).pendingReviewWordCount(total - wordMastery - wordNotMastery).build();
+    }
 }

enlish-service/src/main/resources/config/application-dev.yml

@@ -26,7 +26,7 @@ templates:
     count: 100
     data: C:\project\tess
     plan:
-        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v1.docx
+        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v2.docx
         weekend: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\study_plan_review_v1.docx
     plan_day: 7
 tmp:

enlish-service/src/main/resources/mapper/VocabularyBankDOMapper.xml

@@ -94,7 +94,7 @@
             and id in (
                 select word_id
                 from word_mastery_log
-                where memory_strength < 0
+                where memory_strength <= 0
                     and student_id = #{studentId}
             )
         ]]>

enlish-service/src/main/resources/mapper/WordMasteryLogDOMapper.xml

@@ -22,6 +22,7 @@
         order by memory_strength desc
         limit #{limit}
     </select>
+
     <select id="selectStudentStrengthCount" resultType="java.lang.Integer">
         select count(*)
         from word_mastery_log
@@ -58,9 +59,27 @@
         where student_id = #{studentId}
           and update_time between date_sub(now(), interval 7 day) and now()
     </select>
+
     <select id="selectAllByStudentId" resultMap="BaseResultMap">
         select *
         from word_mastery_log
         where student_id = #{studentId}
     </select>
+
+    <select id="selectMasteryCount" resultType="java.lang.Integer">
+        select count(*)
+        from word_mastery_log
+        where student_id = #{studentId}
+          and memory_strength >= 1
+    </select>
+    <select id="selectNotMasteryCount" resultType="java.lang.Integer">
+        <![CDATA[
+        select count(*)
+        from word_mastery_log
+        where student_id = #{studentId}
+            and memory_strength < 0
+        ]]>
+    </select>
+
+
 </mapper>

enlish-service/src/test/java/com/yinlihupo/enlish/service/service/plan/PlanTest.java

@@ -13,6 +13,6 @@ public class PlanTest {
 
     @Test
     public void test() {
-        lessonPlansService.generateLessonPlans(2, 146);
+
     }
 }

enlish-vue/src/api/plan.js

@@ -1,9 +1,10 @@
 import axios from "@/axios";
 
-export function generateLessonPlan(studentId, unitId) {
+export function generateLessonPlan(studentId, unitId, wordSize = 0) {
     return axios.post('/plan/generate', {
         studentId: studentId,
-        unitId: unitId
+        unitId: unitId,
+        wordSize: wordSize
     })
 }
 

enlish-vue/src/api/words.js

@@ -5,3 +5,9 @@ export function getWordsListByIds(ids) {
         ids: ids
     })
 }
+
+export function getWordStudentDetail(studentId) {
+    return axios.post('/vocabulary/student/detail', {
+        id: studentId
+    })
+}

enlish-vue/src/layouts/components/LessonPlanDialog.vue

@@ -12,6 +12,9 @@
 						/>
 					</el-select>
 				</el-form-item>
+				<el-form-item label="单词数">
+					<el-input v-model="wordSize" type="number" placeholder="请输入单词数" style="width: 300px" />
+				</el-form-item>
 			</el-form>
 			<div class="text-sm text-gray-500">
 				学生ID：{{ studentId }}
@@ -45,6 +48,7 @@ const visible = computed({
 
 const loading = ref(false)
 const unitId = ref(null)
+const wordSize = ref(0)
 const unitOptions = ref([])
 
 async function fetchUnits() {
@@ -63,7 +67,7 @@ async function fetchUnits() {
 
 async function handleGenerate() {
 	if (!unitId.value || !props.studentId) return
-	const res = await generateLessonPlan(Number(props.studentId), Number(unitId.value))
+	const res = await generateLessonPlan(Number(props.studentId), Number(unitId.value), Number(wordSize.value))
 	const d = res?.data
 	if (d.success) {
 		ElMessage.success('生成学案任务已提交，请等待十分钟')

enlish-vue/src/pages/student.vue

@@ -6,8 +6,7 @@
             </el-header>
 
             <el-main class="p-4">
-                <div class="grid grid-cols-1 lg:grid-cols-1 gap-6"
+                <div class="grid grid-cols-1 lg:grid-cols-2 gap-6" v-loading="loading">
-                    v-loading="loading">
                     <div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6">
                         <div class="text-lg font-semibold mb-4">学生详情</div>
                         <template v-if="detail">
@@ -24,6 +23,20 @@
                         </template>
                     </div>
 
+                    <div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6">
+                        <div class="text-lg font-semibold mb-4">学生词汇统计</div>
+                        <template v-if="wordStat">
+                            <el-descriptions :column="1" border>
+                                <el-descriptions-item label="已掌握">{{ wordStat.masteredWordCount }}</el-descriptions-item>
+                                <el-descriptions-item label="未掌握">{{ wordStat.unmasteredWordCount }}</el-descriptions-item>
+                                <el-descriptions-item label="待复习">{{ wordStat.pendingReviewWordCount }}</el-descriptions-item>
+                            </el-descriptions>
+                        </template>
+                        <template v-else>
+                            <el-empty description="暂无统计" />
+                        </template>
+                    </div>
+
                     <div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6">
                         <div class="text-md font-semibold mb-3">学生考试记录</div>
                         <ExamHistoryChart :data="history" />
@@ -63,6 +76,7 @@ import { ref, onMounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { getStudentDetail, getStudentStudyAnalyze } from '@/api/student'
 import { getStudentExamHistory } from '@/api/exam'
+import { getWordStudentDetail } from '@/api/words'
 import ExamHistoryChart from '@/layouts/components/student/ExamHistoryChart.vue'
 import PlanHistoryChart from '@/layouts/components/student/PlanHistoryChart.vue'
 import WordMasteryHeatmap from '@/layouts/components/student/WordMasteryHeatmap.vue'
@@ -74,6 +88,7 @@ const route = useRoute()
 const history = ref([])
 const analyzeLoading = ref(false)
 const analysisText = ref('')
+const wordStat = ref(null)
 const md = new MarkdownIt({
     html: false,
     linkify: true,
@@ -122,8 +137,17 @@ async function fetchStudyAnalyze() {
     }
 }
 
+async function fetchWordStat() {
+    const id = route.params.id
+    if (!id) return
+    const res = await getWordStudentDetail(Number(id))
+    const d = res.data
+    wordStat.value = d?.data || null
+}
+
 onMounted(() => {
     fetchDetail()
     fetchExamHistory()
+    fetchWordStat()
 })
 </script>