fix(exam): 优化考试单词识别与文件上传功能

- 修改application.yml默认激活环境为pro，调整上传文件大小限制为30MB
- 更新pro配置中的模板文件版本和路径
- 修复考试单词ID乱序问题，添加生成试卷成功日志
- 优化考试识别逻辑，确保ansSheetPath变量正确处理，完善异常捕获与文件删除机制
- 增加上传文件格式白名单校验，强化文件存储路径和命名安全性
- 用NIO替换File操作，确保上传目录存在并合理创建
- 优化PngUtil图像二值化处理，增加自适应阈值和形态学操作减少噪声
- 修改未背熟单词识别阈值，调整检测区域坐标和日志输出
- 注释部分冗余图像预处理代码，完善日志和异常信息提示
- 统一文件上传与识别过程的错误处理和日志记录，提升系统稳定性和可维护性

enlish-service/pom.xml

@@ -105,6 +105,74 @@
             <artifactId>tess4j</artifactId>
         </dependency>
 
+        <!-- 阿里云短信发送 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+        </dependency>
+
+        <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-redis-template</artifactId>
+        </dependency>
+
+        <!-- 密码加密 -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-openai</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-starter-model-openai</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -3,11 +3,13 @@ package com.yinlihupo.enlish.service;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @MapperScan("com.yinlihupo.enlish.service.domain.mapper")
 @EnableScheduling
+@EnableAsync
 public class EnlishServiceApplication {
 
     public static void main(String[] args) {

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

@@ -0,0 +1,13 @@
+package com.yinlihupo.enlish.service.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "aliyun")
+@Component
+@Data
+public class AliyunAccessKeyProperties {
+    private String accessKeyId;
+    private String accessKeySecret;
+}

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

@@ -0,0 +1,36 @@
+package com.yinlihupo.enlish.service.config;
+
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.teaopenapi.models.Config;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+@Slf4j
+public class AliyunSmsClientConfig {
+
+    @Resource
+    private AliyunAccessKeyProperties aliyunAccessKeyProperties;
+
+    @Bean
+    public Client smsClient() {
+        try {
+            Config config = new Config()
+                    // 必填
+                    .setAccessKeyId(aliyunAccessKeyProperties.getAccessKeyId())
+                    // 必填
+                    .setAccessKeySecret(aliyunAccessKeyProperties.getAccessKeySecret());
+
+            // Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi
+            config.endpoint = "dysmsapi.aliyuncs.com";
+
+            return new Client(config);
+        } catch (Exception e) {
+            log.error("初始化阿里云短信发送客户端错误: ", e);
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.yinlihupo.enlish.service.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class PasswordEncoderConfig {
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        // BCrypt 是一种安全且适合密码存储的哈希算法，它在进行哈希时会自动加入“盐”，增加密码的安全性。
+        return new BCryptPasswordEncoder();
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.yinlihupo.enlish.service.config;
+
+import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.router.SaHttpMethod;
+import cn.dev33.satoken.router.SaRouter;
+import cn.dev33.satoken.stp.StpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@Slf4j
+public class SaTokenConfigure implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new SaInterceptor(handler -> {
+            log.info("Sa-Token 拦截器： {}", handler);
+
+
+            SaRouter.match(SaHttpMethod.OPTIONS)
+                    .free(r -> System.out.println("--------OPTIONS预检请求，不做处理"))
+                    .back();
+
+            SaRouter.match("/**")
+                    .notMatch("/login/**")
+                    .notMatch("/plan/word/voice")
+                    .notMatch("/plan/word/voice/tts")
+                    .check(r -> StpUtil.checkLogin());
+
+            SaRouter.match("/admin/**")
+                    .notMatch("/plan/word/voice")
+                    .notMatch("/plan/word/voice/tts")
+                    .check(r -> StpUtil.checkRole("root"));
+
+        }))
+        .addPathPatterns("/**")
+        .excludePathPatterns("/error");
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.yinlihupo.enlish.service.config;
+
+
+import cn.dev33.satoken.stp.StpInterface;
+
+import com.google.common.cache.Cache;
+import com.yinlihupo.enlish.service.constant.RoleConstants;
+import com.yinlihupo.framework.common.util.JsonUtils;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Slf4j
+public class StpInterfaceImpl implements StpInterface {
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    public List<String> getPermissionList(Object loginId, String loginType) {
+
+        return List.of();
+    }
+
+    @Override
+    public List<String> getRoleList(Object loginId, String loginType) {
+        long l = 0L;
+        if (loginId instanceof String loginIdStr) {
+            l = Long.parseLong(loginIdStr);
+        }
+        return userToRole(l);
+    }
+
+    private List<String> userToRole(Long userId) {
+
+        String keys = stringRedisTemplate.opsForValue().get(RoleConstants.buildUserRoleKey(userId));
+        if (keys != null) {
+            try {
+                return JsonUtils.parseList(keys, String.class);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return List.of();
+    }
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/ExamWordsConstant.java

@@ -1,6 +1,153 @@
 package com.yinlihupo.enlish.service.constant;
 
-public interface ExamWordsConstant {
+public class ExamWordsConstant {
 
-    int PGN_COL = 53;
+    public static final int PGN_COL = 53;
+
+    public static final int GRADE_1 = 1;
+    public static final int GRADE_2 = 2;
+    public static final int GRADE_3 = 3;
+    public static final int GRADE_4 = 4;
+    public static final int GRADE_5 = 5;
+    public static final int GRADE_6 = 6;
+    public static final int GRADE_7 = 7;
+    public static final int GRADE_8 = 8;
+
+    public static final String GRADE_1_NAME = "一年级";
+    public static final String GRADE_2_NAME = "二年级";
+    public static final String GRADE_3_NAME = "三年级";
+    public static final String GRADE_4_NAME = "四年级";
+    public static final String GRADE_5_NAME = "五年级";
+    public static final String GRADE_6_NAME = "六年级";
+    public static final String GRADE_7_NAME = "初一";
+    public static final String GRADE_8_NAME = "初二";
+
+
+    public static final int ZONE_A_SIZE = 10;
+    public static final int ZONE_B_SIZE = 20;
+    public static final int ZONE_C_SIZE = 28;
+    public static final int ZONE_D_SIZE = 21;
+    public static final int ZONE_E_SIZE = 14;
+    public static final int ZONE_F_SIZE = 7;
+
+
+    // 摸底
+    public static final int EXAM_TYPE_BASELINE = 1;
+    // 中期
+    public static final int EXAM_TYPE_MIDTERM = 2;
+    // 期末
+    public static final int EXAM_TYPE_FINAL = 3;
+    // 小测
+    public static final int EXAM_TYPE_TEST = 4;
+
+
+    public static int getZoneA(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_2;
+            case GRADE_2 -> GRADE_3;
+            case GRADE_3 -> GRADE_4;
+            case GRADE_4 -> GRADE_5;
+            case GRADE_5 -> GRADE_6;
+            case GRADE_6 -> GRADE_7;
+            case GRADE_7 -> GRADE_8;
+            default -> 0;
+        };
+    }
+
+    public static int getZoneB(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1;
+            case GRADE_2 -> GRADE_2;
+            case GRADE_3 -> GRADE_3;
+            case GRADE_4 -> GRADE_4;
+            case GRADE_5 -> GRADE_5;
+            case GRADE_6 -> GRADE_6;
+            case GRADE_7 -> GRADE_7;
+            case GRADE_8 -> GRADE_8;
+            default -> 0;
+        };
+    }
+
+    public static int getZoneC(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1;
+            case GRADE_2 -> GRADE_1;
+            case GRADE_3 -> GRADE_2;
+            case GRADE_4 -> GRADE_3;
+            case GRADE_5 -> GRADE_4;
+            case GRADE_6 -> GRADE_5;
+            case GRADE_7 -> GRADE_6;
+            case GRADE_8 -> GRADE_7;
+            default -> 0;
+        };
+    }
+
+    public static int getZoneD(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1;
+            case GRADE_2 -> GRADE_1;
+            case GRADE_3 -> GRADE_1;
+            case GRADE_4 -> GRADE_2;
+            case GRADE_5 -> GRADE_3;
+            case GRADE_6 -> GRADE_4;
+            case GRADE_7 -> GRADE_5;
+            case GRADE_8 -> GRADE_6;
+            default -> 0;
+        };
+    }
+
+    public static int getZoneE(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1;
+            case GRADE_2 -> GRADE_1;
+            case GRADE_3 -> GRADE_1;
+            case GRADE_4 -> GRADE_1;
+            case GRADE_5 -> GRADE_2;
+            case GRADE_6 -> GRADE_3;
+            case GRADE_7 -> GRADE_4;
+            case GRADE_8 -> GRADE_5;
+            default -> 0;
+        };
+    }
+
+    public static int getZoneF(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1;
+            case GRADE_2 -> GRADE_1;
+            case GRADE_3 -> GRADE_1;
+            case GRADE_4 -> GRADE_1;
+            case GRADE_5 -> GRADE_1;
+            case GRADE_6 -> GRADE_2;
+            case GRADE_7 -> GRADE_3;
+            case GRADE_8 -> GRADE_4;
+            default -> 0;
+        };
+    }
+
+    public static String getGradeName(int gradeId) {
+        return switch (gradeId) {
+            case GRADE_1 -> GRADE_1_NAME;
+            case GRADE_2 -> GRADE_2_NAME;
+            case GRADE_3 -> GRADE_3_NAME;
+            case GRADE_4 -> GRADE_4_NAME;
+            case GRADE_5 -> GRADE_5_NAME;
+            case GRADE_6 -> GRADE_6_NAME;
+            case GRADE_7 -> GRADE_7_NAME;
+            case GRADE_8 -> GRADE_8_NAME;
+            default -> "";
+        };
+    }
+
+    public static String day2Chinese(int day) {
+        return switch (day) {
+            case 1 -> "一";
+            case 2 -> "二";
+            case 3 -> "三";
+            case 4 -> "四";
+            case 5 -> "五";
+            case 6 -> "六";
+            case 7 -> "七";
+            default -> "";
+        };
+    }
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/LessonPlanConstant.java

@@ -1,10 +1,17 @@
 package com.yinlihupo.enlish.service.constant;
 
-public interface LessonPlanConstant {
+public class LessonPlanConstant {
 
-    String TITLE = "Title";
-    String PASSAGE = "The Passage";
-    String QUIZ = "Quiz";
-    String ANSWER_KEY_EXPLANATION = "Answer Key & Explanation";
-    String FULL_TRANSLATION = "Full Translation";
+    public static final String TITLE = "Title";
+    public static final String PASSAGE = "ThePassage";
+    public static final String QUIZ = "Quiz";
+    public static final String ANSWER_KEY_EXPLANATION = "AnswerKey&Explanation";
+    public static final String FULL_TRANSLATION = "FullTranslation";
+
+    // 正在生成学案标识
+    public static final String GENERATING_PLAN = "GeneratingPlan";
+
+    public static String buildGeneratePlanContent(Integer studentId) {
+        return GENERATING_PLAN + ":" + studentId;
+    }
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/RoleConstants.java

@@ -0,0 +1,11 @@
+package com.yinlihupo.enlish.service.constant;
+
+public class RoleConstants {
+
+    public final static String USER_ROLE = "user:role";
+    public final static String ROLE = "role";
+
+    public static String buildUserRoleKey(Long userId) {
+        return USER_ROLE + ":" + userId;
+    }
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/StudentConstant.java

@@ -0,0 +1,10 @@
+package com.yinlihupo.enlish.service.constant;
+
+public class StudentConstant {
+
+    public static final String ANALYZE_STUDENT_STUDY = "analyzeStudentStudy";
+
+    public static String buildAnalyzeStudentStudyKey(Integer studentId) {
+        return ANALYZE_STUDENT_STUDY + ":" + studentId;
+    }
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/UserRedisConstants.java

@@ -0,0 +1,16 @@
+package com.yinlihupo.enlish.service.constant;
+
+public class UserRedisConstants {
+
+    public static final String USER_LOGIN_CODE = "user:login:code:";
+
+    public static final String USER_INVITATION_CODE = "user:invitation:code:";
+
+    public static String buildUserLoginCode(String phone) {
+        return USER_LOGIN_CODE + phone;
+    }
+
+    public static String buildUserInvitationCode(String code) {
+        return USER_INVITATION_CODE + code;
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.yinlihupo.enlish.service.controller;
+
+import com.yinlihupo.enlish.service.constant.UserRedisConstants;
+import com.yinlihupo.enlish.service.domain.dataobject.RoleDO;
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+import com.yinlihupo.enlish.service.model.vo.admin.CreateInvitationCodeReqVO;
+import com.yinlihupo.enlish.service.model.vo.admin.CreateInvitationCodeRspVO;
+import com.yinlihupo.enlish.service.model.vo.user.CreateUserReqVO;
+import com.yinlihupo.enlish.service.model.vo.user.FindUserListRepVO;
+import com.yinlihupo.enlish.service.model.vo.user.FindUserListRspVO;
+import com.yinlihupo.enlish.service.service.RoleService;
+import com.yinlihupo.enlish.service.service.UserService;
+import com.yinlihupo.framework.biz.operationlog.aspect.ApiOperationLog;
+import com.yinlihupo.framework.common.response.PageResponse;
+import com.yinlihupo.framework.common.response.Response;
+import jakarta.annotation.Resource;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@RequestMapping("/admin/")
+@RestController
+public class AdminController {
+
+    @Resource
+    private UserService userService;
+    @Resource
+    private PasswordEncoder passwordEncoder;
+    @Resource
+    private RoleService roleService;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @PostMapping("user/list")
+    @ApiOperationLog(description = "查询用户列表")
+    public PageResponse<FindUserListRspVO> listUser(@RequestBody FindUserListRepVO findUserListRepVO) {
+        Integer userTotal = userService.findUserTotal();
+        if (userTotal == null || userTotal == 0) {
+            throw new RuntimeException("暂无用户");
+        }
+
+        Integer page = findUserListRepVO.getPage();
+        Integer pageSize = findUserListRepVO.getPageSize();
+        String name = findUserListRepVO.getName();
+        List<UserDO> usersList = userService.findUsersList(page, pageSize, name.isEmpty() ? null : name);
+        Map<Long, RoleDO> userId2RoleMap = roleService.findUserId2RoleMap(usersList.stream().map(UserDO::getId).toList());
+        return PageResponse.success(usersList.stream().map(userDO -> FindUserListRspVO.builder()
+                .id(userDO.getId())
+                .name(userDO.getName())
+                .phone(userDO.getPhone())
+                .roleName(userId2RoleMap.get(userDO.getId()).getRoleName())
+                .build()).toList(), page, userTotal, pageSize);
+    }
+
+    @PostMapping("user/create")
+    public Response<Void> createUser(@RequestBody CreateUserReqVO createUserReqVO) {
+        String name = createUserReqVO.getName();
+        String phone = createUserReqVO.getPhone();
+        String password = createUserReqVO.getPassword();
+
+        userService.createUser(UserDO.builder()
+                .name(name)
+                .phone(phone)
+                .password(passwordEncoder.encode(password))
+                .build());
+
+        return Response.success();
+    }
+
+    @PostMapping("user/create/invitation/code")
+    @ApiOperationLog(description = "创建邀请码")
+    public Response<CreateInvitationCodeRspVO> createInvitationCode(@RequestBody CreateInvitationCodeReqVO createInvitationCodeReqVO) {
+
+        String code = String.valueOf(new Random().nextInt(1000000));
+        Integer limit = createInvitationCodeReqVO.getLimit();
+        Integer expire = createInvitationCodeReqVO.getExpire();
+
+        redisTemplate.opsForValue().set(UserRedisConstants.buildUserInvitationCode(code), limit);
+        redisTemplate.expire(UserRedisConstants.buildUserInvitationCode(code), expire, TimeUnit.DAYS);
+
+        return Response.success(CreateInvitationCodeRspVO.builder().invitationCode(code).build());
+    }
+}

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

@@ -42,25 +42,28 @@ public class ExamWordsController {
 
     @PostMapping("generate")
     public void generateFeltExamWords(@RequestBody GenerateExamWordsReqVO generateExamWordsReqVO, HttpServletResponse response) {
-        Integer gradeId = generateExamWordsReqVO.getGradeId();
-        Integer level = generateExamWordsReqVO.getLevel();
-        List<Integer> studentIds = generateExamWordsReqVO.getStudentIds();
-        if (studentIds == null || studentIds.isEmpty() || gradeId == null || level == null) {
+        Integer type = generateExamWordsReqVO.getType();
+        Integer studentId = generateExamWordsReqVO.getStudentId();
+        if (studentId == null) {
             throw new RuntimeException("参数错误");
         }
         try {
-            ExamWordsDO examWordsDO = examWordsService.generateExamWords(gradeId, level, studentIds);
+            ExamWordsDO examWordsDO = examWordsService.generateExamWords(studentId, type);
             if (examWordsDO == null || examWordsDO.getWordIds().isEmpty()) {
                 throw new RuntimeException("没有单词");
             }
+
             List<VocabularyBankDO> vocabularyBankDOS = vocabularyService.findVocabularyBankDOListById(examWordsDO.getWordIds());
             List<Word> assessmentWords = vocabularyBankDOS.stream().map(vocabularyBankDO -> Word.builder()
                     .id(vocabularyBankDO.getId())
                     .title(vocabularyBankDO.getWord())
-                    .definition(vocabularyBankDO.getDefinition())
+                    .definition(vocabularyBankDO.getDefinition().length() > 6 ? vocabularyBankDO.getDefinition().substring(0, 6) : vocabularyBankDO.getDefinition())
                     .build()).toList();
-
-            List<StudentDetail> studentDetailList = studentService.getStudentDetailList(studentIds);
+            // bug: 获取单词后，单词的id会乱序、 需要重新更新考试记录中的 id
+            examWordsDO.setWordIds(assessmentWords.stream().map(Word::getId).toList());
+            examWordsService.updateExamWordsWordIdsOrder(examWordsDO);
+            log.info("生成试卷成功 {}", examWordsDO);
+            List<StudentDetail> studentDetailList = studentService.getStudentDetailList(Collections.singletonList(studentId));
             List<Map<String, Object>> maps = studentDetailList.stream().map(studentDetail -> {
                 Map<String, Object> data = new HashMap<>();
                 data.put("examId", examWordsDO.getId());
@@ -69,10 +72,16 @@ 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();
 
-            WordExportUtil.generateExamWords(maps, response, templateWordPath);
+            WordExportUtil.generateExamWords(maps, examWordsDO, response, templateWordPath);
 
         } catch (Exception e) {
 
@@ -104,18 +113,23 @@ public class ExamWordsController {
     PageResponse<ExamWordsResultRspVO> getExamWordsResult(@RequestBody ExamWordsResultReqVO examWordsResultReqVO) {
         Integer page = examWordsResultReqVO.getPage();
         Integer size = examWordsResultReqVO.getSize();
+        Integer classId = examWordsResultReqVO.getClassId();
+        Integer gradeId = examWordsResultReqVO.getGradeId();
+        String studentName = examWordsResultReqVO.getStudentName();
         Integer total = examWordsJudgeService.getExamWordsJudgeResultCount();
-        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(page, size);
+        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(page, size, classId, gradeId, studentName);
         List<ExamWordsResultRspVO> list = examWordsJudgeResult.stream().map(examWordsJudgeResultDO -> ExamWordsResultRspVO
                 .builder()
                 .id(examWordsJudgeResultDO.getId())
                 .studentId(examWordsJudgeResultDO.getStudentId())
+                .studentName(examWordsJudgeResultDO.getStudentId() != null ? studentService.getStudentById(examWordsJudgeResultDO.getStudentId()).getName() : "")
+                .examWordsTitle(examWordsJudgeResultDO.getExamWordsId() != null ? examWordsService.getExamWordsDOById(examWordsJudgeResultDO.getExamWordsId()).getTitle() : "")
                 .examWordsId(examWordsJudgeResultDO.getExamWordsId())
                 .startDate(examWordsJudgeResultDO.getStartDate())
                 .correctWordCount(examWordsJudgeResultDO.getCorrectWordCount())
                 .wrongWordCount(examWordsJudgeResultDO.getWrongWordCount())
                 .isFinished(examWordsJudgeResultDO.getIsFinished())
-                .errorMsg(examWordsJudgeResultDO.getErrorMsg())
+                .msg(examWordsJudgeResultDO.getMsg())
                 .build()
         ).toList();
         return PageResponse.success(list, page, total, size);
@@ -134,7 +148,7 @@ public class ExamWordsController {
                 .correctWordCount(examWordsJudgeResultDO.getCorrectWordCount())
                 .wrongWordCount(examWordsJudgeResultDO.getWrongWordCount())
                 .isFinished(examWordsJudgeResultDO.getIsFinished())
-                .errorMsg(examWordsJudgeResultDO.getErrorMsg())
+                .errorMsg(examWordsJudgeResultDO.getMsg())
                 .correctWordIds(examWordsJudgeResultDO.getCorrectWordIds())
                 .wrongWordIds(examWordsJudgeResultDO.getWrongWordIds())
                 .build();

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

@@ -1,22 +1,27 @@
 package com.yinlihupo.enlish.service.controller;
 
+import com.yinlihupo.enlish.service.constant.LessonPlanConstant;
 import com.yinlihupo.enlish.service.domain.dataobject.LessonPlansDO;
-import com.yinlihupo.enlish.service.model.vo.plan.AddLessonPlanReqVO;
-import com.yinlihupo.enlish.service.model.vo.plan.DownLoadLessonPlanReqVO;
+import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
+import com.yinlihupo.enlish.service.model.vo.plan.*;
 import com.yinlihupo.enlish.service.service.LessonPlansService;
+import com.yinlihupo.enlish.service.utils.TTSUtil;
 import com.yinlihupo.enlish.service.utils.WordExportUtil;
 import com.yinlihupo.framework.biz.operationlog.aspect.ApiOperationLog;
+import com.yinlihupo.framework.common.response.PageResponse;
 import com.yinlihupo.framework.common.response.Response;
 import com.yinlihupo.framework.common.util.JsonUtils;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
@@ -28,8 +33,13 @@ public class LessonPlanController {
     @Resource
     private LessonPlansService lessonPlanService;
 
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
     @Resource(name = "taskExecutor")
     private Executor taskExecutor;
+    @Resource
+    private TTSUtil ttsUtil;
 
     @Value("${templates.plan.weekday}")
     private String planWeekday;
@@ -41,8 +51,12 @@ 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));
+            if (redisTemplate.opsForValue().get(LessonPlanConstant.buildGeneratePlanContent(studentId)) != null) {
+                throw new RuntimeException("学案正在生成，请耐心等待");
+            }
+            taskExecutor.execute(() -> lessonPlanService.generateLessonPlans(studentId, unitId, wordSize));
             return Response.success("生成学案成功，请等待 10 分钟");
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -59,13 +73,63 @@ public class LessonPlanController {
         try {
             Map<String, Object> map = JsonUtils.parseMap(lessonPlanById.getContentDetails(), String.class, Object.class);
             if (!lessonPlanById.getTitle().contains("复习")) {
-                WordExportUtil.generateLessonPlanDocx(map, lessonPlanById.getTitle(), response, planWeekday, true);
+                WordExportUtil.generateLessonPlanDocx(map, lessonPlanById, response, planWeekday, true);
             } else {
-                WordExportUtil.generateLessonPlanDocx(map, lessonPlanById.getTitle(), response, planWeekend, false);
+                WordExportUtil.generateLessonPlanDocx(map, lessonPlanById, response, planWeekend, false);
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
     }
+
+    @PostMapping("word/voice")
+    @ApiOperationLog(description = "获取单词")
+    public Response<FindWordVoiceRspVO> findPlanWordVoice(@RequestBody FindWordVoiceReqVO findWordVoiceReqVO) {
+        Integer id = findWordVoiceReqVO.getPlanId();
+        LessonPlansDO lessonPlanById = lessonPlanService.findLessonPlanById(id);
+        try {
+            Map<String, Object> map = JsonUtils.parseMap(lessonPlanById.getContentDetails(), String.class, Object.class);
+            Object syncVocabList = map.get("syncVocabList");
+            List<VocabularyBankDO> list = JsonUtils.parseList(JsonUtils.toJsonString(syncVocabList), VocabularyBankDO.class);
+            List<String> words = list.stream().map(VocabularyBankDO::getWord).toList();
+
+            return Response.success(FindWordVoiceRspVO.builder().words(words).build());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Response.fail("获取单词失败");
+        }
+    }
+
+    @PostMapping("word/voice/tts")
+    public void findPlanWordVoiceTTS(@RequestBody FindWordTTSVoiceReqVO findWordVoiceReqVO, HttpServletResponse response) {
+        ttsUtil.generateWordVoice(findWordVoiceReqVO.getText(), response);
+    }
+
+    @PostMapping("check")
+    @ApiOperationLog(description = "检测学案是否在生成")
+    public Response<String> checkLessonPlan(@RequestBody FindIsGeneratePlanReqVO findIsGeneratePlanReqVO) {
+        Integer studentId = findIsGeneratePlanReqVO.getStudentId();
+        String key = LessonPlanConstant.buildGeneratePlanContent(studentId);
+        if (redisTemplate.opsForValue().get(key) != null) {
+            return Response.fail();
+        }
+        return Response.success("学案生成完成");
+    }
+
+    @PostMapping("student/list")
+    @ApiOperationLog(description = "查询学生学案")
+    public Response<FindPlanStudentListRspVO> findStudentPlans(@RequestBody FindPlanStudentReqVO findPlanStudentReqVO) {
+        List<LessonPlansDO> lessonPlansDOS = lessonPlanService.findLessonPlansByStudentId(findPlanStudentReqVO.getStudentId());
+        List<LessonPlanItem> list = lessonPlansDOS.stream().map(lessonPlansDO -> LessonPlanItem
+                .builder()
+                .id(lessonPlansDO.getId())
+                .isFinished(0)
+                .title(lessonPlansDO.getTitle())
+                .build())
+                .toList();
+
+        return Response.success(FindPlanStudentListRspVO.builder().lessonPlanItems(list).build());
+    }
+
 }

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

@@ -0,0 +1,60 @@
+package com.yinlihupo.enlish.service.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.yinlihupo.enlish.service.model.vo.login.LoginReqVO;
+import com.yinlihupo.enlish.service.model.vo.login.VerificationCodeReqVO;
+import com.yinlihupo.enlish.service.service.LoginService;
+import com.yinlihupo.framework.biz.operationlog.aspect.ApiOperationLog;
+import com.yinlihupo.framework.common.response.Response;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/login/")
+@RestController
+@Slf4j
+public class LoginController {
+
+    @Resource
+    private LoginService loginService;
+
+    @PostMapping("login")
+    @ApiOperationLog(description = "登录")
+    public Response<String> login(@RequestBody LoginReqVO loginReqVO) {
+        try {
+            loginService.login(loginReqVO.getPhone(), loginReqVO.getName(), loginReqVO.getPassword(), loginReqVO.getCode(), loginReqVO.getInvitationCode());
+            return Response.success(StpUtil.getTokenInfo().getTokenValue());
+        } catch (Exception e) {
+            log.error("注册或登录失败 {}", e.getMessage());
+            return Response.fail("注册或登录失败 " + e.getMessage());
+        }
+    }
+
+    @PostMapping("logout")
+    @ApiOperationLog(description = "登出")
+    public Response<Void> logout() {
+        try {
+            StpUtil.logout();
+            return Response.success();
+        } catch (Exception e) {
+            log.error("登出失败 {}", e.getMessage());
+            return Response.fail("登出失败 " + e.getMessage());
+        }
+    }
+
+    @PostMapping("sendVerificationCode")
+    @ApiOperationLog(description = "发送验证码")
+    public Response<Void> sendVerificationCode(@RequestBody VerificationCodeReqVO verificationCodeReqVO) {
+        try {
+            loginService.sendVerificationCode(verificationCodeReqVO.getPhone());
+            return Response.success();
+        } catch (Exception e) {
+            log.error("发送验证码失败 {}", e.getMessage());
+            return Response.fail("发送验证码失败 " + e.getMessage());
+        }
+    }
+
+}

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

@@ -4,6 +4,8 @@ package com.yinlihupo.enlish.service.controller;
 import com.yinlihupo.enlish.service.domain.dataobject.ClassDO;
 import com.yinlihupo.enlish.service.domain.dataobject.GradeDO;
 import com.yinlihupo.enlish.service.domain.dataobject.StudentDO;
+import com.yinlihupo.enlish.service.model.bo.StudentDetail;
+import com.yinlihupo.enlish.service.model.bo.exam.WordMasteryDetail;
 import com.yinlihupo.enlish.service.model.vo.student.*;
 import com.yinlihupo.enlish.service.service.ClassService;
 import com.yinlihupo.enlish.service.service.GradeService;
@@ -46,6 +48,8 @@ public class StudentController {
                 .id(studentDO.getId())
                 .name(studentDO.getName())
                 .classId(studentDO.getClassId())
+                .className(classService.findClassById(studentDO.getClassId()).getTitle())
+                .gradeName(gradeService.findByClassId(studentDO.getGradeId()).getTitle())
                 .gradeId(studentDO.getGradeId())
                 .build()).toList();
 
@@ -60,12 +64,13 @@ public class StudentController {
         StudentDO studentById = studentService.getStudentById(studentId);
         ClassDO classById = classService.findClassById(studentById.getClassId());
         GradeDO byClassId = gradeService.findByClassId(studentById.getGradeId());
-
+        GradeDO actualGradeById = gradeService.findByClassId(studentById.getActualGradeId());
         FindStudentDetailRspVO findStudentDetailRspVO = FindStudentDetailRspVO.builder()
                 .id(studentById.getId())
                 .name(studentById.getName())
                 .className(classById.getTitle())
                 .gradeName(byClassId.getTitle())
+                .actualGrade(actualGradeById != null ? actualGradeById.getTitle() : "")
                 .build();
 
         return Response.success(findStudentDetailRspVO);
@@ -84,4 +89,28 @@ public class StudentController {
         studentService.deleteStudent(deleteStudentReqVO.getStudentId());
         return Response.success();
     }
+
+    @PostMapping("analyze")
+    @ApiOperationLog(description = "学生学习分析")
+    public Response<String> analyzeStudentStudy(@RequestBody AnalyzeStudentStudyReqVO analyzeStudentStudyReqVO) {
+        String analyzeStudentStudy = studentService.analyzeStudentStudy(analyzeStudentStudyReqVO.getStudentId());
+        return Response.success(analyzeStudentStudy);
+    }
+
+    @PostMapping("mastery/detail")
+    @ApiOperationLog(description = "查询学生单词掌握详情")
+    public Response<List<FindStudentMasteryDetailRspVO>> findStudentMasteryDetail(@RequestBody FindStudentMasteryDetailReqVO findStudentMasteryDetailReqVO) {
+        Integer studentId = findStudentMasteryDetailReqVO.getStudentId();
+        List<WordMasteryDetail> studentWordMasteryDetail = studentService.findStudentWordMasteryDetail(studentId);
+
+        List<FindStudentMasteryDetailRspVO> list = studentWordMasteryDetail.stream().map(wordMasteryDetail -> FindStudentMasteryDetailRspVO.builder()
+                .word(wordMasteryDetail.getWord())
+                .reviewCount(wordMasteryDetail.getReviewCount())
+                .memoryStrength(wordMasteryDetail.getMemoryStrength())
+                .updateTime(wordMasteryDetail.getUpdate_time())
+                .build()
+        ).toList();
+
+        return Response.success(list);
+    }
 }

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

@@ -0,0 +1,55 @@
+package com.yinlihupo.enlish.service.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+import com.yinlihupo.enlish.service.model.vo.user.FindUserInfoRspVO;
+import com.yinlihupo.enlish.service.model.vo.user.UpdateUserInfoReqVO;
+import com.yinlihupo.enlish.service.service.UserService;
+import com.yinlihupo.framework.biz.operationlog.aspect.ApiOperationLog;
+import com.yinlihupo.framework.common.response.Response;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user/")
+@Slf4j
+public class UserController {
+
+    @Resource
+    private UserService userService;
+
+    @PostMapping("info")
+    public Response<FindUserInfoRspVO> info() {
+
+        UserDO user = userService.findUser();
+        FindUserInfoRspVO findUserInfoRspVO = FindUserInfoRspVO.builder()
+                .id(user.getId())
+                .name(user.getName())
+                .build();
+        return Response.success(findUserInfoRspVO);
+
+    }
+
+    @PostMapping("update-user-info")
+    @ApiOperationLog(description = "修改用户信息")
+    public Response<String> updatePassword(@RequestBody UpdateUserInfoReqVO updateUserInfoReqVO) {
+        try {
+            String code = updateUserInfoReqVO.getCode();
+            String newPassword = updateUserInfoReqVO.getNewPassword();
+            String phone = updateUserInfoReqVO.getPhone();
+            String name = updateUserInfoReqVO.getName();
+            userService.updateUserInfo(newPassword, code, phone, name);
+
+            StpUtil.logout();
+
+            return Response.success();
+        } catch (Exception e) {
+            log.error("修改密码失败 {}", e.getMessage());
+            return Response.fail(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/dataobject/ExamWordsDO.java

@@ -19,6 +19,8 @@ public class ExamWordsDO {
 
     private Integer level;
 
+    private Integer type;
+
     private String title;
 
     private LocalDateTime createdAt;

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/ExamWordsJudgeResultDO.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Data
 @Builder
 public class ExamWordsJudgeResultDO {
+
     private Integer id;
 
     private String ansSheetPath;
@@ -33,6 +34,6 @@ public class ExamWordsJudgeResultDO {
 
     private List<Integer> wrongWordIds;
 
-    private String errorMsg;
+    private String msg;
 
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/PlanExamDO.java

@@ -0,0 +1,21 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class PlanExamDO {
+
+    private Integer id;
+
+    private Integer planId;
+
+    private Integer examId;
+
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/RoleDO.java

@@ -0,0 +1,28 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class RoleDO {
+
+    private Long id;
+
+    private String roleName;
+
+    private String roleKey;
+
+    private Integer status;
+
+    private Date createTime;
+
+    private Integer isDeleted;
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/StudentDO.java

@@ -21,6 +21,8 @@ public class StudentDO {
 
     private Integer gradeId;
 
+    private Integer actualGradeId;
+
     private Integer isDeleted;
 
     private LocalDateTime startTime;

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/StudentStageLearningRemarkDO.java

@@ -0,0 +1,23 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class StudentStageLearningRemarkDO {
+    private Integer id;
+
+    private Integer studentId;
+
+    private LocalDateTime createTime;
+
+    private String commentContent;
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/UserDO.java

@@ -0,0 +1,25 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class UserDO {
+    private Long id;
+
+    private String password;
+
+    private String name;
+
+    private String openid;
+
+    private String phone;
+
+    private String email;
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/dataobject/UserRoleRelDO.java

@@ -0,0 +1,23 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class UserRoleRelDO {
+    private Long id;
+
+    private Long userId;
+
+    private Long roleId;
+
+    private Date createTime;
+
+}

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

@@ -7,4 +7,6 @@ public interface ExamWordsDOMapper {
     int insert(ExamWordsDO record);
 
     ExamWordsDO selectById(Integer id);
+
+    void updateWordIdsOrder(ExamWordsDO examWordsDO);
 }

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

@@ -11,7 +11,7 @@ public interface ExamWordsJudgeResultDOMapper {
 
     List<ExamWordsJudgeResultDO> selectUnfinishedExamWordsJudgeResultDOList(int count);
 
-    int updateErrorMsg(@Param("id") Integer id, @Param("errorMsg") String errorMsg);
+    int updateMsg(@Param("id") Integer id, @Param("msg") String msg);
 
     int updateExamWordsJudgeResultDO(@Param("examWordsJudgeResultDO") ExamWordsJudgeResultDO examWordsJudgeResultDO);
 
@@ -19,7 +19,13 @@ public interface ExamWordsJudgeResultDOMapper {
 
     Integer selectCount();
 
+    Integer selectUnfinishedCount();
+
     ExamWordsJudgeResultDO selectDetailById(@Param("id") Integer id);
 
     List<ExamWordsJudgeResultDO> selectByStudentId(@Param("studentId") Integer studentId);
+
+    List<ExamWordsJudgeResultDO> selectByStudentIdAndLimitTime(@Param("studentId") Integer studentId);
+
+    List<ExamWordsJudgeResultDO> selectByPageAndStudentIds(@Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize, @Param("studentIds") List<Integer> studentIds);
 }

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

@@ -11,6 +11,8 @@ public interface GradeUnitDOMapper {
 
     GradeUnitDO selectByUnitId(@Param("unitId") Integer unitId);
 
+    List<GradeUnitDO> selectByUnitIds(@Param("unitIds") List<Integer> unitIds);
+
     int insert(GradeUnitDO record);
 
     int deleteByUnitId(@Param("unitId") Integer unitId);

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

@@ -14,4 +14,6 @@ public interface LessonPlansDOMapper {
     List<LessonPlansDO> findLessonPlansByStudentId(@Param("ids") List<Integer> ids);
 
     LessonPlansDO selectByLessonId(@Param("lessonId") Integer lessonId);
+
+    List<LessonPlansDO> selectByStudentId(@Param("studentId") Integer studentId);
 }

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

@@ -0,0 +1,9 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.PlanExamDO;
+
+public interface PlanExamDOMapper {
+    void insert(PlanExamDO record);
+
+    PlanExamDO selectByExamId(Integer examId);
+}

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

@@ -0,0 +1,13 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.RoleDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RoleDOMapper {
+
+    List<RoleDO> selectAll();
+
+    List<RoleDO> selectByIds(@Param("ids") List<Long> ids);
+}

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

@@ -21,4 +21,12 @@ public interface StudentDOMapper {
     void deleteById(Integer id);
 
     int selectStudentCountByClassId(@Param("classId") Integer classId);
+
+    int updateStudentActualGradeId(@Param("studentId") Integer studentId, @Param("gradeId") Integer gradeId);
+
+    List<StudentDO> selectStudentDOListByClassId(@Param("classId") Integer classId);
+
+    List<StudentDO> selectStudentDOListByGradeId(@Param("gradeId") Integer gradeId);
+
+    List<StudentDO> selectStudentDOListByName(@Param("name") String name);
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface StudentExamWordsDOMapper {
 
-    int insertStudentsExam(@Param("studentIds") List<Integer> studentIds, @Param("examWordsId") Integer examWordsId);
+    int insertStudentsExam(@Param("studentId") Integer studentId, @Param("examWordsId") Integer examWordsId);
 
     StudentExamWordsDO selectByStudentIdAndExamWordsId(@Param("studentId") Integer studentId, @Param("examWordsId") Integer examWordsId);
 

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

@@ -0,0 +1,8 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.StudentStageLearningRemarkDO;
+
+public interface StudentStageLearningRemarkDOMapper {
+
+    void insert(StudentStageLearningRemarkDO studentStageLearningRemarkDO);
+}

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

@@ -25,4 +25,6 @@ public interface UnitDOMapper {
     List<UnitDO> selectUnitDOList(@Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize);
 
     Integer selectUnitDOListCount();
+
+    List<UnitDO> selectByUnitName(@Param("unitName") String unitName);
 }

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

@@ -0,0 +1,25 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserDOMapper {
+
+    UserDO selectByPhone(String phone);
+
+    void insert(UserDO userDO);
+
+    void updatePassword(@Param("id") Long id, @Param("password") String password);
+
+    void updateUserInfo(@Param("id") Long id, @Param("name") String name, @Param("password") String password, @Param("phone") String phone);
+
+    UserDO selectById(Long id);
+
+    List<UserDO> selectUserDOList(@Param("name") String name, @Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize);
+
+    int selectUserTotal();
+
+    void createUser(UserDO userDO);
+}

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

@@ -0,0 +1,13 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.UserRoleRelDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserRoleRelDOMapper {
+
+    List<UserRoleRelDO> selectAll();
+
+    List<UserRoleRelDO> selectByUserIds(@Param("userIds")  List<Long> userIds);
+}

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

@@ -21,5 +21,11 @@ public interface VocabularyBankDOMapper {
 
     List<VocabularyBankDO> selectVocabularyBankListSelfCheck(@Param("gradeId") Integer gradeId, @Param("studentId") Integer studentId, @Param("ids") List<Integer> ids, @Param("wordCount") Integer wordCount);
 
+    List<VocabularyBankDO> selectVocabularyBankListByGradeIdRandom(@Param("gradeId") Integer gradeId, @Param("wordCount") Integer wordCount);
+
     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/domain/mapper/WordMasteryLogDOMapper.java

@@ -16,4 +16,12 @@ public interface WordMasteryLogDOMapper {
     int batchUpdateStudentMastery(@Param("wordMasteryLogDOs") List<WordMasteryLogDO> wordMasteryLogDOs);
 
     int selectStudentStrengthCount(@Param("studentId") Integer studentId);
+
+    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/enums/ResponseCodeEnum.java

@@ -13,7 +13,7 @@ public enum ResponseCodeEnum implements BaseExceptionInterface {
     // ----------- 通用异常状态码 -----------
     SYSTEM_ERROR("AUTH-10000", "出错啦，后台小哥正在努力修复中..."),
     PARAM_NOT_VALID("AUTH-10001", "参数错误"),
-
+    NOT_LOGIN("AUTH-10002", "请先登录")
     // ----------- 业务异常状态码 -----------
 
     ;

enlish-service/src/main/java/com/yinlihupo/enlish/service/exception/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.yinlihupo.enlish.service.exception;
 
 
+import cn.dev33.satoken.exception.NotLoginException;
 import com.yinlihupo.enlish.service.enums.ResponseCodeEnum;
 import com.yinlihupo.framework.common.exception.BizException;
 import com.yinlihupo.framework.common.response.Response;
@@ -96,4 +97,11 @@ public class GlobalExceptionHandler {
         log.error("{} request error, ", request.getRequestURI(), e);
         return Response.fail(ResponseCodeEnum.SYSTEM_ERROR);
     }
+
+    @ExceptionHandler({ NotLoginException.class })
+    @ResponseBody
+    public Response<Object> handleNotLoginException(HttpServletRequest request, NotLoginException e) {
+        log.warn("{} request error, ", request.getRequestURI(), e);
+        return Response.fail(ResponseCodeEnum.NOT_LOGIN);
+    }
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/Sentence.java

@@ -0,0 +1,27 @@
+package com.yinlihupo.enlish.service.model.bo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class Sentence {
+
+    @JsonProperty("target_word")
+    private String targetWord;
+    @JsonProperty("grade_level")
+    private String gradeLevel;
+    @JsonProperty("question")
+    private String question;
+    @JsonProperty("chinese_clue")
+    private String chineseClue;
+    @JsonProperty("correct_answer")
+    private String correctAnswer;
+    @JsonProperty("grammar_point")
+    private String grammarPoint;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/exam/ActionType.java

@@ -0,0 +1,9 @@
+package com.yinlihupo.enlish.service.model.bo.exam;
+
+public enum ActionType {
+    PASS,              // 保持当前进度
+    UPGRADE,           // 升级
+    DOWNGRADE,         // 降级回填
+    STAY_AND_REVIEW,   // 保持年级但进入复习模式
+    TRIGGER_RETEST     // 触发熔断二测
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/exam/DiagnosisResult.java

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.bo.exam;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class DiagnosisResult {
+
+    int determinedLevel;   // 系统判定的真实等级
+    ActionType actionType; // 建议的系统动作
+    String message;        // 展示给用户的文案
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/exam/ExamWordsJudgeResultDetail.java

@@ -0,0 +1,28 @@
+package com.yinlihupo.enlish.service.model.bo.exam;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class ExamWordsJudgeResultDetail {
+
+    private Integer correctWordCount;
+
+    private Integer wrongWordCount;
+
+    private LocalDateTime startDate;
+
+    private List<String> correctWords;
+
+    private List<String> wrongWords;
+
+    private String msg;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/exam/WordMasteryDetail.java

@@ -0,0 +1,23 @@
+package com.yinlihupo.enlish.service.model.bo.exam;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class WordMasteryDetail {
+
+    private String word;
+
+    private Integer reviewCount;
+
+    private Double memoryStrength;
+
+    private LocalDateTime update_time;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/exam/ZoneStats.java

@@ -0,0 +1,19 @@
+package com.yinlihupo.enlish.service.model.bo.exam;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class ZoneStats {
+
+    private int gradeId;
+    private int totalCount;
+    private int correctCount;
+    private double accuracy;
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/admin/CreateInvitationCodeReqVO.java

@@ -0,0 +1,18 @@
+package com.yinlihupo.enlish.service.model.vo.admin;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class CreateInvitationCodeReqVO {
+
+    // 限制人数
+    private Integer limit;
+    // 有效期
+    private Integer expire;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/admin/CreateInvitationCodeRspVO.java

@@ -0,0 +1,16 @@
+package com.yinlihupo.enlish.service.model.vo.admin;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class CreateInvitationCodeRspVO {
+
+    private String invitationCode;
+
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultReqVO.java

@@ -13,4 +13,8 @@ public class ExamWordsResultReqVO {
 
     private Integer page;
     private Integer size;
+
+    private Integer classId;
+    private Integer gradeId;
+    private String studentName;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultRspVO.java

@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
 @Data
 @Builder
 public class ExamWordsResultRspVO {
+
     private Integer id;
 
     private String ansSheetPath;
@@ -20,6 +21,10 @@ public class ExamWordsResultRspVO {
 
     private Integer examWordsId;
 
+    private String studentName;
+
+    private String examWordsTitle;
+
     private Integer correctWordCount;
 
     private Integer wrongWordCount;
@@ -28,5 +33,5 @@ public class ExamWordsResultRspVO {
 
     private LocalDateTime startDate;
 
-    private String errorMsg;
+    private String msg;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/GenerateExamWordsReqVO.java

@@ -14,7 +14,6 @@ import java.util.List;
 @Builder
 public class GenerateExamWordsReqVO {
 
-    private Integer gradeId;
-    private Integer level;
-    private List<Integer> studentIds;
+    private Integer type;
+    private Integer studentId;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/login/LoginReqVO.java

@@ -0,0 +1,19 @@
+package com.yinlihupo.enlish.service.model.vo.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class LoginReqVO {
+
+    private String phone;
+    private String name;
+    private String password;
+    private String code;
+    private String invitationCode;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/login/VerificationCodeReqVO.java

@@ -0,0 +1,15 @@
+package com.yinlihupo.enlish.service.model.vo.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class VerificationCodeReqVO {
+
+    private String phone;
+}

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/plan/FindIsGeneratePlanReqVO.java

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

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

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.plan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindPlanStudentListRspVO {
+
+    List<LessonPlanItem> lessonPlanItems;
+}

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

@@ -0,0 +1,14 @@
+package com.yinlihupo.enlish.service.model.vo.plan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindPlanStudentReqVO {
+    private Integer studentId;
+}

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

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.plan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindWordTTSVoiceReqVO {
+
+    String text;
+    String voice;
+    String format;
+}

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

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

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

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.plan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindWordVoiceRspVO {
+
+    private List<String> words;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/AddStudentReqVO.java

@@ -1,5 +1,6 @@
 package com.yinlihupo.enlish.service.model.vo.student;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,5 +17,6 @@ public class AddStudentReqVO {
     private String name;
     private Integer classId;
     private Integer gradeId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/AnalyzeStudentStudyReqVO.java

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

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/FindStudentDetailRspVO.java

@@ -15,4 +15,5 @@ public class FindStudentDetailRspVO {
     private String name;
     private String className;
     private String gradeName;
+    private String actualGrade;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/FindStudentMasteryDetailReqVO.java

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

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/FindStudentMasteryDetailRspVO.java

@@ -0,0 +1,22 @@
+package com.yinlihupo.enlish.service.model.vo.student;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindStudentMasteryDetailRspVO {
+    private String word;
+
+    private Integer reviewCount;
+
+    private Double memoryStrength;
+
+    private LocalDateTime updateTime;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/StudentItemRspVO.java

@@ -15,4 +15,6 @@ public class StudentItemRspVO {
     private String name;
     private Integer classId;
     private Integer gradeId;
+    private String className;
+    private String gradeName;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/user/CreateUserReqVO.java

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class CreateUserReqVO {
+
+    private String name;
+    private String phone;
+    private String password;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/user/FindUserInfoRspVO.java

@@ -0,0 +1,16 @@
+package com.yinlihupo.enlish.service.model.vo.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindUserInfoRspVO {
+
+    private Long id;
+    private String name;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/user/FindUserListRepVO.java

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindUserListRepVO {
+
+    private Integer page;
+    private Integer pageSize;
+    private String name;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/user/FindUserListRspVO.java

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.model.vo.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindUserListRspVO {
+    private Long id;
+    private String name;
+    private String phone;
+    private String roleName;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/user/UpdateUserInfoReqVO.java

@@ -0,0 +1,18 @@
+package com.yinlihupo.enlish.service.model.vo.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class UpdateUserInfoReqVO {
+
+    private String newPassword;
+    private String name;
+    private String phone;
+    private String code;
+}

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/ExamWordsJudgeService.java

@@ -9,10 +9,12 @@ public interface ExamWordsJudgeService {
 
     void judgeExamWords(int count);
 
-    List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize);
+    List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize, Integer classId, Integer gradeId, String studentName);
 
     Integer getExamWordsJudgeResultCount();
 
+    Integer getExamUnfinishedCount();
+
     ExamWordsJudgeResultDO getExamWordsJudgeResultDOById(Integer id);
 
     List<ExamWordsJudgeResultDO> getStudentExamWordsResultList(Integer studentId);

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

@@ -8,7 +8,11 @@ import java.util.List;
 
 public interface ExamWordsService {
 
-    ExamWordsDO generateExamWords(Integer gradeId, Integer level, List<Integer> studentIds);
+    ExamWordsDO generateExamWords(Integer studentId, Integer type);
 
     int saveExamWordsPngToDbAndLocal(MultipartFile file);
+
+    void updateExamWordsWordIdsOrder(ExamWordsDO examWordsDO);
+
+    ExamWordsDO getExamWordsDOById(Integer id);
 }

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

@@ -5,9 +5,11 @@ 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);
 
     LessonPlansDO findLessonPlanById(Integer id);
+
+    List<LessonPlansDO> findLessonPlansByStudentId(Integer studentId);
 }

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

@@ -0,0 +1,8 @@
+package com.yinlihupo.enlish.service.service;
+
+public interface LoginService {
+
+    void login(String phone, String name, String reqPassword, String reqCode, String invitationCode);
+
+    void sendVerificationCode(String phone);
+}

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

@@ -0,0 +1,13 @@
+package com.yinlihupo.enlish.service.service;
+
+import com.yinlihupo.enlish.service.domain.dataobject.RoleDO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RoleService {
+
+    void pushRolePermission2Redis();
+
+    Map<Long, RoleDO> findUserId2RoleMap(List<Long> userIds);
+}

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

@@ -3,6 +3,7 @@ package com.yinlihupo.enlish.service.service;
 
 import com.yinlihupo.enlish.service.domain.dataobject.StudentDO;
 import com.yinlihupo.enlish.service.model.bo.StudentDetail;
+import com.yinlihupo.enlish.service.model.bo.exam.WordMasteryDetail;
 import com.yinlihupo.enlish.service.model.vo.student.AddStudentReqVO;
 
 import java.util.List;
@@ -20,4 +21,8 @@ public interface StudentService {
     void addStudent(AddStudentReqVO addStudentReqVO);
 
     void deleteStudent(Integer studentId);
+
+    String analyzeStudentStudy(Integer studentId);
+
+    List<WordMasteryDetail> findStudentWordMasteryDetail(Integer studentId);
 }

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

@@ -0,0 +1,18 @@
+package com.yinlihupo.enlish.service.service;
+
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+
+import java.util.List;
+
+public interface UserService {
+
+    UserDO findUser();
+
+    List<UserDO> findUsersList(int page, int limit, String name);
+
+    Integer findUserTotal();
+
+    void createUser(UserDO userDO);
+
+    void updateUserInfo(String password, String reqCode, String phone, String name);
+}

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/exam/ExamWordsServiceImpl.java

@@ -1,30 +1,31 @@
 package com.yinlihupo.enlish.service.service.exam;
 
-import com.yinlihupo.enlish.service.domain.dataobject.ExamWordsDO;
-import com.yinlihupo.enlish.service.domain.dataobject.ExamWordsJudgeResultDO;
-import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
+import com.yinlihupo.enlish.service.constant.ExamWordsConstant;
+import com.yinlihupo.enlish.service.domain.dataobject.*;
 import com.yinlihupo.enlish.service.domain.mapper.*;
 import com.yinlihupo.enlish.service.service.ExamWordsService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 @Slf4j
 public class ExamWordsServiceImpl implements ExamWordsService {
 
-    @Resource
-    private GradeUnitDOMapper gradeUnitDOMapper;
     @Resource
     private VocabularyBankDOMapper vocabularyBankDOMapper;
     @Resource
@@ -33,6 +34,11 @@ public class ExamWordsServiceImpl implements ExamWordsService {
     private StudentExamWordsDOMapper studentExamWordsDOMapper;
     @Resource
     private ExamWordsJudgeResultDOMapper examWordsJudgeResultDOMapper;
+    @Resource
+    private StudentDOMapper studentDOMapper;
+    @Resource
+    private UnitDOMapper unitDOMapper;
+
     @Value("${templates.count}")
     private Integer wordCount;
     @Value("${tmp.png}")
@@ -40,33 +46,121 @@ public class ExamWordsServiceImpl implements ExamWordsService {
 
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
-    public ExamWordsDO generateExamWords(Integer gradeId, Integer level, List<Integer> studentIds) {
+    public ExamWordsDO generateExamWords(Integer studentId, Integer type) {
 
-        List<Integer> unitIds = gradeUnitDOMapper.selectUnitIdsByGradeId(gradeId);
-        List<VocabularyBankDO> vocabularyBankDOS = new ArrayList<>();
-        int count = wordCount;
-        for (Integer unitId : unitIds) {
-            List<VocabularyBankDO> words = vocabularyBankDOMapper.selectVocabularyBankDOListByUnitId(unitId, 20);
-            vocabularyBankDOS.addAll(words);
-            count -= 20;
-            if (count <= 0) {
-                break;
+        ExamWordsDO examWordsDO;
+
+        if (type == ExamWordsConstant.EXAM_TYPE_BASELINE) {
+            log.info("生成摸底测试");
+            examWordsDO = generateBaselineExamWords(studentId);
+        } else if (type == ExamWordsConstant.EXAM_TYPE_MIDTERM) {
+            log.info("生成期中测试");
+            examWordsDO = generateMidtermExamWords(studentId);
+        } else  {
+            log.info("生成期末测试");
+            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;
+    }
+
+    private ExamWordsDO generateBaselineExamWords(Integer studentId) {
+        StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+
+        Integer gradeId = studentDO.getActualGradeId();
+
+        int zoneA = ExamWordsConstant.getZoneA(gradeId);
+        int zoneASize = ExamWordsConstant.ZONE_A_SIZE;
+        List<VocabularyBankDO> vocabularyBankDOS = new ArrayList<>(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneA, zoneASize));
+
+        int zoneB = ExamWordsConstant.getZoneB(gradeId);
+        int zoneBSize = ExamWordsConstant.ZONE_B_SIZE;
+        vocabularyBankDOS.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneB, zoneBSize));
+
+        int zoneC = ExamWordsConstant.getZoneC(gradeId);
+        int zoneCSize = ExamWordsConstant.ZONE_C_SIZE;
+        vocabularyBankDOS.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneC, zoneCSize));
+
+        int zoneD = ExamWordsConstant.getZoneD(gradeId);
+        int zoneDSize = ExamWordsConstant.ZONE_D_SIZE;
+        vocabularyBankDOS.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneD, zoneDSize));
+
+        int zoneE = ExamWordsConstant.getZoneE(gradeId);
+        int zoneESize = ExamWordsConstant.ZONE_E_SIZE;
+        vocabularyBankDOS.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneE, zoneESize));
+
+        int zoneF = ExamWordsConstant.getZoneF(gradeId);
+        int zoneFSize = ExamWordsConstant.ZONE_F_SIZE;
+        vocabularyBankDOS.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(zoneF, zoneFSize));
+
         ExamWordsDO examWordsDO = ExamWordsDO.builder()
                 .gradeId(gradeId)
-                .level(level)
-                .title(LocalDateTime.now() + "测试")
+                .level(1)
+                .type(ExamWordsConstant.EXAM_TYPE_BASELINE)
+                .title("摸低测试" + studentDO.getName())
                 .createdAt(LocalDateTime.now())
                 .wordIds(vocabularyBankDOS.stream().map(VocabularyBankDO::getId).toList())
                 .build();
 
+        return getExamWordsDO(studentId, examWordsDO);
+    }
+
+    private ExamWordsDO generateMidtermExamWords(Integer studentId) {
+        StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+        Integer gradeId = studentDO.getGradeId();
+        List<UnitDO> unitDOS = unitDOMapper.selectByUnitName(ExamWordsConstant.getGradeName(gradeId) + "上");
+        ExamWordsDO examWordsDO = getExamWordsDO(studentId, studentDO, gradeId, unitDOS, ExamWordsConstant.EXAM_TYPE_MIDTERM);
+        examWordsDO.setTitle("期中测试" + studentDO.getName());
+        return getExamWordsDO(studentId, examWordsDO);
+
+    }
+
+    private ExamWordsDO generateFinalExamWords(Integer studentId) {
+        StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+        Integer gradeId = studentDO.getGradeId();
+        List<UnitDO> unitDOS = unitDOMapper.selectByUnitName(ExamWordsConstant.getGradeName(gradeId));
+        ExamWordsDO examWordsDO = getExamWordsDO(studentId, studentDO, gradeId, unitDOS, ExamWordsConstant.EXAM_TYPE_FINAL);
+        examWordsDO.setTitle("期末测试" + studentDO.getName());
+        return getExamWordsDO(studentId, examWordsDO);
+    }
+
+    @NonNull
+    private ExamWordsDO getExamWordsDO(Integer studentId, StudentDO studentDO, Integer gradeId, List<UnitDO> unitDOS, Integer type) {
+        if (unitDOS.isEmpty()) {
+            throw new RuntimeException("没有找到对应的单元");
+        }
+        List<VocabularyBankDO> vocabularyBankDOS = vocabularyBankDOMapper.selectByUnitIds(unitDOS.stream().map(UnitDO::getId).toList());
+
+        ExamWordsDO examWordsDO = ExamWordsDO.builder()
+                .gradeId(gradeId)
+                .level(1)
+                .type(type)
+                .title(studentDO.getName())
+                .createdAt(LocalDateTime.now())
+                .wordIds(vocabularyBankDOS.stream().map(VocabularyBankDO::getId).toList())
+                .build();
+
+        return getExamWordsDO(studentId, examWordsDO);
+    }
+
+    @NonNull
+    private ExamWordsDO getExamWordsDO(Integer studentId, ExamWordsDO examWordsDO) {
         int insert = examWordsDOMapper.insert(examWordsDO);
         if (insert <= 0) {
             throw new RuntimeException("插入考试失败");
         }
 
-        int insertStudentsExam = studentExamWordsDOMapper.insertStudentsExam(studentIds, examWordsDO.getId());
+        int insertStudentsExam = studentExamWordsDOMapper.insertStudentsExam(studentId, examWordsDO.getId());
         if (insertStudentsExam <= 0) {
             throw new RuntimeException("插入学生关联考试失败");
         }
@@ -77,29 +171,65 @@ public class ExamWordsServiceImpl implements ExamWordsService {
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
     public int saveExamWordsPngToDbAndLocal(MultipartFile file) {
-
-        File dir = new File(tmpPng);
-        if (!dir.exists()) {
-            dir.mkdirs();
+        // 1. 基础校验：判空
+        if (file == null || file.isEmpty()) {
+            throw new RuntimeException("上传文件不能为空");
         }
 
-        try {
+        // 2. 安全校验：检查后缀名白名单
         String originalFilename = file.getOriginalFilename();
-            String suffix = "";
-            if (originalFilename != null && originalFilename.contains(".")) {
-                suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
+        String extension = StringUtils.getFilenameExtension(originalFilename); // Spring工具类
+        List<String> allowedExtensions = Arrays.asList("png", "jpg", "jpeg");
+
+        if (extension == null || !allowedExtensions.contains(extension.toLowerCase())) {
+            throw new RuntimeException("不支持的文件格式，仅支持: " + allowedExtensions);
         }
-            String newFileName = UUID.randomUUID() + suffix;
-            String path = tmpPng + newFileName;
 
-            File dest = new File(path);
-            file.transferTo(dest);
+        // 3. 准备目录 (使用 NIO)
+        // 假设 tmpPng 是配置好的基础路径字符串
+        Path directoryPath = Paths.get(tmpPng);
+        try {
+            if (!Files.exists(directoryPath)) {
+                Files.createDirectories(directoryPath);
+            }
+
+            // 4. 生成文件名 (防止文件名冲突)
+            String newFileName = UUID.randomUUID().toString() + "." + extension;
+
+            // 5. 组合最终路径 (自动处理分隔符)
+            Path targetPath = directoryPath.resolve(newFileName);
+
+            // 6. 保存文件
+            file.transferTo(targetPath.toAbsolutePath().toFile());
+            String string = targetPath.toAbsolutePath().toFile().toString();
+            log.info("文件上传成功路径为 {}", string);
+            if (!targetPath.toFile().exists()) {
+                log.error("文件上传失败: {}", newFileName);
+                throw new RuntimeException("文件上传失败");
+            }
+
+            // 7. 入库
+            // 建议：存相对路径或文件名，不要存 targetPath.toString() 的绝对路径
+            // 这里为了演示，假设 insert 依然接受字符串，建议存 newFileName
+            int insert = examWordsJudgeResultDOMapper.insert(targetPath.toString());
+
+            log.info("上传文件成功: {}", newFileName);
+            return insert;
 
-            return examWordsJudgeResultDOMapper.insert(path);
         } catch (IOException e) {
-            throw new RuntimeException("上传失败", e);
+            log.error("文件上传失败: {}", originalFilename, e);
+            throw new RuntimeException("上传失败，请稍后重试", e);
+        }
     }
 
+    @Override
+    public void updateExamWordsWordIdsOrder(ExamWordsDO examWordsDO) {
+        examWordsDOMapper.updateWordIdsOrder(examWordsDO);
+    }
+
+    @Override
+    public ExamWordsDO getExamWordsDOById(Integer id) {
+        return examWordsDOMapper.selectById(id);
     }
 
 

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/judge/ExamWordsJudgeServiceImpl.java

@@ -1,16 +1,15 @@
 package com.yinlihupo.enlish.service.service.judge;
 
-import com.yinlihupo.enlish.service.domain.dataobject.ExamWordsDO;
-import com.yinlihupo.enlish.service.domain.dataobject.ExamWordsJudgeResultDO;
-import com.yinlihupo.enlish.service.domain.dataobject.StudentExamWordsDO;
-import com.yinlihupo.enlish.service.domain.dataobject.WordMasteryLogDO;
-import com.yinlihupo.enlish.service.domain.mapper.ExamWordsDOMapper;
-import com.yinlihupo.enlish.service.domain.mapper.ExamWordsJudgeResultDOMapper;
-import com.yinlihupo.enlish.service.domain.mapper.StudentExamWordsDOMapper;
-import com.yinlihupo.enlish.service.domain.mapper.WordMasteryLogDOMapper;
+import com.yinlihupo.enlish.service.constant.ExamWordsConstant;
+import com.yinlihupo.enlish.service.domain.dataobject.*;
+import com.yinlihupo.enlish.service.domain.mapper.*;
 import com.yinlihupo.enlish.service.model.bo.CoordinatesXY;
 import com.yinlihupo.enlish.service.model.bo.StudentExamId;
+import com.yinlihupo.enlish.service.model.bo.exam.ActionType;
+import com.yinlihupo.enlish.service.model.bo.exam.DiagnosisResult;
+import com.yinlihupo.enlish.service.model.bo.exam.ZoneStats;
 import com.yinlihupo.enlish.service.service.ExamWordsJudgeService;
+import com.yinlihupo.enlish.service.service.StudentLessonPlansService;
 import com.yinlihupo.enlish.service.utils.PngUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -20,8 +19,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -36,22 +35,35 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
     private ExamWordsDOMapper examWordsDOMapper;
     @Resource
     private WordMasteryLogDOMapper wordMasteryLogDOMapper;
+    @Resource
+    private VocabularyBankDOMapper vocabularyBankDOMapper;
+    @Resource
+    private GradeUnitDOMapper gradeUnitDOMapper;
+    @Resource
+    private StudentDOMapper studentDOMapper;
+    @Resource
+    private PlanExamDOMapper planExamDOMapper;
+    @Resource
+    private StudentLessonPlansService studentLessonPlansService;
 
     @Value("${templates.data}")
     private String tessdataPath;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void judgeExamWords(int count) {
         List<ExamWordsJudgeResultDO> examWordsJudgeResultDOS = examWordsJudgeResultDOMapper.selectUnfinishedExamWordsJudgeResultDOList(count);
         for (ExamWordsJudgeResultDO examWordsJudgeResultDO : examWordsJudgeResultDOS) {
-            String ansSheetPath = examWordsJudgeResultDO.getAnsSheetPath();
+            String ansSheetPath = null;
+            try {
+                ansSheetPath = examWordsJudgeResultDO.getAnsSheetPath();
                 List<CoordinatesXY> coordinatesXIES = PngUtil.analysisXY(ansSheetPath);
+
                 // 从图片中获取学生 id 和考试 id
                 StudentExamId studentExamId = PngUtil.analyzeExamWordsIdAndStudentId(ansSheetPath, tessdataPath, coordinatesXIES);
                 Integer examWordsJudgeResultDOId = examWordsJudgeResultDO.getId();
                 if (studentExamId == null) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "未识别学生 id 和考试 id");
+                    log.info("未找到学生 id 和考试 id");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "未识别学生和考试");
                     continue;
                 }
 
@@ -59,18 +71,18 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
                 Integer examWordsId = studentExamId.getExamId();
                 StudentExamWordsDO studentExamWordsDO = studentExamWordsDOMapper.selectByStudentIdAndExamWordsId(studentId, examWordsId);
                 if (studentExamWordsDO == null) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "未找到学生 id 和考试 id 对应的考试记录");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "未找到学生 id 和考试 id 对应的考试记录");
                     continue;
                 }
                 log.info("studentId:{},examWordsId:{}", studentId, examWordsId);
                 if (studentExamWordsDO.getIsCompleted() == 1) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "考试记录此前已识别");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "考试记录此前已识别");
                     continue;
                 }
 
                 ExamWordsDO examWordsDO = examWordsDOMapper.selectById(examWordsId);
                 if (examWordsDO == null) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "未找到考试");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "未找到考试");
                     continue;
                 }
 
@@ -88,13 +100,26 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
                         .wrongWordCount(unmemorizedWordIds.size())
                         .isFinished(1)
                         .build();
+
+                if (examWordsDO.getType().equals(ExamWordsConstant.EXAM_TYPE_BASELINE)) {
+                    // 判断考试等级
+                    judgeExamActualGrade(wordsJudgeResultDO, examWordsDO);
+                } else {
+                    wordsJudgeResultDO.setMsg("此次考试" + examWordsDO.getTitle() + "答对单词数为" + memorizedWordIds.size());
+                }
                 int updated = examWordsJudgeResultDOMapper.updateExamWordsJudgeResultDO(wordsJudgeResultDO);
                 if (updated != 1) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "更新考试记录失败");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "更新考试记录失败");
                     continue;
                 }
                 log.info("更新考试记录成功");
 
+                PlanExamDO planExamDO = planExamDOMapper.selectByExamId(examWordsId);
+                if (planExamDO != null) {
+                    studentLessonPlansService.finishStudentLessonPlan(studentId, planExamDO.getPlanId());
+                    log.info("完成学案成功, planId: {}", planExamDO.getPlanId());
+                }
+
                 List<WordMasteryLogDO> wordMasteryLogDOS = new ArrayList<>(unmemorizedWordIds.stream().map(wordId -> WordMasteryLogDO.builder()
                         .wordId(wordId)
                         .studentId(studentId)
@@ -112,27 +137,219 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
                         .update_time(LocalDateTime.now())
                         .build()
                 ).toList());
-            int batched = wordMasteryLogDOMapper.batchUpdateStudentMastery(wordMasteryLogDOS);
-            if (batched == 0) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "更新学生记忆力记录失败");
-                continue;
-            }
+                wordMasteryLogDOMapper.batchUpdateStudentMastery(wordMasteryLogDOS);
+                log.info("更新单词掌握记录成功");
 
                 int updateStudentExamWordsFinished = studentExamWordsDOMapper.updateStudentExamWordsFinished(studentId, examWordsId);
                 if (updateStudentExamWordsFinished != 1) {
-                examWordsJudgeResultDOMapper.updateErrorMsg(examWordsJudgeResultDOId, "更新学生考试为结束时失败");
+                    examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDOId, "更新学生考试为结束时失败");
                 }
 
                 boolean delete = new File(ansSheetPath).delete();
                 if (delete) {
                     log.info("删除文件成功：{}", ansSheetPath);
+                } else {
+                    log.error("删除文件失败：{}", ansSheetPath);
+                }
+            } catch (Exception e) {
+                log.error("识别考试失败 {}", e.getMessage());
+                if (ansSheetPath != null) {
+                    new File(ansSheetPath).delete();
+                }
+                examWordsJudgeResultDOMapper.updateMsg(examWordsJudgeResultDO.getId(), e.getMessage());
             }
         }
     }
 
+    private void judgeExamActualGrade(ExamWordsJudgeResultDO wordsJudgeResultDO, ExamWordsDO examWordsDO) {
+        List<VocabularyBankDO> vocabularyBankDOS = vocabularyBankDOMapper.selectVocabularyBankDOListByIds(examWordsDO.getWordIds());
+        Map<Integer, List<VocabularyBankDO>> unitId2Words = vocabularyBankDOS.stream().collect(Collectors.groupingBy(VocabularyBankDO::getUnitId));
+
+        List<GradeUnitDO> gradeUnitDOS = gradeUnitDOMapper.selectByUnitIds(unitId2Words.keySet().stream().toList());
+
+        // unitId -> gradeId
+        Map<Integer, Integer> unitId2GradeId = gradeUnitDOS.stream()
+                .collect(Collectors.toMap(
+                        GradeUnitDO::getUnitId,
+                        GradeUnitDO::getGradeId,
+                        (existing, replacement) -> existing // 如果重复，保留第一个（或根据业务决定）
+                ));
+        // gradeId -> List<VocabularyBankDO>
+        Map<Integer, List<VocabularyBankDO>> gradeId2Words = vocabularyBankDOS.stream()
+                .filter(vocab -> vocab.getUnitId() != null)
+                .filter(vocab -> unitId2GradeId.containsKey(vocab.getUnitId()))
+                .collect(Collectors.groupingBy(
+                        vocab -> unitId2GradeId.get(vocab.getUnitId())
+                ));
+
+        // 核心数据结构：GradeId -> List<WordId> (试卷里包含的每个年级的单词有哪些)
+        Map<Integer, Set<Integer>> gradeId2WordIdsMap = new HashMap<>();
+
+        for (VocabularyBankDO vocab : vocabularyBankDOS) {
+            if (vocab.getUnitId() != null && unitId2GradeId.containsKey(vocab.getUnitId())) {
+                Integer gradeId = unitId2GradeId.get(vocab.getUnitId());
+                gradeId2WordIdsMap.computeIfAbsent(gradeId, k -> new HashSet<>()).add(vocab.getId());
+            }
+        }
+
+        // 统计各区域正确率 (Calculate Accuracy per Zone)
+        // 锚点年级 (G_test)，即这张卷子是按哪个年级生成的
+        Integer anchorGrade = examWordsDO.getGradeId();
+        // 挑战区
+        int zoneA = ExamWordsConstant.getZoneA(anchorGrade);
+        ZoneStats zoneAStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneA);
+        // 当前核心
+        int zoneB = ExamWordsConstant.getZoneB(anchorGrade);
+        ZoneStats zoneBStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneB);
+        // 回溯 Level 1
+        int zoneC = ExamWordsConstant.getZoneC(anchorGrade);
+        ZoneStats zoneCStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneC);
+        // 回溯 Level 2
+        int zoneD = ExamWordsConstant.getZoneD(anchorGrade);
+        ZoneStats zoneDStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneD);
+        // 回溯 Level 3
+        int zoneE = ExamWordsConstant.getZoneE(anchorGrade);
+        ZoneStats zoneEStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneE);
+        // 地基兜底
+        int zoneF = ExamWordsConstant.getZoneF(anchorGrade);
+        ZoneStats zoneFStats = calculateZoneStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneF);
+        // 地基区
+        ZoneStats zoneFoundationStats = calculateFoundationStats(gradeId2WordIdsMap, wordsJudgeResultDO, zoneD);
+
+        DiagnosisResult diagnosisResult = diagnoseStudentLevel(anchorGrade, zoneAStats, zoneBStats, zoneCStats, zoneDStats, zoneFoundationStats);
+
+        studentDOMapper.updateStudentActualGradeId(wordsJudgeResultDO.getStudentId(), diagnosisResult.getDeterminedLevel());
+        log.info("判断结果：{}", diagnosisResult);
+        wordsJudgeResultDO.setMsg(diagnosisResult.getMessage());
+    }
+
+    /**
+     * 计算特定年级的统计数据
+     */
+    private ZoneStats calculateZoneStats(Map<Integer, Set<Integer>> map, ExamWordsJudgeResultDO result, Integer targetGrade) {
+        Set<Integer> totalWords = map.getOrDefault(targetGrade, Collections.emptySet());
+        if (totalWords.isEmpty()) return new ZoneStats(targetGrade, 0, 0, 0.0);
+
+        long correctCount = result.getCorrectWordIds().stream().filter(totalWords::contains).count();
+        double accuracy = (double) correctCount / totalWords.size();
+
+        return new ZoneStats(targetGrade, totalWords.size(), (int)correctCount, accuracy);
+    }
+
+    /**
+     * 计算地基区（所有低于某年级）的统计数据
+     */
+    private ZoneStats calculateFoundationStats(Map<Integer, Set<Integer>> map, ExamWordsJudgeResultDO result, Integer maxGradeThreshold) {
+        Set<Integer> foundationWords = new HashSet<>();
+        map.forEach((grade, words) -> {
+            if (grade <= maxGradeThreshold) {
+                foundationWords.addAll(words);
+            }
+        });
+
+        if (foundationWords.isEmpty()) return new ZoneStats(-1, 0, 0, 0.0);
+
+        long correctCount = result.getCorrectWordIds().stream().filter(foundationWords::contains).count();
+        double accuracy = (double) correctCount / foundationWords.size();
+
+        return new ZoneStats(-1, foundationWords.size(), (int)correctCount, accuracy);
+    }
+
+    /**
+     * 核心诊断逻辑矩阵
+     */
+    private DiagnosisResult diagnoseStudentLevel(Integer anchorGrade, ZoneStats zoneA, ZoneStats zoneB, ZoneStats zoneC, ZoneStats zoneD, ZoneStats zoneFoundation) {
+
+        // --- 场景 1: 熔断机制 (Meltdown) ---
+        // 针对 G8/G9 等高年级，如果地基区（G4/G5及以下）错误率极高
+        // 阈值设为 20% (即 Zone F 正确率 < 20%)
+        if (zoneFoundation.getTotalCount() > 0 && zoneFoundation.getAccuracy() < 0.20 && anchorGrade >= 7) {
+            return new DiagnosisResult(
+                    4, // 强制下沉到 G4 (根据文档逻辑，熔断通常锚定 G4)
+                    ActionType.TRIGGER_RETEST,
+                    "严重预警！检测到您的基础词汇（" + ExamWordsConstant.getGradeName(anchorGrade - 3) + "及以下）存在大面积坍塌。系统已为您启动【基础词汇专项排查】，请勿担心，这是为了更好地起跳。"
+            );
+        }
+
+        // --- 场景 2: 进阶/跳级 (Upgrade) ---
+        // 必须满足：当前年级(B) > 80% 且 挑战年级(A) > 60% (如果有题的话)
+        boolean canUpgrade = zoneB.getAccuracy() >= 0.8 && (zoneA.getTotalCount() == 0 || zoneA.getAccuracy() >= 0.6);
+        if (canUpgrade) {
+            return new DiagnosisResult(
+                    Math.max(anchorGrade + 1, ExamWordsConstant.GRADE_8),
+                    ActionType.UPGRADE,
+                    "恭喜！您对" + ExamWordsConstant.getGradeName(anchorGrade) + " 的掌握非常扎实，且具备挑战" + ExamWordsConstant.getGradeName(Math.max(anchorGrade + 1, ExamWordsConstant.GRADE_8)) + " 的潜力。系统将为您解锁更高阶词库。"
+            );
+        }
+
+        // --- 场景 3: 正常回溯诊断 (Standard Diagnosis) ---
+
+        // 3.1 当前年级崩盘 (Zone B < 60%)
+        if (zoneB.getAccuracy() < 0.6) {
+
+            // 检查上一级 (Zone C)
+            if (zoneC.getAccuracy() >= 0.8) {
+                // "中考空心病" / "基础扎实但新课未动"
+                // 定级：保持在当前年级，但侧重复习
+                return new DiagnosisResult(
+                        anchorGrade,
+                        ActionType.STAY_AND_REVIEW,
+                        "基础尚可(" + ExamWordsConstant.getGradeName(zoneC.getGradeId()) + "掌握较好)，但" + ExamWordsConstant.getGradeName(anchorGrade) + " 新词汇存在较大缺口。建议：重点攻克本年级核心动词。"
+                );
+            } else if (zoneC.getAccuracy() >= 0.6) {
+                // Zone C 勉强及格，Zone B 不及格 -> 降一级
+                return new DiagnosisResult(
+                        Math.max(anchorGrade - 1, ExamWordsConstant.GRADE_1),
+                        ActionType.DOWNGRADE,
+                        "检测到" + ExamWordsConstant.getGradeName(anchorGrade) + " 学习吃力，且" + ExamWordsConstant.getGradeName(zoneC.getGradeId()) + " 存在模糊点。建议降级回溯，巩固 " + ExamWordsConstant.getGradeName(zoneC.getGradeId()) + "。"
+                );
+            } else {
+                // Zone C 也崩了 (< 60%) -> 连降两级或更多
+                // 检查 Zone D
+                if (zoneD.getTotalCount() > 0 && zoneD.getAccuracy() >= 0.6) {
+                    return new DiagnosisResult(
+                            Math.max(anchorGrade - 2, ExamWordsConstant.GRADE_1),
+                            ActionType.DOWNGRADE,
+                            "您的" + ExamWordsConstant.getGradeName(zoneC.getGradeId()) + " 和 " + ExamWordsConstant.getGradeName(anchorGrade) + " 均存在脱节。建议从 " + ExamWordsConstant.getGradeName(zoneD.getGradeId()) + " 开始系统补漏。"
+                    );
+                } else {
+                    // 彻底崩盘，可能需要熔断，或者定级到更低
+                    return new DiagnosisResult(
+                            Math.max(ExamWordsConstant.GRADE_1, anchorGrade - 3),
+                            ActionType.DOWNGRADE,
+                            "基础薄弱，建议暂停当前进度，从低年级核心高频词重新开始。"
+                    );
+                }
+            }
+        }
+
+        // 3.2 正常达标 (Zone B 60% - 80%)
+        return new DiagnosisResult(
+                anchorGrade,
+                ActionType.PASS,
+                "当前年级达标。建议继续保持，并尝试在阅读中增加长难句练习。"
+        );
+    }
+
     @Override
-    public List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize) {
+    public List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize, Integer classId, Integer gradeId, String studentName) {
+
+        List<Integer> studentIds = new ArrayList<>();
+        if (classId != null) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByClassId(classId).stream().map(StudentDO::getId).toList());
+        }
+        if (gradeId != null) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByGradeId(gradeId).stream().map(StudentDO::getId).toList());
+        }
+        if (!studentName.isEmpty()) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByName(studentName).stream().map(StudentDO::getId).toList());
+        }
+
+        if (studentIds.isEmpty()) {
             return examWordsJudgeResultDOMapper.selectByPage((page - 1) * pageSize, pageSize);
+        } else {
+            return examWordsJudgeResultDOMapper.selectByPageAndStudentIds((page - 1) * pageSize, page * pageSize, studentIds);
+        }
     }
 
     @Override
@@ -140,6 +357,11 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
         return examWordsJudgeResultDOMapper.selectCount();
     }
 
+    @Override
+    public Integer getExamUnfinishedCount() {
+        return examWordsJudgeResultDOMapper.selectUnfinishedCount();
+    }
+
     @Override
     public ExamWordsJudgeResultDO getExamWordsJudgeResultDOById(Integer id) {
         return examWordsJudgeResultDOMapper.selectDetailById(id);

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/login/LoginServiceImpl.java

@@ -0,0 +1,121 @@
+package com.yinlihupo.enlish.service.service.login;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
+import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
+import com.aliyun.teautil.models.RuntimeOptions;
+import com.yinlihupo.enlish.service.constant.UserRedisConstants;
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+import com.yinlihupo.enlish.service.domain.mapper.UserDOMapper;
+import com.yinlihupo.enlish.service.service.LoginService;
+import com.yinlihupo.framework.common.util.JsonUtils;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Duration;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+public class LoginServiceImpl implements LoginService {
+
+    @Resource
+    private UserDOMapper userDOMapper;
+    @Resource
+    private PasswordEncoder passwordEncoder;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private Client client;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void login(String phone, String name, String reqPassword, String reqCode, String invitationCode) {
+        UserDO userDO = userDOMapper.selectByPhone(phone);
+        log.info("userDO:{}", userDO);
+
+        String code = JsonUtils.toJsonString(redisTemplate.opsForValue().get(UserRedisConstants.buildUserLoginCode(phone)));
+        if (userDO == null) {
+            if (code == null || !code.equals(reqCode)) {
+                throw new RuntimeException("验证码错误");
+            }
+
+            Object invitationObj = redisTemplate.opsForValue().get(UserRedisConstants.buildUserInvitationCode(invitationCode));
+            if (invitationObj == null) {
+                throw new RuntimeException("邀请码错误");
+            }
+            int invitationLimit = Integer.parseInt(JsonUtils.toJsonString(invitationObj));
+            if (invitationLimit <= 0) {
+                throw new RuntimeException("邀请码已使用完毕");
+            }
+            redisTemplate.opsForValue().set(UserRedisConstants.buildUserInvitationCode(invitationCode), invitationLimit - 1);
+
+            userDO = UserDO.builder()
+                    .phone(phone)
+                    .name(name)
+                    .password(passwordEncoder.encode(reqPassword))
+                    .build();
+            userDOMapper.insert(userDO);
+            StpUtil.login(userDO.getId());
+            return;
+        }
+
+        if (code != null && code.equals(reqCode)) {
+            StpUtil.login(userDO.getId());
+            return;
+        }
+
+        if (reqPassword != null && passwordEncoder.matches(reqPassword, userDO.getPassword())) {
+            StpUtil.login(userDO.getId());
+            return;
+        }
+
+        throw new RuntimeException("登录错误");
+    }
+
+    @Override
+    public void sendVerificationCode(String phone) {
+        String code = RandomUtil.randomNumbers(6);
+        String key = UserRedisConstants.buildUserLoginCode(phone);
+        redisTemplate.opsForValue().set(key, code);
+        redisTemplate.expire(key, 5, TimeUnit.MINUTES);
+        String signName = "短信测试";
+        String templateCode = "SMS_154950909";
+        String templateParam = String.format("{\"code\":\"%s\"}", code);
+        try {
+            sendMessage(phone, signName, templateCode, templateParam);
+        } catch (Exception e) {
+            log.error("==> 短信发送失败, phone: {}, signName: {}, templateCode: {}, templateParam: {}", phone, signName, templateCode, templateParam);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 发送短信
+     */
+    public void sendMessage(String signName, String templateCode, String phone, String templateParam) throws Exception {
+        SendSmsRequest sendSmsRequest = new SendSmsRequest()
+                .setSignName(signName)
+                .setTemplateCode(templateCode)
+                .setPhoneNumbers(phone)
+                .setTemplateParam(templateParam);
+        RuntimeOptions runtime = new RuntimeOptions();
+
+
+        log.info("==> 开始短信发送, phone: {}, signName: {}, templateCode: {}, templateParam: {}", phone, signName, templateCode, templateParam);
+
+        // 发送短信
+        SendSmsResponse response = client.sendSmsWithOptions(sendSmsRequest, runtime);
+
+        log.info("==> 短信发送成功, response: {}", JsonUtils.toJsonString(response));
+
+    }
+}

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

@@ -1,22 +1,26 @@
 package com.yinlihupo.enlish.service.service.plan;
 
+import com.yinlihupo.enlish.service.constant.ExamWordsConstant;
 import com.yinlihupo.enlish.service.constant.LessonPlanConstant;
 import com.yinlihupo.enlish.service.domain.dataobject.*;
 import com.yinlihupo.enlish.service.domain.mapper.*;
+import com.yinlihupo.enlish.service.model.bo.Sentence;
+import com.yinlihupo.enlish.service.model.bo.Word;
 import com.yinlihupo.enlish.service.service.LessonPlansService;
-import com.yinlihupo.enlish.service.utils.DifyArticleClient;
+import com.yinlihupo.enlish.service.utils.DifyClient;
 import com.yinlihupo.enlish.service.utils.StringToPlanMapUtil;
 import com.yinlihupo.framework.common.util.JsonUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @Slf4j
@@ -35,22 +39,34 @@ public class LessonPlansServiceImpl implements LessonPlansService {
     @Resource
     private GradeDOMapper gradeDOMapper;
     @Resource
-    private DifyArticleClient difyArticleClient;
-
-    @Value("${templates.plan.weekday}")
-    private String planWeekday;
-    @Value("${templates.plan.weekend}")
-    private String planWeekend;
-
+    private DifyClient difyClient;
+    @Resource
+    private ExamWordsDOMapper examWordsDOMapper;
+    @Resource
+    private StudentExamWordsDOMapper studentExamWordsDOMapper;
+    @Resource
+    private StudentDOMapper studentDOMapper;
+    @Resource
+    private PlanExamDOMapper planExamDOMapper;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private ClassDOMapper classDOMapper;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void generateLessonPlans(Integer studentId, Integer unitId) {
+    public void generateLessonPlans(Integer studentId, Integer unitId, Integer wordSize) {
+        String key = LessonPlanConstant.buildGeneratePlanContent(studentId);
+        redisTemplate.opsForValue().set(key, studentId);
+        redisTemplate.expire(key, 7, TimeUnit.MINUTES);
+
+        log.info("开始生成计划");
         List<VocabularyBankDO> vocabularyBankDOS = vocabularyBankDOMapper.selectVocabularyBankDOAllByUnitId(unitId);
         UnitDO unitDO = unitDOMapper.selectByPrimaryKey(unitId);
         GradeUnitDO gradeUnitDO = gradeUnitDOMapper.selectByUnitId(unitId);
         GradeDO gradeDO = gradeDOMapper.selectById(gradeUnitDO.getGradeId());
 
+        List<VocabularyBankDO> totalWords = new ArrayList<>();
+
         // 补差词汇所用词汇的
         List<VocabularyBankDO> vocabularyBankListStudentNotMaster = getVocabListRandom(vocabularyBankDOMapper
                 .selectVocabularyBankListStudentNotMaster(gradeUnitDO.getGradeId(), studentId), 50);
@@ -58,15 +74,25 @@ 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<>();
+        int j = 0;
         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 {
+                syncVocabList = new ArrayList<>(weeksSync.get(Math.min(j++,  weeksSync.size() - 1)));
+            }
             List<VocabularyBankDO> gapVocabList = vocabularyBankListStudentNotMaster.subList(i * countGap, Math.min(i * countGap + countGap, gapSize));
             weeksSync.add(syncVocabList);
             weeksGap.add(gapVocabList);
+
+            totalWords.addAll(syncVocabList);
+            totalWords.addAll(gapVocabList);
+
             List<VocabularyBankDO> reviewVocabList = new ArrayList<>();
             List<VocabularyBankDO> checkList = new ArrayList<>();
             // 艾宾浩斯遗忘曲线
@@ -116,21 +142,29 @@ public class LessonPlansServiceImpl implements LessonPlansService {
                         .build();
                 studentLessonPlansDOMapper.insert(studentLessonPlansDO);
 
+                Integer examId = (Integer) lessonPlanMap.get("examId");
+                PlanExamDO planExamDO = PlanExamDO.builder()
+                        .planId(lessonPlansDO.getId())
+                        .examId(examId)
+                        .build();
+                planExamDOMapper.insert(planExamDO);
+
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                log.info("生成第{}天计划失败，失败原因 {}", i + 1, e.getMessage());
             }
             log.info("生成第{}天计划成功", i + 1);
         }
 
 
         try {
-            int syncWeekender = syncSize / 2;
+            log.info("开始生成周末计划");
+            int syncWeekendSize = totalWords.size() / 2;
             for (int i = 0; i < 2; i++) {
-                List<VocabularyBankDO> checkList = vocabularyBankDOS.subList(i * syncWeekender, Math.min((i + 1) * syncWeekender, syncSize));
+                List<VocabularyBankDO> checkList = totalWords.subList(i * syncWeekendSize, Math.min((i + 1) * syncWeekendSize, syncWeekendSize));
                 Map<String, Object> map = generateWeekendPlans(checkList, i + 6, gradeDO, unitDO, studentId);
 
                 LessonPlansDO lessonPlansDO = LessonPlansDO.builder()
-                        .title(map.get("title").toString())
+                        .title(map.get("examStr").toString() + "复习")
                         .gradeId(gradeDO.getId().toString())
                         .unitId(unitDO.getId())
                         .createdAt(LocalDateTime.now())
@@ -138,6 +172,13 @@ public class LessonPlansServiceImpl implements LessonPlansService {
                         .build();
                 lessonPlansDOMapper.insert(lessonPlansDO);
 
+                Integer examId = (Integer) map.get("examId");
+                PlanExamDO planExamDO = PlanExamDO.builder()
+                        .planId(lessonPlansDO.getId())
+                        .examId(examId)
+                        .build();
+                planExamDOMapper.insert(planExamDO);
+
                 StudentLessonPlansDO studentLessonPlansDO = StudentLessonPlansDO.builder()
                         .studentId(studentId)
                         .planId(lessonPlansDO.getId())
@@ -160,14 +201,43 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         return lessonPlansDOMapper.selectByLessonId(id);
     }
 
+    @Override
+    public List<LessonPlansDO> findLessonPlansByStudentId(Integer studentId) {
+        return lessonPlansDOMapper.selectByStudentId(studentId);
+    }
 
-    private Map<String, Object> generateWeekendPlans(List<VocabularyBankDO> checkList,
+
+    private Map<String, Object> generateWeekendPlans(List<VocabularyBankDO> words,
                                                         int day,
                                                         GradeDO gradeDO, UnitDO unitDO, Integer studentId) throws IOException {
 
         Map<String, Object> data = new HashMap<>();
-        data.put("title", "第" + day + "天" + "复习" + gradeDO.getTitle() + unitDO.getTitle() + studentId);
-        data.put("checkList", checkList);
+        words.forEach(word -> word.setDefinition(word.getDefinition().length() > 5 ? word.getDefinition().substring(0, 5) : word.getDefinition()));
+        List<Integer> wordIds = words.stream().map(VocabularyBankDO::getId).toList();
+        StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+
+        String ExamTitle = gradeDO.getTitle() + unitDO.getTitle() + "教案小测第" + ExamWordsConstant.day2Chinese(day) + "天" + studentDO.getName();
+        ExamWordsDO examWordsDO = ExamWordsDO.builder()
+                .gradeId(gradeDO.getId())
+                .level(1)
+                .wordIds(wordIds)
+                .type(ExamWordsConstant.EXAM_TYPE_TEST)
+                .title(ExamTitle)
+                .createdAt(LocalDateTime.now())
+                .build();
+        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", gradeDO.getTitle() + " " + classDO.getTitle() + " " + studentDO.getName());
+        data.put("examStr", ExamTitle);
+
+        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)
@@ -186,7 +256,8 @@ 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 + "天" + studentId;
+
+        String title = gradeDO.getTitle() + " " + unitDO.getTitle() + " " + "第" + day + "天";
         Map<String, Object> data = new HashMap<>();
         data.put("title", title);
         data.put("syncVocabList", syncVocabList);
@@ -194,15 +265,17 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         data.put("reviewVocabList", reviewVocabList);
         data.put("checkList", checkList);
         data.put("checkListAns", checkList);
-
         // 中译英
-        List<VocabularyBankDO> drillRound1 = new ArrayList<>(syncVocabList);
+        List<Word> list = syncVocabList.stream().map(vocabularyBankDO -> Word.builder().title(vocabularyBankDO.getWord()).definition(vocabularyBankDO.getDefinition()).build()).toList();
+        list.forEach(word -> word.setTitle("                "));
+
+        List<Word> drillRound1 = new ArrayList<>(list);
         Collections.shuffle(drillRound1);
         data.put("drillRound1", drillRound1);
-        List<VocabularyBankDO> drillRound2 = new ArrayList<>(syncVocabList);
+        List<Word> drillRound2 = new ArrayList<>(list);
         Collections.shuffle(drillRound2);
         data.put("drillRound2", drillRound2);
-        List<VocabularyBankDO> drillRound3 = new ArrayList<>(syncVocabList);
+        List<Word> drillRound3 = new ArrayList<>(list);
         Collections.shuffle(drillRound3);
         data.put("drillRound3", drillRound3);
 
@@ -211,8 +284,10 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         mixedDrill.addAll(syncVocabList);
         mixedDrill.addAll(gapVocabList);
         mixedDrill.addAll(reviewVocabList);
-        Collections.shuffle(mixedDrill);
-        data.put("mixedDrill", mixedDrill);
+        List<Word> mixedList = new ArrayList<>(mixedDrill.stream().map(vocabularyBankDO -> Word.builder().title(vocabularyBankDO.getWord()).definition(vocabularyBankDO.getDefinition()).build()).toList());
+        mixedList.forEach(word -> word.setDefinition("                "));
+        Collections.shuffle(mixedList);
+        data.put("mixedDrill", mixedList);
 
         // 文章 A
         log.info("生成文章 A 中文开始");
@@ -239,6 +314,50 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         data.put("articleBans", mapB.get(LessonPlanConstant.ANSWER_KEY_EXPLANATION));
         data.put("articleBtran", mapB.get(LessonPlanConstant.FULL_TRANSLATION));
 
+        // 连词成句
+        List<Sentence> sentences = difyClient.sendSentenceAnalyze(syncVocabList.subList(0, Math.max(10, syncVocabList.size())), gradeDO.getTitle());
+        data.put("sentences", sentences);
+        data.put("sentencesAns", sentences);
+        log.info( "生成连词成句成功");
+
+
+        // 教案小测
+        List<VocabularyBankDO> words = new ArrayList<>(syncVocabList);
+        words.addAll(gapVocabList);
+        words.addAll(reviewVocabList);
+        if (words.size() < 100) {
+            words.addAll(vocabularyBankDOMapper.selectVocabularyBankListByGradeIdRandom(gradeDO.getId(), 100 - words.size()));
+        } else {
+            words = words.subList(0, 100);
+        }
+        words.forEach(word -> word.setDefinition(word.getDefinition().length() > 5 ? word.getDefinition().substring(0, 5) : word.getDefinition()));
+        List<Integer> wordIds = words.stream().map(VocabularyBankDO::getId).toList();
+        StudentDO studentDO = studentDOMapper.selectStudentById(studentId);
+
+        String ExamTitle = gradeDO.getTitle() + unitDO.getTitle() + "教案小测 第" + ExamWordsConstant.day2Chinese(day) + "天" + studentDO.getName();
+        ExamWordsDO examWordsDO = ExamWordsDO.builder()
+                .gradeId(gradeDO.getId())
+                .level(1)
+                .wordIds(wordIds)
+                .type(ExamWordsConstant.EXAM_TYPE_TEST)
+                .title(ExamTitle)
+                .createdAt(LocalDateTime.now())
+                .build();
+        examWordsDOMapper.insert(examWordsDO);
+        studentExamWordsDOMapper.insertStudentsExam(studentId, examWordsDO.getId());
+
+        data.put("examId", examWordsDO.getId());
+        data.put("studentId", studentId);
+        data.put("studentStr", studentDO.getName());
+        data.put("examStr", ExamTitle);
+
+        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();
 //        Configure config = Configure.builder()
 //                .bind("syncVocabList", policy)
@@ -269,7 +388,7 @@ public class LessonPlansServiceImpl implements LessonPlansService {
         int i = 0;
         do {
             log.info("第{}次生成文章中文开始", ++i);
-            String answer = difyArticleClient.sendChat(string, String.valueOf(studentId) + UUID.randomUUID(), null).getAnswer();
+            String answer = difyClient.sendChat(string, String.valueOf(studentId) + UUID.randomUUID(), null).getAnswer();
             map = StringToPlanMapUtil.parseTextToMap(answer);
         } while (map.get(LessonPlanConstant.TITLE) == null
                 || map.get(LessonPlanConstant.PASSAGE) == null

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/role/RoleServiceImpl.java

@@ -0,0 +1,66 @@
+package com.yinlihupo.enlish.service.service.role;
+
+import com.yinlihupo.enlish.service.constant.RoleConstants;
+import com.yinlihupo.enlish.service.domain.dataobject.RoleDO;
+import com.yinlihupo.enlish.service.domain.dataobject.UserRoleRelDO;
+import com.yinlihupo.enlish.service.domain.mapper.RoleDOMapper;
+import com.yinlihupo.enlish.service.domain.mapper.UserDOMapper;
+import com.yinlihupo.enlish.service.domain.mapper.UserRoleRelDOMapper;
+import com.yinlihupo.enlish.service.service.RoleService;
+import com.yinlihupo.framework.common.util.JsonUtils;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class RoleServiceImpl implements RoleService {
+
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private RoleDOMapper roleDOMapper;
+    @Resource
+    private UserRoleRelDOMapper userRoleRelDOMapper;
+
+
+    @Override
+    public void pushRolePermission2Redis() {
+        List<RoleDO> roleDOS = roleDOMapper.selectAll();
+        List<String> roleKeys = roleDOS.stream().map(RoleDO::getRoleKey).toList();
+        log.info("将角色同步到 redis 中, {}", roleKeys);
+        redisTemplate.opsForValue().set(RoleConstants.ROLE, JsonUtils.toJsonString(roleKeys));
+
+        Map<Long, RoleDO> roleId2RoleDO = roleDOS.stream().collect(Collectors.toMap(RoleDO::getId, roleDO -> roleDO));
+
+        List<UserRoleRelDO> userRoleRelDOS = userRoleRelDOMapper.selectAll();
+        log.info("将用户角色关系同步到 redis 中, {}", userRoleRelDOS);
+        Map<Long, List<UserRoleRelDO>> userId2UserRoleRelDOs = userRoleRelDOS.stream().collect(Collectors.groupingBy(UserRoleRelDO::getUserId));
+
+        userId2UserRoleRelDOs.forEach((userId, userRoleRelDOs) -> {
+            List<Long> roleIds = userRoleRelDOs.stream().map(UserRoleRelDO::getRoleId).toList();
+            List<RoleDO> roleDOs = roleIds.stream().map(roleId2RoleDO::get).toList();
+            List<String> user2RoleKeys = roleDOs.stream().map(RoleDO::getRoleKey).toList();
+            log.info("将用户 {} 的角色同步到 redis 中, {}", userId, roleKeys);
+            // 不要使用 JsonUtils.toJsonString(user2RoleKeys); 会造成二次序列化
+            redisTemplate.opsForValue().set(RoleConstants.buildUserRoleKey(userId), user2RoleKeys);
+        });
+    }
+
+    @Override
+    public Map<Long, RoleDO> findUserId2RoleMap(List<Long> userIds) {
+        List<UserRoleRelDO> userRoleRelDOS = userRoleRelDOMapper.selectByUserIds(userIds);
+        Map<Long, UserRoleRelDO> userId2UserRoleRelDOs = userRoleRelDOS.stream().collect(Collectors.toMap(UserRoleRelDO::getUserId, userRoleRelDO -> userRoleRelDO));
+
+        List<RoleDO> roleDOS = roleDOMapper.selectByIds(userRoleRelDOS.stream().map(UserRoleRelDO::getRoleId).toList());
+        Map<Long, RoleDO> roleId2RoleDO = roleDOS.stream().collect(Collectors.toMap(RoleDO::getId, roleDO -> roleDO));
+
+        return userIds.stream().collect(Collectors.toMap(userId -> userId, userId -> roleId2RoleDO.get(userId2UserRoleRelDOs.get(userId).getRoleId())));
+    }
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java

@@ -1,19 +1,23 @@
 package com.yinlihupo.enlish.service.service.student;
 
 
-import com.yinlihupo.enlish.service.domain.dataobject.ClassDO;
-import com.yinlihupo.enlish.service.domain.dataobject.GradeDO;
-import com.yinlihupo.enlish.service.domain.dataobject.StudentDO;
+import com.yinlihupo.enlish.service.constant.StudentConstant;
+import com.yinlihupo.enlish.service.domain.dataobject.*;
 import com.yinlihupo.enlish.service.domain.mapper.*;
 import com.yinlihupo.enlish.service.model.bo.StudentDetail;
+import com.yinlihupo.enlish.service.model.bo.exam.ExamWordsJudgeResultDetail;
+import com.yinlihupo.enlish.service.model.bo.exam.WordMasteryDetail;
 import com.yinlihupo.enlish.service.model.vo.student.AddStudentReqVO;
 import com.yinlihupo.enlish.service.service.StudentService;
+import com.yinlihupo.enlish.service.utils.DifyClient;
+import com.yinlihupo.framework.common.util.JsonUtils;
 import jakarta.annotation.Resource;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Service
@@ -29,6 +33,14 @@ public class StudentServiceImpl implements StudentService {
     private VocabularyBankDOMapper vocabularyBankMapper;
     @Resource
     private WordMasteryLogDOMapper wordMasteryLogDOMapper;
+    @Resource
+    private ExamWordsJudgeResultDOMapper examWordsJudgeResultDOMapper;
+    @Resource
+    private DifyClient difyClient;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private StudentStageLearningRemarkDOMapper studentStageLearningRemarkDOMapper;
 
     @Override
     public List<StudentDO> getStudentsByClassIdAndGradeId(Integer classId, Integer gradeId, String name, Integer pageNo, Integer pageSize) {
@@ -81,6 +93,7 @@ public class StudentServiceImpl implements StudentService {
                 .name(name)
                 .classId(classId)
                 .gradeId(gradeId)
+                .actualGradeId(gradeId)
                 .startTime(createTime)
                 .build();
         studentDOMapper.insert(studentDO);
@@ -93,4 +106,94 @@ public class StudentServiceImpl implements StudentService {
     public void deleteStudent(Integer studentId) {
         studentDOMapper.deleteById(studentId);
     }
+
+    @Override
+    public String analyzeStudentStudy(Integer studentId) {
+
+        String key = StudentConstant.buildAnalyzeStudentStudyKey(studentId);
+        if (redisTemplate.hasKey(key)) {
+            Object ans = redisTemplate.opsForValue().get(key);
+            return JsonUtils.toJsonString(ans);
+        }
+
+        List<ExamWordsJudgeResultDO> examWordsJudgeResultDOS = examWordsJudgeResultDOMapper.selectByStudentIdAndLimitTime(studentId);
+
+        List<Integer> wordIds = new java.util.ArrayList<>(examWordsJudgeResultDOS.stream().map(ExamWordsJudgeResultDO::getCorrectWordIds).flatMap(List::stream).toList());
+        wordIds.addAll(examWordsJudgeResultDOS.stream().map(ExamWordsJudgeResultDO::getWrongWordIds).flatMap(List::stream).toList());
+        List<VocabularyBankDO> vocabularyBankDOS = new ArrayList<>();
+        if (!wordIds.isEmpty()) {
+            vocabularyBankDOS = vocabularyBankMapper.selectVocabularyBankDOListByIds(wordIds);
+        }
+        Map<Integer, VocabularyBankDO> id2Word = vocabularyBankDOS.stream().collect(Collectors.toMap(VocabularyBankDO::getId, vocabularyBankDO -> vocabularyBankDO));
+
+        List<ExamWordsJudgeResultDetail> examWordsJudgeResultDetails = new ArrayList<>();
+        for (ExamWordsJudgeResultDO examWordsJudgeResultDO : examWordsJudgeResultDOS) {
+            List<Integer> correctWordIds = examWordsJudgeResultDO.getCorrectWordIds();
+            List<String> correctWords = correctWordIds.stream().map(id2Word::get).map(VocabularyBankDO::getWord).toList();
+            List<Integer> wrongWordIds = examWordsJudgeResultDO.getWrongWordIds();
+            List<String> wrongWords = wrongWordIds.stream().map(id2Word::get).map(VocabularyBankDO::getWord).toList();
+
+            examWordsJudgeResultDetails.add(ExamWordsJudgeResultDetail.builder()
+                    .correctWordCount(examWordsJudgeResultDO.getCorrectWordCount())
+                    .wrongWordCount(examWordsJudgeResultDO.getWrongWordCount())
+                    .startDate(examWordsJudgeResultDO.getStartDate())
+                    .correctWords(correctWords)
+                    .wrongWords(wrongWords)
+                    .msg(examWordsJudgeResultDO.getMsg()).build()
+            );
+        }
+
+        Map<String, Object> studentStudyInfo = new HashMap<>();
+        studentStudyInfo.put("考试记录", examWordsJudgeResultDetails);
+
+        List<WordMasteryLogDO> wordMasteryLogDOS = wordMasteryLogDOMapper.selectByStudentIdAndLimitTime(studentId);
+        List<VocabularyBankDO> masteredWords = vocabularyBankMapper.selectVocabularyBankDOListByIds(wordMasteryLogDOS.stream().map(WordMasteryLogDO::getWordId).toList());
+        Map<Integer, VocabularyBankDO> id2MasteryWord = masteredWords.stream().collect(Collectors.toMap(VocabularyBankDO::getId, vocabularyBankDO -> vocabularyBankDO));
+        List<WordMasteryDetail> wordMasteryDetails = new ArrayList<>();
+        for (WordMasteryLogDO wordMasteryLogDO : wordMasteryLogDOS) {
+            wordMasteryDetails.add(WordMasteryDetail.builder()
+                    .word(id2MasteryWord.get(wordMasteryLogDO.getWordId()).getWord())
+                    .reviewCount(wordMasteryLogDO.getReviewCount())
+                    .memoryStrength(wordMasteryLogDO.getMemoryStrength())
+                    .update_time(wordMasteryLogDO.getUpdate_time())
+                    .build());
+        }
+        studentStudyInfo.put("单词掌握情况", wordMasteryDetails);
+
+        try {
+            String analyze = difyClient.sendStudentAnalyze(JsonUtils.toJsonString(studentStudyInfo)).getAnswer();
+            // 设置过期时间 3 天
+            redisTemplate.opsForValue().set(key, analyze);
+            redisTemplate.expire(key, 3, TimeUnit.DAYS);
+
+            studentStageLearningRemarkDOMapper.insert(StudentStageLearningRemarkDO.builder()
+                    .studentId(studentId)
+                    .commentContent(analyze)
+                    .createTime(LocalDateTime.now())
+                    .build());
+
+            return analyze;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    @Override
+    public List<WordMasteryDetail> findStudentWordMasteryDetail(Integer studentId) {
+
+        List<WordMasteryLogDO> wordMasteryLogDOS = wordMasteryLogDOMapper.selectAllByStudentId(studentId);
+        List<VocabularyBankDO> masteredWords = vocabularyBankMapper.selectVocabularyBankDOListByIds(wordMasteryLogDOS.stream().map(WordMasteryLogDO::getWordId).toList());
+        Map<Integer, VocabularyBankDO> id2MasteryWord = masteredWords.stream().collect(Collectors.toMap(VocabularyBankDO::getId, vocabularyBankDO -> vocabularyBankDO));
+        List<WordMasteryDetail> wordMasteryDetails = new ArrayList<>();
+        for (WordMasteryLogDO wordMasteryLogDO : wordMasteryLogDOS) {
+            wordMasteryDetails.add(WordMasteryDetail.builder()
+                    .word(id2MasteryWord.get(wordMasteryLogDO.getWordId()).getWord())
+                    .reviewCount(wordMasteryLogDO.getReviewCount())
+                    .memoryStrength(wordMasteryLogDO.getMemoryStrength())
+                    .update_time(wordMasteryLogDO.getUpdate_time())
+                    .build());
+        }
+        return wordMasteryDetails;
+    }
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/user/UserServiceImpl.java

@@ -0,0 +1,69 @@
+package com.yinlihupo.enlish.service.service.user;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.yinlihupo.enlish.service.constant.UserRedisConstants;
+import com.yinlihupo.enlish.service.domain.dataobject.UserDO;
+import com.yinlihupo.enlish.service.domain.mapper.UserDOMapper;
+import com.yinlihupo.enlish.service.service.UserService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class UserServiceImpl implements UserService {
+
+
+    @Resource
+    private UserDOMapper userDOMapper;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private PasswordEncoder passwordEncoder;
+
+    @Override
+    public UserDO findUser() {
+        String loginIdStr =(String) StpUtil.getLoginId();
+        Long loginId = Long.parseLong(loginIdStr);
+        return userDOMapper.selectById(loginId);
+    }
+
+    @Override
+    public List<UserDO> findUsersList(int page, int limit, String name) {
+
+        return userDOMapper.selectUserDOList(name, (page - 1) * limit, limit);
+    }
+
+    @Override
+    public Integer findUserTotal() {
+        return userDOMapper.selectUserTotal();
+    }
+
+    @Override
+    public void createUser(UserDO userDO) {
+        userDOMapper.insert(userDO);
+    }
+
+    @Override
+    public void updateUserInfo(String password, String reqCode, String phone, String name) {
+        long id = Integer.parseInt(String.valueOf(StpUtil.getLoginId()));
+        UserDO userDO = userDOMapper.selectById(id);
+
+        String key = UserRedisConstants.buildUserLoginCode(userDO.getPhone());
+        String code = Objects.requireNonNull(redisTemplate.opsForValue().get(key)).toString();
+        if (code == null || !code.equals(reqCode)) {
+            throw new RuntimeException("验证码错误");
+        }
+
+        if (password != null) {
+            password = passwordEncoder.encode(password);
+        }
+        userDOMapper.updateUserInfo(id, name, password, phone);
+    }
+
+}

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/java/com/yinlihupo/enlish/service/task/AutoJudgeExamWordsTask.java

@@ -1,13 +1,13 @@
-package com.yinlihupo.enlish.service.job;
+package com.yinlihupo.enlish.service.task;
 
 import com.yinlihupo.enlish.service.service.ExamWordsJudgeService;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-
 @Component
+@Slf4j
 public class AutoJudgeExamWordsTask {
 
     @Resource
@@ -15,7 +15,9 @@ public class AutoJudgeExamWordsTask {
 
     @Scheduled(fixedRate = 5000)
     public void autoJudgeExamWords() {
-        System.out.println("【固定频率】开始自动判卷，时间：" + LocalDateTime.now());
+        if (examWordsJudgeService.getExamUnfinishedCount() != 0) {
+            log.info("有试卷待检测，开始检测");
             examWordsJudgeService.judgeExamWords(5);
         }
     }
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/task/UserRoleTask.java

@@ -0,0 +1,23 @@
+package com.yinlihupo.enlish.service.task;
+
+
+import com.yinlihupo.enlish.service.service.RoleService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@Slf4j
+public class UserRoleTask {
+
+    @Resource
+    private RoleService roleService;
+
+    @Scheduled(cron = "0 0 1 * * ?")
+    public void PushRolePermissions2Redis() {
+        log.info("定时任务，将系统权限推送到 redis 中");
+        roleService.pushRolePermission2Redis();
+    }
+}

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

@@ -3,6 +3,9 @@ package com.yinlihupo.enlish.service.utils; // 修改为你的包名
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO;
+import com.yinlihupo.enlish.service.model.bo.Sentence;
+import com.yinlihupo.framework.common.util.JsonUtils;
 import lombok.Data;
 import lombok.ToString;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,20 +17,25 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
-public class DifyArticleClient {
+public class DifyClient {
 
     @Value("${ai.key}")
     private String apiKey;
+    @Value("${ai.analyzeKey}")
+    private String analyzeKey;
+    @Value("${ai.sentenceKey}")
+    private String sentenceKey;
     @Value("${ai.url}")
     private String baseUrl;
     private final HttpClient httpClient;
     private final ObjectMapper objectMapper;
 
     // 构造函数
-    public DifyArticleClient() {
+    public DifyClient() {
 
         this.httpClient = HttpClient.newBuilder()
                 .connectTimeout(Duration.ofSeconds(10)) // 连接超时
@@ -35,6 +43,82 @@ public class DifyArticleClient {
         this.objectMapper = new ObjectMapper();
     }
 
+    public List<Sentence> sendSentenceAnalyze(List<VocabularyBankDO> list, String grade) throws Exception {
+        // 1. 构建请求体对象
+        ChatRequest payload = new ChatRequest();
+        payload.setQuery(JsonUtils.toJsonString(list.stream().map(VocabularyBankDO::getWord).toList()));
+        payload.setUser("admin");
+
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("grade", grade);
+        payload.setResponseMode("blocking"); // 使用阻塞模式，一次性返回
+        payload.setInputs(objectObjectHashMap);
+
+        // 2. 序列化为 JSON 字符串
+        String jsonBody = objectMapper.writeValueAsString(payload);
+
+        // 3. 构建 HTTP 请求
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl))
+                .header("Authorization", "Bearer " + sentenceKey)
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .timeout(Duration.ofSeconds(30)) // 读取超时
+                .build();
+
+        // 4. 发送请求
+        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        // 5. 检查状态码
+        if (response.statusCode() != 200) {
+            throw new RuntimeException("Dify 请求失败: HTTP " + response.statusCode() + " | Body: " + response.body());
+        }
+
+        // 6. 反序列化响应体
+        DifyResponse difyResponse = objectMapper.readValue(response.body(), DifyResponse.class);
+
+        String answer = difyResponse.getAnswer();
+        answer = answer.replace("json", "");
+        answer = answer.replace("```", "");
+
+        return JsonUtils.parseList(answer, Sentence.class);
+
+    }
+
+    public DifyResponse sendStudentAnalyze(String query) throws Exception {
+        String endpoint = this.baseUrl;
+
+        // 1. 构建请求体对象
+        ChatRequest payload = new ChatRequest();
+        payload.setQuery(query);
+        payload.setUser(String.valueOf(1));
+        payload.setResponseMode("blocking"); // 使用阻塞模式，一次性返回
+        payload.setInputs(new HashMap<>());
+
+        // 2. 序列化为 JSON 字符串
+        String jsonBody = objectMapper.writeValueAsString(payload);
+
+        // 3. 构建 HTTP 请求
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(endpoint))
+                .header("Authorization", "Bearer " + analyzeKey)
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
+                .timeout(Duration.ofSeconds(30)) // 读取超时
+                .build();
+
+        // 4. 发送请求
+        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        // 5. 检查状态码
+        if (response.statusCode() != 200) {
+            throw new RuntimeException("Dify 请求失败: HTTP " + response.statusCode() + " | Body: " + response.body());
+        }
+
+        // 6. 反序列化响应体
+        return objectMapper.readValue(response.body(), DifyResponse.class);
+    }
+
     /**
      * 发送对话请求 (阻塞模式)
      *
@@ -64,7 +148,7 @@ public class DifyArticleClient {
         // 3. 构建 HTTP 请求
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(endpoint))
-                .header("Authorization", "Bearer " + this.apiKey)
+                .header("Authorization", "Bearer " + apiKey)
                 .header("Content-Type", "application/json")
                 .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
                 .timeout(Duration.ofSeconds(30)) // 读取超时

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

@@ -3,7 +3,6 @@ package com.yinlihupo.enlish.service.utils;
 import com.yinlihupo.enlish.service.constant.ExamWordsConstant;
 import com.yinlihupo.enlish.service.model.bo.CoordinatesXY;
 import com.yinlihupo.enlish.service.model.bo.StudentExamId;
-import com.yinlihupo.enlish.service.model.bo.Word;
 import lombok.extern.slf4j.Slf4j;
 import net.sourceforge.tess4j.ITesseract;
 import net.sourceforge.tess4j.Tesseract;
@@ -13,10 +12,10 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.opencv.core.*;
 import org.opencv.imgcodecs.Imgcodecs;
 import org.opencv.imgproc.Imgproc;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -33,29 +32,11 @@ public class PngUtil {
     // 获取起始坐标
     public static List<CoordinatesXY> analysisXY(String imagePath) {
 
+        Mat binary = image2BinaryMath(imagePath);
         Mat src = Imgcodecs.imread(imagePath);
-
-        if (src.empty()) {
-            System.out.println("无法读取图片，请检查路径。");
-            return null;
-        }
-
-        // 3. 预处理
-        // 3.1 转换为灰度图
-        Mat gray = new Mat();
-        Imgproc.cvtColor(src, gray, Imgproc.COLOR_BGR2GRAY);
-
-        // 3.2 二值化处理 (Thresholding)
-        // 使用 THRESH_BINARY_INV (反转二值化)，因为我们需要找的是白色背景上的黑色块。
-        // 反转后，黑色块变成白色(255)，背景变成黑色(0)，方便 findContours 查找。
-        Mat binary = new Mat();
-        // 阈值设为 50 左右即可，因为块是纯黑的
-        Imgproc.threshold(gray, binary, 50, 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);
 
         System.out.println("检测到的轮廓总数: " + contours.size());
@@ -91,67 +72,44 @@ 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.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);
+                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);
             }
         }
+        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.forEach(coordinatesXY -> coordinatesXY.setHeight(coordinatesXY.getHeight() / 51));
+        list.forEach(coordinatesXY -> coordinatesXY.setWidth(coordinatesXY.getWidth() / 3));
+        list.forEach(coordinatesXY -> coordinatesXY.setX(coordinatesXY.getX() + coordinatesXY.getWidth() * 2));
 
-        src.release();
-        binary.release();
-        hierarchy.release();
-        binary.release();
+        log.info("起始坐标: {}", list);
 
-        return ans;
+        return list;
     }
 
     // 获取（未背熟）单词的 id
     public static List<Integer> analyzePngForUnmemorizedWordIds(String filePath, List<Integer> wordIds, List<CoordinatesXY> coordinatesXYList) {
 
-        Mat src = Imgcodecs.imread(filePath);
-        if (src.empty()) {
-            log.error("无法读取图片，请检查路径: {}", filePath);
-            throw new RuntimeException("无法读取图片");
-        }
 
-        Mat gray = new Mat();
-        Mat binary = new Mat();
+        Mat binary = image2BinaryMath(filePath);
 
         try {
-            Imgproc.cvtColor(src, gray, Imgproc.COLOR_BGR2GRAY);
-            // 建议：如果光照不均匀，考虑使用 THRESH_OTSU 自动阈值，或者自适应阈值
-            Imgproc.threshold(gray, binary, 150, 255, Imgproc.THRESH_BINARY_INV);
-//            调试时打印
-//            Imgcodecs.imwrite("output_binary.png", binary);
+
             List<Integer> answer = new ArrayList<>();
             int words_index = 0;
 
-            for (int i = 0; i < coordinatesXYList.size(); i++) {
-                CoordinatesXY coordinatesXY = coordinatesXYList.get(i);
-
+            for (CoordinatesXY coordinatesXY : coordinatesXYList) {
                 int width = coordinatesXY.getWidth();
                 int height = coordinatesXY.getHeight();
                 int currentX = coordinatesXY.getX();
-                int currentY = coordinatesXY.getY();
-
-                int count = i == 0 ? ExamWordsConstant.PGN_COL - 1 : ExamWordsConstant.PGN_COL;
+                int currentY = coordinatesXY.getY() + height;
 
                 // 内层循环：遍历这一列的每一行
-                for (int j = 0; j < count; j++) {
+                for (int j = 0; j < 50; j++) {
                     // 安全检查：防止单词列表比格子少导致越界
                     if (words_index >= wordIds.size()) {
                         log.warn("单词列表耗尽，停止检测。格子数多于单词数。");
@@ -170,11 +128,14 @@ public class PngUtil {
                     Rect rect = new Rect(currentX + 1, currentY + 1, width - 2, height - 2);
                     Mat region = binary.submat(rect);
                     int countNonZero = Core.countNonZero(region);
-
-                    if (countNonZero > 800) {
+                    log.info("当前位置为 words_index={}，坐标为 x={} y={} 当前区域非零像素数: {}", words_index, currentX, currentY, countNonZero);
+                    if (countNonZero > 1000) {
                         Integer id = wordIds.get(words_index);
                         answer.add(id);
-                        log.info("检测到标记（未背熟）：ID={}", id);
+                        log.info("检测到标记（未背熟）：ID={}, 当前坐标 x = {} y = {} ", id, currentX + 1, currentY + 1);
+                    }
+                    if (countNonZero == 0) {
+                        break;
                     }
 
                     region.release();
@@ -187,8 +148,6 @@ public class PngUtil {
 
         } finally {
 
-            src.release();
-            gray.release();
             binary.release();
         }
     }
@@ -208,21 +167,21 @@ public class PngUtil {
         Rect roiRect = new Rect(0, 0, left.getX(), left.getY());
         Mat roi = new Mat(src, roiRect);
 
-        // 3. 图像预处理 (提高 OCR 准确率)
-        // 3.1 转为灰度图
-        Mat gray = new Mat();
-        Imgproc.cvtColor(roi, gray, Imgproc.COLOR_BGR2GRAY);
-
-        // 3.2 二值化 (Thresholding)
-        // 使用 OTSU 算法自动寻找最佳阈值，或者手动指定阈值
-        Mat binary = new Mat();
-        Imgproc.threshold(gray, binary, 0, 255, Imgproc.THRESH_BINARY | Imgproc.THRESH_OTSU);
+//        // 3. 图像预处理 (提高 OCR 准确率)
+//        // 3.1 转为灰度图
+//        Mat gray = new Mat();
+//        Imgproc.cvtColor(roi, gray, Imgproc.COLOR_BGR2GRAY);
+//
+//        // 3.2 二值化 (Thresholding)
+//        // 使用 OTSU 算法自动寻找最佳阈值，或者手动指定阈值
+//        Mat binary = new Mat();
+//        Imgproc.threshold(gray, binary, 0, 255, Imgproc.THRESH_BINARY | Imgproc.THRESH_OTSU);
 
         // 可选：保存预处理后的图片查看效果
-//        Imgcodecs.imwrite("debug_roi.jpg", binary);
+        Imgcodecs.imwrite("debug_roi.jpg", src);
 
         // 4. 将 OpenCV Mat 转换为 BufferedImage (供 Tess4J 使用)
-        BufferedImage processedImage = matToBufferedImage(binary);
+        BufferedImage processedImage = matToBufferedImage(src);
 
         // 5. 使用 Tesseract 进行 OCR 识别
         ITesseract instance = new Tesseract();
@@ -247,6 +206,50 @@ public class PngUtil {
         return null;
     }
 
+    private static Mat image2BinaryMath(String imagePath) {
+
+        if (!new File(imagePath).exists()) {
+            log.error("图片不存在，请检查路径: {}", imagePath);
+            throw new RuntimeException("图片不存在");
+        }
+
+        Mat src = Imgcodecs.imread(imagePath);
+
+        if (src.empty()) {
+            log.info("无法读取图片，请检查路径: {}", imagePath);
+            throw new RuntimeException("无法读取图片");
+        }
+
+        Mat gray = new Mat();
+        //转换为灰度图
+        Imgproc.cvtColor(src, gray, Imgproc.COLOR_BGR2GRAY);
+
+        Imgproc.GaussianBlur(gray, gray, new Size(5, 5), 0);
+
+        Mat binary = new Mat();
+        Imgproc.adaptiveThreshold(gray, binary, 255,
+                Imgproc.ADAPTIVE_THRESH_GAUSSIAN_C,
+                Imgproc.THRESH_BINARY_INV, 25, 10);
+
+        Mat kernel = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(3, 3));
+
+        //开运算 (Open)：先腐蚀后膨胀，用于去除背景中的微小噪点
+        Imgproc.morphologyEx(binary, binary, Imgproc.MORPH_OPEN, kernel);
+
+        // 闭运算 (Close)：先膨胀后腐蚀，用于连接断裂的区域并填充块内部的空洞
+        // 如果块比较大且内部反光严重，可以将 Size(3,3) 改为 Size(5,5) 或更大
+        Mat closeKernel = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(7, 7));
+        Imgproc.morphologyEx(binary, binary, Imgproc.MORPH_CLOSE, closeKernel);
+
+        // 保存二值化过程图用于调试 (生产环境可注释)
+        Imgcodecs.imwrite("debug_binary_natural.png", binary);
+
+        src.release();
+        gray.release();
+
+        return binary;
+    }
+
     private static @NonNull StudentExamId getStudentExamId(Pattern pattern, String result) {
         Matcher matcher = pattern.matcher(result);
         StudentExamId studentExamId = new StudentExamId(0, 0);
@@ -278,21 +281,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;
-    }
 }