fix(enlish-service): 优化单词数据处理及模板配置更新

- 修改开发和生产环境配置中的数据库连接及模板文件路径
- ExamWordsController新增单词列表拆分为两部分返回
- ExamWordsServiceImpl增加单词数量不足时补充逻辑，确保单词数量满足要求
- LessonPlansServiceImpl优化教案数据组装，增加班级信息及单词列表拆分功能
- PngUtil调整图像二值化阈值，完善轮廓检测及未背熟单词识别逻辑，移除冗余代码
- SaTokenConfigure更新路由权限配置，添加对tts接口的不拦截支持
- 删除StudentExamWordsDOMapper中is_completed条件，调整查询方式
- UserController修正接口日志注释，准确描述修改用户信息功能
- VocabularyBankDOMapper新增根据年级与排除ID查询单词接口及SQL映射
- WordExportUtil更新导出配置，支持拆分单词列表绑定两个集合以适应新结构

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

@@ -25,11 +25,13 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 
             SaRouter.match("/**")
                     .notMatch("/login/**")
-                    .notMatch("plan/word/voice")
+                    .notMatch("/plan/word/voice")
+                    .notMatch("/plan/word/voice/tts")
                     .check(r -> StpUtil.checkLogin());
 
             SaRouter.match("/admin/**")
-                    .notMatch("plan/word/voice")
+                    .notMatch("/plan/word/voice")
+                    .notMatch("/plan/word/voice/tts")
                     .check(r -> StpUtil.checkRole("root"));
 
         }))

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

@@ -72,6 +72,12 @@ public class ExamWordsController {
                 data.put("examStr", examWordsDO.getTitle());
                 data.put("words", assessmentWords);
                 data.put("answer", assessmentWords);
+
+                List<Word> words1 = assessmentWords.subList(0, assessmentWords.size() / 2);
+                List<Word> words2 = assessmentWords.subList(assessmentWords.size() / 2, assessmentWords.size());
+                data.put("words1", words1);
+                data.put("words2", words2);
+
                 return data;
             }).toList();
 

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

@@ -35,7 +35,7 @@ public class UserController {
     }
 
     @PostMapping("update-user-info")
-    @ApiOperationLog(description = "修改密码")
+    @ApiOperationLog(description = "修改用户信息")
     public Response<String> updatePassword(@RequestBody UpdateUserInfoReqVO updateUserInfoReqVO) {
         try {
             String code = updateUserInfoReqVO.getCode();

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

@@ -26,4 +26,6 @@ public interface VocabularyBankDOMapper {
     Integer selectWordTotal();
 
     List<VocabularyBankDO> selectByUnitIds(@Param("unitIds") List<Integer> unitIds);
+
+    List<VocabularyBankDO> selectByGradeIdAndNotMatchIds(@Param("gradeId") Integer gradeId, @Param("ids") List<Integer> ids, @Param("wordCount") Integer wordCount);
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/exam/ExamWordsServiceImpl.java

@@ -47,7 +47,6 @@ public class ExamWordsServiceImpl implements ExamWordsService {
     @Transactional(rollbackFor = RuntimeException.class)
     public ExamWordsDO generateExamWords(Integer studentId, Integer type) {
 
-
         ExamWordsDO examWordsDO;
 
         if (type == ExamWordsConstant.EXAM_TYPE_BASELINE) {
@@ -61,6 +60,16 @@ public class ExamWordsServiceImpl implements ExamWordsService {
             examWordsDO = generateFinalExamWords(studentId);
         }
 
+        List<Integer> wordIds = new ArrayList<>(examWordsDO.getWordIds());
+        if (wordIds.size() < wordCount) {
+            log.info("单词数量不足，补充单词");
+            StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+            List<VocabularyBankDO> vocabularyBankDOS = vocabularyBankDOMapper.selectByGradeIdAndNotMatchIds(studentDO.getGradeId(), wordIds, wordCount - wordIds.size());
+            List<Integer> list = new ArrayList<>(vocabularyBankDOS.stream().map(VocabularyBankDO::getId).toList());
+            wordIds.addAll(list);
+            examWordsDO.setWordIds(wordIds);
+        }
+
         return examWordsDO;
     }
 

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

@@ -50,7 +50,8 @@ public class LessonPlansServiceImpl implements LessonPlansService {
     private PlanExamDOMapper planExamDOMapper;
     @Resource
     private RedisTemplate<String, Object> redisTemplate;
-
+    @Resource
+    private ClassDOMapper classDOMapper;
 
     @Override
     public void generateLessonPlans(Integer studentId, Integer unitId, Integer wordSize) {
@@ -227,11 +228,16 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         examWordsDOMapper.insert(examWordsDO);
         studentExamWordsDOMapper.insertStudentsExam(studentId, examWordsDO.getId());
 
+        ClassDO classDO = classDOMapper.selectClassDOById(studentDOMapper.selectStudentById(studentId).getClassId());
         data.put("examId", examWordsDO.getId());
         data.put("studentId", studentId);
-        data.put("studentStr", studentDO.getName());
+        data.put("studentStr", gradeDO.getTitle() + " " + classDO.getTitle() + " " + studentDO.getName());
         data.put("examStr", ExamTitle);
-        data.put("checkList", words);
+
+        List<VocabularyBankDO> words1 = words.subList(0, words.size() / 2);
+        List<VocabularyBankDO> words2 = words.subList(words.size() / 2, words.size());
+        data.put("words1", words1);
+        data.put("words2", words2);
 //        LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
 //        Configure config = Configure.builder()
 //                .bind("checkList", policy)
@@ -250,6 +256,7 @@ public class LessonPlansServiceImpl implements LessonPlansService {
                                         List<VocabularyBankDO> checkList,
                                         int day,
                                         GradeDO gradeDO, UnitDO unitDO, Integer studentId) throws Exception {
+
         String title = gradeDO.getTitle() + " " + unitDO.getTitle() + " " + "第" + day + "天";
         Map<String, Object> data = new HashMap<>();
         data.put("title", title);
@@ -258,7 +265,6 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         data.put("reviewVocabList", reviewVocabList);
         data.put("checkList", checkList);
         data.put("checkListAns", checkList);
-
         // 中译英
         List<Word> list = syncVocabList.stream().map(vocabularyBankDO -> Word.builder().title(vocabularyBankDO.getWord()).definition(vocabularyBankDO.getDefinition()).build()).toList();
         list.forEach(word -> word.setTitle("                "));
@@ -344,7 +350,12 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         data.put("studentId", studentId);
         data.put("studentStr", studentDO.getName());
         data.put("examStr", ExamTitle);
-        data.put("words", words);
+
+        List<VocabularyBankDO> words1 = words.subList(0, wordIds.size() / 2);
+        List<VocabularyBankDO> words2 = words.subList(wordIds.size() / 2, wordIds.size());
+        data.put("words1", words1);
+        data.put("words2", words2);
+
         log.info("生成教案小测成功");
 
 //        LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();

enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/PngUtil.java

@@ -48,14 +48,14 @@ public class PngUtil {
         // 反转后，黑色块变成白色(255)，背景变成黑色(0)，方便 findContours 查找。
         Mat binary = new Mat();
         // 阈值设为 50 左右即可，因为块是纯黑的
-        Imgproc.threshold(gray, binary, 50, 255, Imgproc.THRESH_BINARY_INV);
+        Imgproc.threshold(gray, binary, 80, 255, Imgproc.THRESH_BINARY_INV);
 
         // 4. 查找轮廓
         List<MatOfPoint> contours = new ArrayList<>();
         Mat hierarchy = new Mat();
         // RETR_EXTERNAL 只检测最外层轮廓，忽略块内部可能存在的噪点
         Imgproc.findContours(binary, contours, hierarchy, Imgproc.RETR_EXTERNAL, Imgproc.CHAIN_APPROX_SIMPLE);
-
+        //Imgcodecs.imwrite("output_red___v1.png", binary);
         System.out.println("检测到的轮廓总数: " + contours.size());
         System.out.println("------------------------------------------------");
 
@@ -89,32 +89,18 @@ public class PngUtil {
                 System.out.println("------------------------------------------------");
                 list.add(CoordinatesXY.builder().x(rect.x).y(rect.y).width(rect.width).height(rect.height).build());
                 // 可选：在原图上画出框，用于调试验证
-//                Imgproc.rectangle(src, rect, new Scalar(0, 0, 255), 2); // 红色框
+                Imgproc.rectangle(src, rect, new Scalar(0, 0, 255), 2); // 红色框
-//                Imgproc.putText(src, "#" + blockCount, new Point(rect.x, rect.y - 5), Imgproc.FONT_HERSHEY_SIMPLEX, 0.5, new Scalar(0, 0, 255), 1);
+                Imgproc.putText(src, "#" + blockCount, new Point(rect.x, rect.y - 5), Imgproc.FONT_HERSHEY_SIMPLEX, 0.5, new Scalar(0, 0, 255), 1);
                 //Imgcodecs.imwrite("output_red.png", src);
             }
         }
         System.out.println("找到 " + blockCount + " 个黑色块。");
 
-        // 获取每一列的宽度
-        list.sort(Comparator.comparingInt(CoordinatesXY::getHeight));
-        int height = list.get(list.size() - 1).getHeight() / ExamWordsConstant.PGN_COL;
-
-        // 删除两列答题卡区块
-        list.sort(Comparator.comparingInt(CoordinatesXY::getWidth));
-        list.remove(list.size() - 1);
-        list.remove(list.size() - 1);
-        list.sort(Comparator.comparingInt(CoordinatesXY::getX));
 
         // 计算起始坐标
-        List<CoordinatesXY> ans = getCoordinatesXIES(list, height);
+        list.sort(Comparator.comparingInt(CoordinatesXY::getX));
 
-        src.release();
+        return list;
-        binary.release();
-        hierarchy.release();
-        binary.release();
-
-        return ans;
     }
 
     // 获取（未背熟）单词的 id
@@ -138,18 +124,14 @@ public class PngUtil {
             List<Integer> answer = new ArrayList<>();
             int words_index = 0;
 
-            for (int i = 0; i < coordinatesXYList.size(); i++) {
+            for (CoordinatesXY coordinatesXY : coordinatesXYList) {
-                CoordinatesXY coordinatesXY = coordinatesXYList.get(i);
-
                 int width = coordinatesXY.getWidth();
                 int height = coordinatesXY.getHeight();
                 int currentX = coordinatesXY.getX();
-                int currentY = coordinatesXY.getY();
+                int currentY = coordinatesXY.getY() + height;
-
-                int count = i == 0 ? ExamWordsConstant.PGN_COL - 1 : ExamWordsConstant.PGN_COL;
 
                 // 内层循环：遍历这一列的每一行
-                for (int j = 0; j < count; j++) {
+                for (int j = 0; j < 50; j++) {
                     // 安全检查：防止单词列表比格子少导致越界
                     if (words_index >= wordIds.size()) {
                         log.warn("单词列表耗尽，停止检测。格子数多于单词数。");
@@ -169,11 +151,14 @@ public class PngUtil {
                     Mat region = binary.submat(rect);
                     int countNonZero = Core.countNonZero(region);
 
-                    if (countNonZero > 500) {
+                    if (countNonZero > 370) {
                         Integer id = wordIds.get(words_index);
                         answer.add(id);
                         log.info("检测到标记（未背熟）：ID={}, 当前坐标 x = {} y = {} ", id, currentX + 1, currentY + 1);
                     }
+                    if (countNonZero == 0) {
+                        break;
+                    }
 
                     region.release();
                     words_index++;
@@ -276,21 +261,4 @@ public class PngUtil {
         return image;
     }
 
-    private static @NonNull List<CoordinatesXY> getCoordinatesXIES(List<CoordinatesXY> list, int height) {
-        List<CoordinatesXY> ans = new ArrayList<>();
-        CoordinatesXY left = new CoordinatesXY();
-        left.setX(list.get(1).getX());
-        left.setWidth(list.get(1).getWidth());
-        left.setHeight(height);
-        left.setY(list.get(0).getY() + left.getHeight());
-        ans.add(left);
-
-        CoordinatesXY right = new CoordinatesXY();
-        right.setX(list.get(2).getX());
-        right.setY(list.get(0).getY());
-        right.setWidth(list.get(1).getWidth());
-        right.setHeight(height);
-        ans.add(right);
-        return ans;
-    }
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/WordExportUtil.java

@@ -36,6 +36,8 @@ public class WordExportUtil {
         LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
         config = Configure.builder()
                 .bind("words", policy)
+                .bind("words1", policy)
+                .bind("words2", policy)
                 .bind("answer", policy)
                 .build();
 
@@ -52,12 +54,14 @@ public class WordExportUtil {
                 .bind("checkListAns", policyLessonPlanWeekday)
                 .bind("sentences", policyLessonPlanWeekday)
                 .bind("sentencesAns", policyLessonPlanWeekday)
-                .bind("words", policyLessonPlanWeekday)
+                .bind("words1", policy)
+                .bind("words2", policy)
                 .build();
 
         LoopRowTableRenderPolicy policyLessonPlan = new LoopRowTableRenderPolicy();
         configLessonPlanWeekend = Configure.builder()
-                .bind("checkList", policyLessonPlan)
+                .bind("words1", policy)
+                .bind("words2", policy)
                 .build();
     }
 

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

@@ -2,7 +2,7 @@ spring:
     datasource:
         driver-class-name: com.mysql.cj.jdbc.Driver # 指定数据库驱动类
         # 数据库连接信息
-        url: jdbc:mysql://124.220.58.5:3306/enlish?allowMultiQueries=true
+        url: jdbc:mysql://124.220.58.5:3306/dev_english?allowMultiQueries=true
         username: root # 数据库用户名
         password: YLHP@admin123 # 数据库密码
     data:
@@ -31,12 +31,12 @@ spring:
 
 
 templates:
-    word: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\assessment_v5.docx
+    word: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\assessment_v9.docx
     count: 100
     data: C:\project\tess
     plan:
-        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v6.docx
+        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v7.docx
-        weekend: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\study_plan_review_v2.docx
+        weekend: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\study_plan_review_v3.docx
     plan_day: 7
 tmp:
     png: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\tmp\png\

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

@@ -31,11 +31,11 @@ spring:
 
 
 templates:
-    word: assessment_v5.docx
+    word: assessment_v7.docx
     count: 100
     data: eng.traineddata
     plan:
-        weekday: tem_study_plan_v5.docx
+        weekday: tem_study_plan_v6.docx
         weekend: study_plan_review_v2.docx
     plan_day: 7
 tmp:

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

@@ -21,7 +21,6 @@
         from student_exam_words
         where student_id = #{studentId}
         and exam_words_id = #{examWordsId}
-        and is_completed = 0
     </select>
 
     <update id="updateStudentExamWordsFinished">

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

@@ -145,5 +145,21 @@
         order by rand()
         limit 100
     </select>
+    <select id="selectByGradeIdAndNotMatchIds"
+            resultType="com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO">
+        select *
+        from vocabulary_bank
+        where unit_id in (
+            select unit_id
+            from grade_unit
+            where grade_id = #{gradeId}
+        )
+        and id not in
+        <foreach item="id" collection="ids" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+        order by rand()
+        limit #{wordCount}
+    </select>
 
 </mapper>