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

@@ -0,0 +1,17 @@
+package com.yinlihupo.enlish.service.constant;
+
+public class LessonPlanConstant {
+
+    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,22 +42,28 @@ public class ExamWordsController {
 
     @PostMapping("generate")
     public void generateFeltExamWords(@RequestBody GenerateExamWordsReqVO generateExamWordsReqVO, HttpServletResponse response) {
-        Integer gradeId = generateExamWordsReqVO.getGradeId();
+        Integer type = generateExamWordsReqVO.getType();
-        Integer level = generateExamWordsReqVO.getLevel();
+        Integer studentId = generateExamWordsReqVO.getStudentId();
-        List<Integer> studentIds = generateExamWordsReqVO.getStudentIds();
+        if (studentId == null) {
-        if (studentIds == null || studentIds.isEmpty() || gradeId == null || level == 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();
-
+            // bug: 获取单词后，单词的id会乱序、 需要重新更新考试记录中的 id
-            List<StudentDetail> studentDetailList = studentService.getStudentDetailList(studentIds);
+            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());
@@ -66,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) {
 
@@ -101,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);
@@ -131,11 +148,29 @@ 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();
 
         return Response.success(examWordsDetailResultRspVO);
     }
+
+    @PostMapping("student/history")
+    @ApiOperationLog(description = "获取学生历史考试结果")
+    Response<List<FindStudentExamWordsResultListRspVO>> getStudentExamWordsResultList(@RequestBody FindStudentExamWordsResultReqVO findStudentExamWordsResultReqVO) {
+        Integer studentId = findStudentExamWordsResultReqVO.getStudentId();
+        List<FindStudentExamWordsResultListRspVO> list = examWordsJudgeService.getStudentExamWordsResultList(studentId).stream().map(examWordsJudgeResultDO -> FindStudentExamWordsResultListRspVO.builder()
+                .id(examWordsJudgeResultDO.getId())
+                .studentId(examWordsJudgeResultDO.getStudentId())
+                .examWordsId(examWordsJudgeResultDO.getExamWordsId())
+                .correctWordCount(examWordsJudgeResultDO.getCorrectWordCount())
+                .wrongWordCount(examWordsJudgeResultDO.getWrongWordCount())
+                .startDate(examWordsJudgeResultDO.getStartDate())
+                .accuracy((double)examWordsJudgeResultDO.getCorrectWordCount() / (examWordsJudgeResultDO.getCorrectWordCount() + examWordsJudgeResultDO.getWrongWordCount()))
+                .build()
+        ).toList();
+
+        return Response.success(list);
+    }
 }

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

@@ -0,0 +1,135 @@
+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.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;
+
+@RequestMapping("/plan/")
+@RestController
+@Slf4j
+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;
+    @Value("${templates.plan.weekend}")
+    private String planWeekend;
+
+    @PostMapping("generate")
+    @ApiOperationLog(description = "生成学案")
+    public Response<String> generateLessonPlan(@RequestBody AddLessonPlanReqVO addLessonPlanReqVO) {
+        Integer studentId = addLessonPlanReqVO.getStudentId();
+        Integer unitId = addLessonPlanReqVO.getUnitId();
+        Integer wordSize = addLessonPlanReqVO.getWordSize();
+        try {
+            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());
+            return Response.fail("生成学案失败" + e.getMessage());
+        }
+
+    }
+
+    @PostMapping("download")
+    public void downloadLessonPlan(@RequestBody DownLoadLessonPlanReqVO downLoadLessonPlanReqVO, HttpServletResponse response) {
+        Integer id = downLoadLessonPlanReqVO.getId();
+        LessonPlansDO lessonPlanById = lessonPlanService.findLessonPlanById(id);
+
+        try {
+            Map<String, Object> map = JsonUtils.parseMap(lessonPlanById.getContentDetails(), String.class, Object.class);
+            if (!lessonPlanById.getTitle().contains("复习")) {
+                WordExportUtil.generateLessonPlanDocx(map, lessonPlanById, response, planWeekday, true);
+            } else {
+                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/StudentLessonPlansController.java

@@ -0,0 +1,107 @@
+package com.yinlihupo.enlish.service.controller;
+
+import com.yinlihupo.enlish.service.domain.dataobject.LessonPlansDO;
+import com.yinlihupo.enlish.service.domain.dataobject.StudentLessonPlansDO;
+import com.yinlihupo.enlish.service.model.bo.StudentDetail;
+import com.yinlihupo.enlish.service.model.vo.plan.*;
+import com.yinlihupo.enlish.service.service.LessonPlansService;
+import com.yinlihupo.enlish.service.service.StudentLessonPlansService;
+import com.yinlihupo.enlish.service.service.StudentService;
+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.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.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RequestMapping("/studentLessonPlans/")
+@RestController
+public class StudentLessonPlansController {
+
+    @Resource
+    private StudentLessonPlansService studentLessonPlansService;
+    @Resource
+    private StudentService studentService;
+    @Resource
+    private LessonPlansService lessonPlansService;
+
+    @PostMapping("/list")
+    @ApiOperationLog(description = "查询学生学案")
+    public PageResponse<FindStudentPlansRspVO> findStudentPlans(@RequestBody FindStudentPlansReqVO findStudentPlansReqVO) {
+
+        Integer studentLessonPlanTotal = studentLessonPlansService.findStudentLessonPlanTotal();
+
+        String name = findStudentPlansReqVO.getName();
+        Integer page = findStudentPlansReqVO.getPage();
+        Integer size = findStudentPlansReqVO.getSize();
+
+        List<StudentLessonPlansDO> studentLessonPlansDOListPageSize = studentLessonPlansService.findStudentLessonPlansDOList(page, size, name);
+        Map<Integer, List<StudentLessonPlansDO>> studentId2StudentLessonPlansDOListMap = studentLessonPlansDOListPageSize.stream().collect(
+                Collectors.groupingBy(StudentLessonPlansDO::getStudentId)
+        );
+
+        List<Integer> planIds = studentLessonPlansDOListPageSize.stream().map(StudentLessonPlansDO::getPlanId).toList();
+        List<LessonPlansDO> lessonPlans = lessonPlansService.findLessonPlans(planIds);
+        Map<Integer, LessonPlansDO> id2LessonPlansDO = lessonPlans.stream().collect(Collectors.toMap(
+                LessonPlansDO::getId,
+                lessonPlansDO -> lessonPlansDO
+        ));
+
+        List<StudentDetail> studentDetailList = studentService.getStudentDetailList(new ArrayList<>(studentId2StudentLessonPlansDOListMap.keySet()));
+
+        List<FindStudentPlansRspVO> findStudentPlansRspVOList = studentDetailList.stream().map(studentDetail -> {
+            List<StudentLessonPlansDO> studentLessonPlansDOList = studentId2StudentLessonPlansDOListMap.get(studentDetail.getId());
+            return FindStudentPlansRspVO.builder()
+                    .name(studentDetail.getName())
+                    .id(studentDetail.getId())
+                    .classId(studentDetail.getClassId())
+                    .gradeId(studentDetail.getGradeId())
+                    .gradeName(studentDetail.getGradeName())
+                    .className(studentDetail.getClassName())
+                    .plans(studentLessonPlansDOList.stream().map(studentLessonPlansDO ->
+                        LessonPlanItem.builder().title(id2LessonPlansDO.get(studentLessonPlansDO.getPlanId()).getTitle()).id(studentLessonPlansDO.getPlanId()).isFinished(studentLessonPlansDO.getIsFinished()).build()
+                    ).toList())
+                    .build();
+        }).toList();
+
+        return PageResponse.success(findStudentPlansRspVOList, page, studentLessonPlanTotal, size);
+    }
+
+    @PostMapping("finish")
+    @ApiOperationLog(description = "完成学案")
+    public Response<String> finishStudentPlan(@RequestBody FinishStudentPlanReqVO finishStudentPlanReqVO) {
+        Integer studentId = finishStudentPlanReqVO.getStudentId();
+        Integer planId = finishStudentPlanReqVO.getPlanId();
+        int lessonPlan = studentLessonPlansService.finishStudentLessonPlan(studentId, planId);
+
+        if (lessonPlan > 0) {
+            return Response.success("完成学案成功");
+        }
+        return Response.fail("完成学案失败");
+    }
+
+    @PostMapping("history")
+    @ApiOperationLog(description = "查询学案历史")
+    public Response<List<FindStudentPlanHistoryListRspVO>> findStudentPlanHistory(@RequestBody FindStudentPlanHistoryReqVO findStudentPlanHistoryReqVO) {
+        Integer studentId = findStudentPlanHistoryReqVO.getStudentId();
+        List<FindStudentPlanHistoryListRspVO> list = studentLessonPlansService.findStudentLessonPlansByStudentId(studentId)
+                .stream().map(studentLessonPlansDO -> FindStudentPlanHistoryListRspVO.builder()
+                .id(studentLessonPlansDO.getId())
+                .studentId(studentLessonPlansDO.getStudentId())
+                .planId(studentLessonPlansDO.getPlanId())
+                .startTime(studentLessonPlansDO.getStartTime())
+                .masteryRat(studentLessonPlansDO.getMasteryRat())
+                .totalCount(studentLessonPlansDO.getTotalCount())
+                .build()
+        ).toList();
+
+        return Response.success(list);
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.yinlihupo.enlish.service.controller;
+
+import com.yinlihupo.enlish.service.domain.dataobject.UnitDO;
+import com.yinlihupo.enlish.service.model.vo.unit.AddUnitReqVO;
+import com.yinlihupo.enlish.service.model.vo.unit.DeleteUnitReqVO;
+import com.yinlihupo.enlish.service.model.vo.unit.FindUnitListReqVO;
+import com.yinlihupo.enlish.service.model.vo.unit.FindUnitListRspVO;
+import com.yinlihupo.enlish.service.service.UnitService;
+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 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;
+
+import java.util.List;
+
+@RequestMapping("/unit/")
+@RestController
+@Slf4j
+public class UnitController {
+
+    @Resource
+    private UnitService unitService;
+
+    @PostMapping("/list")
+    @ApiOperationLog(description = "查询单元")
+    public PageResponse<FindUnitListRspVO> list(@RequestBody FindUnitListReqVO findUnitListReqVO) {
+        Integer page = findUnitListReqVO.getPage();
+        Integer size = findUnitListReqVO.getSize();
+        Integer unitDOListCount = unitService.findUnitDOListCount();
+
+        List<UnitDO> unitDOList = unitService.findUnitDOList(page, size);
+        List<FindUnitListRspVO> findUnitListRspVOS = unitDOList.stream().map(unitDO -> FindUnitListRspVO.builder()
+                .id(unitDO.getId())
+                .title(unitDO.getTitle())
+                .version(unitDO.getVersion())
+                .createAt(unitDO.getCreateAt())
+                .build()
+        ).toList();
+
+        return PageResponse.success(findUnitListRspVOS, page, unitDOListCount, size);
+    }
+
+    @PostMapping("/add")
+    @ApiOperationLog(description = "添加单元")
+    public Response<Void> add(@RequestBody AddUnitReqVO addUnitReqVO) {
+        try {
+            unitService.add(addUnitReqVO);
+
+            return Response.success();
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Response.fail(e.getMessage());
+        }
+    }
+
+    @PostMapping("/delete")
+    @ApiOperationLog(description = "删除单元")
+    public Response<String> delete(@RequestBody DeleteUnitReqVO deleteUnitReqVO) {
+        try {
+            unitService.delete(deleteUnitReqVO.getId());
+
+            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/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/LessonPlansDO.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.time.LocalDateTime;
+import java.util.Date;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class LessonPlansDO {
+    private Integer id;
+
+    private String title;
+
+    private String gradeId;
+
+    private Integer unitId;
+
+    private LocalDateTime createdAt;
+
+    private String contentDetails;
+
+}

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

@@ -0,0 +1,35 @@
+package com.yinlihupo.enlish.service.domain.dataobject;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class StudentLessonPlansDO {
+    private Integer id;
+
+    private Integer studentId;
+
+    private Integer planId;
+
+    private LocalDateTime startTime;
+
+    private BigDecimal masteryRat;
+
+    private Integer totalCount;
+
+    private Integer isFinished;
+
+    private String memorizedWordsJson;
+
+    private String unmemorizedWordsJson;
+
+}

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/dataobject/VocabularyBankDO.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 @Data
 @Builder
 public class VocabularyBankDO {
+
     private Integer id;
 
     private String word;
@@ -18,6 +19,8 @@ public class VocabularyBankDO {
 
     private String pronunciation;
 
+    private String pos;
+
     private Integer unitId;
 
 }

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,5 +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

@@ -1,5 +1,6 @@
 package com.yinlihupo.enlish.service.domain.mapper;
 
+import com.yinlihupo.enlish.service.domain.dataobject.GradeUnitDO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -7,4 +8,12 @@ import java.util.List;
 public interface GradeUnitDOMapper {
 
     List<Integer> selectUnitIdsByGradeId(@Param("gradeId") Integer gradeId);
+
+    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

@@ -0,0 +1,19 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.LessonPlansDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface LessonPlansDOMapper {
+
+    void insert(LessonPlansDO lessonPlansDO);
+
+    LessonPlansDO selectById(Integer id);
+
+    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

@@ -19,4 +19,14 @@ 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/StudentLessonPlansDOMapper.java

@@ -0,0 +1,19 @@
+package com.yinlihupo.enlish.service.domain.mapper;
+
+import com.yinlihupo.enlish.service.domain.dataobject.StudentLessonPlansDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StudentLessonPlansDOMapper {
+
+    void insert(StudentLessonPlansDO studentLessonPlansDO);
+
+    List<StudentLessonPlansDO> selectStudentLessonPlanList(@Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize, @Param("name") String name);
+
+    Integer selectStudentPlanTotal();
+
+    Integer finfishStudentPlan(@Param("studentId") Integer studentId, @Param("planId") Integer planId, @Param("count") Integer count, @Param("mastery") double mastery);
+
+    List<StudentLessonPlansDO> selectStudentLessonPlanListByStudentId(@Param("studentId") Integer studentId);
+}

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

@@ -1,6 +1,9 @@
 package com.yinlihupo.enlish.service.domain.mapper;
 
 import com.yinlihupo.enlish.service.domain.dataobject.UnitDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface UnitDOMapper {
     int deleteByPrimaryKey(Integer id);
@@ -18,4 +21,10 @@ public interface UnitDOMapper {
     int updateByPrimaryKey(UnitDO record);
 
     UnitDO selectByTitle(String title);
+
+    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

@@ -14,4 +14,18 @@ public interface VocabularyBankDOMapper {
     List<VocabularyBankDO> selectVocabularyBankDOListByIds(@Param("ids") List<Integer> ids);
 
     List<Integer> selectAllIds();
+
+    List<VocabularyBankDO> selectVocabularyBankDOAllByUnitId(@Param("unitId") Integer unitId);
+
+    List<VocabularyBankDO> selectVocabularyBankListStudentNotMaster(@Param("gradeId") Integer gradeId, @Param("studentId") Integer studentId);
+
+    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

@@ -14,4 +14,14 @@ public interface WordMasteryLogDOMapper {
     int batchInsertInitialization(@Param("wordIds") List<Integer> wordIds, @Param("studentId") Integer studentId);
 
     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/FindStudentExamWordsResultListRspVO.java

@@ -0,0 +1,29 @@
+package com.yinlihupo.enlish.service.model.vo.exam;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindStudentExamWordsResultListRspVO {
+
+    private Integer id;
+
+    private Integer studentId;
+
+    private Integer examWordsId;
+
+    private Integer correctWordCount;
+
+    private Integer wrongWordCount;
+
+    private Double accuracy;
+
+    private LocalDateTime startDate;
+}

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

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

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 type;
-    private Integer level;
+    private Integer studentId;
-    private List<Integer> studentIds;
 }

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

@@ -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
+@Builder
+@Data
+public class AddLessonPlanReqVO {
+
+    private Integer studentId;
+    private Integer unitId;
+    private Integer wordSize;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/plan/DownLoadLessonPlanReqVO.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 DownLoadLessonPlanReqVO {
+
+    private Integer id;
+}

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

@@ -0,0 +1,29 @@
+package com.yinlihupo.enlish.service.model.vo.plan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindStudentPlanHistoryListRspVO {
+
+    private Integer id;
+
+    private Integer studentId;
+
+    private Integer planId;
+
+    private LocalDateTime startTime;
+
+    private BigDecimal masteryRat;
+
+    private Integer totalCount;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/plan/FindStudentPlanHistoryReqVO.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 FindStudentPlanHistoryReqVO {
+
+    private Integer studentId;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/plan/FindStudentPlansReqVO.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 FindStudentPlansReqVO {
+
+    String name;
+    Integer page;
+    Integer size;
+}

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

@@ -0,0 +1,24 @@
+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 FindStudentPlansRspVO {
+
+    private Integer id;
+    private String name;
+    private Integer classId;
+    private String className;
+    private Integer gradeId;
+    private String gradeName;
+
+    List<LessonPlanItem> plans;
+}

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

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

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

@@ -0,0 +1,19 @@
+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 LessonPlanItem {
+
+    private Integer id;
+
+    private String title;
+
+    private Integer isFinished;
+}

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/unit/AddUnitReqVO.java

@@ -0,0 +1,16 @@
+package com.yinlihupo.enlish.service.model.vo.unit;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class AddUnitReqVO {
+
+    private String title;
+    private Integer gradeId;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/unit/DeleteUnitReqVO.java

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

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/unit/FindUnitListReqVO.java

@@ -0,0 +1,16 @@
+package com.yinlihupo.enlish.service.model.vo.unit;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindUnitListReqVO {
+
+    private Integer page;
+    private Integer size;
+}

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/unit/FindUnitListRspVO.java

@@ -0,0 +1,35 @@
+package com.yinlihupo.enlish.service.model.vo.unit;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class FindUnitListRspVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 年级/单元
+     */
+    private String title;
+
+    /**
+     * 版本
+     */
+    private String version;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+}

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

@@ -2,15 +2,20 @@ package com.yinlihupo.enlish.service.service;
 
 import com.yinlihupo.enlish.service.domain.dataobject.ExamWordsJudgeResultDO;
 
+import java.util.Arrays;
 import java.util.List;
 
 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);
 }