diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/LessonPlanConstant.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/LessonPlanConstant.java index c0e491e..5addc7f 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/LessonPlanConstant.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/constant/LessonPlanConstant.java @@ -3,8 +3,8 @@ package com.yinlihupo.enlish.service.constant; public interface LessonPlanConstant { String TITLE = "Title"; - String PASSAGE = "The Passage"; + String PASSAGE = "ThePassage"; String QUIZ = "Quiz"; - String ANSWER_KEY_EXPLANATION = "Answer Key & Explanation"; - String FULL_TRANSLATION = "Full Translation"; + String ANSWER_KEY_EXPLANATION = "AnswerKey&Explanation"; + String FULL_TRANSLATION = "FullTranslation"; } diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/ExamWordsController.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/ExamWordsController.java index 7939ae3..90a7b56 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/ExamWordsController.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/ExamWordsController.java @@ -113,6 +113,8 @@ public class ExamWordsController { .builder() .id(examWordsJudgeResultDO.getId()) .studentId(examWordsJudgeResultDO.getStudentId()) + .studentName(studentService.getStudentById(examWordsJudgeResultDO.getStudentId()).getName()) + .examWordsTitle(examWordsService.getExamWordsDOById(examWordsJudgeResultDO.getExamWordsId()).getTitle()) .examWordsId(examWordsJudgeResultDO.getExamWordsId()) .startDate(examWordsJudgeResultDO.getStartDate()) .correctWordCount(examWordsJudgeResultDO.getCorrectWordCount()) diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/StudentController.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/StudentController.java index e43e381..a290f3a 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/StudentController.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/StudentController.java @@ -48,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(); diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/Sentence.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/bo/Sentence.java new file mode 100644 index 0000000..5d6e016 --- /dev/null +++ b/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; +} diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultRspVO.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultRspVO.java index 2852b2b..dd9d13e 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultRspVO.java +++ b/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; diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/StudentItemRspVO.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/StudentItemRspVO.java index c8ab140..2677363 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/StudentItemRspVO.java +++ b/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; } diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/ExamWordsService.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/ExamWordsService.java index c909b2d..947b358 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/ExamWordsService.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/ExamWordsService.java @@ -13,4 +13,6 @@ public interface ExamWordsService { int saveExamWordsPngToDbAndLocal(MultipartFile file); void updateExamWordsWordIdsOrder(ExamWordsDO examWordsDO); + + ExamWordsDO getExamWordsDOById(Integer id); } diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/exam/ExamWordsServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/exam/ExamWordsServiceImpl.java index f108894..db7ed69 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/exam/ExamWordsServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/exam/ExamWordsServiceImpl.java @@ -191,5 +191,10 @@ public class ExamWordsServiceImpl implements ExamWordsService { examWordsDOMapper.updateWordIdsOrder(examWordsDO); } + @Override + public ExamWordsDO getExamWordsDOById(Integer id) { + return examWordsDOMapper.selectById(id); + } + } diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java index 80b02c8..338b236 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java @@ -3,14 +3,14 @@ package com.yinlihupo.enlish.service.service.plan; 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.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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,11 +35,10 @@ public class LessonPlansServiceImpl implements LessonPlansService { @Resource private GradeDOMapper gradeDOMapper; @Resource - private DifyArticleClient difyArticleClient; + private DifyClient difyClient; @Override - @Transactional(rollbackFor = Exception.class) public void generateLessonPlans(Integer studentId, Integer unitId, Integer wordSize) { List vocabularyBankDOS = vocabularyBankDOMapper.selectVocabularyBankDOAllByUnitId(unitId); UnitDO unitDO = unitDOMapper.selectByPrimaryKey(unitId); @@ -57,14 +56,13 @@ public class LessonPlansServiceImpl implements LessonPlansService { int checkTotal = 50; List> weeksSync = new ArrayList<>(); List> weeksGap = new ArrayList<>(); + int j = 0; for (int i = 0; i < 5; i++) { List syncVocabList; if ((i + 1) * wordSize < syncSize) { syncVocabList = vocabularyBankDOS.subList(i * wordSize, (i + 1) * wordSize); - } else if (i == 4) { - syncVocabList = vocabularyBankDOS.subList(i * wordSize, syncSize); } else { - syncVocabList = vocabularyBankDOS.subList((syncSize - i) * wordSize, Math.min((syncSize - i + 1) * wordSize, syncSize)); + syncVocabList = new ArrayList<>(weeksSync.get(Math.min(j++, weeksSync.size() - 1))); } List gapVocabList = vocabularyBankListStudentNotMaster.subList(i * countGap, Math.min(i * countGap + countGap, gapSize)); weeksSync.add(syncVocabList); @@ -119,7 +117,7 @@ public class LessonPlansServiceImpl implements LessonPlansService { studentLessonPlansDOMapper.insert(studentLessonPlansDO); } catch (Exception e) { - throw new RuntimeException(e); + log.info("生成第{}天计划失败，失败原因 {}", i + 1, e.getMessage()); } log.info("生成第{}天计划成功", i + 1); } @@ -241,6 +239,11 @@ public class LessonPlansServiceImpl implements LessonPlansService { data.put("articleBans", mapB.get(LessonPlanConstant.ANSWER_KEY_EXPLANATION)); data.put("articleBtran", mapB.get(LessonPlanConstant.FULL_TRANSLATION)); + // 连词成句 + List sentences = difyClient.sendSentenceAnalyze(syncVocabList.subList(0, Math.max(10, syncVocabList.size())), gradeDO.getTitle()); + data.put("sentences", sentences); + data.put("sentencesAns", sentences); + log.info( "生成连词成句成功"); // LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy(); // Configure config = Configure.builder() // .bind("syncVocabList", policy) @@ -271,7 +274,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 diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java index a6a08ea..823beb0 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/student/StudentServiceImpl.java @@ -9,11 +9,10 @@ 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.DifyArticleClient; +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.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -37,7 +36,7 @@ public class StudentServiceImpl implements StudentService { @Resource private ExamWordsJudgeResultDOMapper examWordsJudgeResultDOMapper; @Resource - private DifyArticleClient difyArticleClient; + private DifyClient difyClient; @Resource private RedisTemplate redisTemplate; @Resource @@ -159,7 +158,7 @@ public class StudentServiceImpl implements StudentService { studentStudyInfo.put("单词掌握情况", wordMasteryDetails); try { - String analyze = difyArticleClient.sendStudentAnalyze(JsonUtils.toJsonString(studentStudyInfo)).getAnswer(); + String analyze = difyClient.sendStudentAnalyze(JsonUtils.toJsonString(studentStudyInfo)).getAnswer(); // 设置过期时间 3 天 redisTemplate.opsForValue().set(key, analyze); redisTemplate.expire(key, 3, TimeUnit.DAYS); diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/DifyArticleClient.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/DifyClient.java similarity index 70% rename from enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/DifyArticleClient.java rename to enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/DifyClient.java index 997444a..e982ff2 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/DifyArticleClient.java +++ b/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,21 +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; - private String anaKey = "app-hrUFcopdcpnflsvpHWRuBfCp"; + @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)) // 连接超时 @@ -36,6 +43,48 @@ public class DifyArticleClient { this.objectMapper = new ObjectMapper(); } + public List sendSentenceAnalyze(List list, String grade) throws Exception { + // 1. 构建请求体对象 + ChatRequest payload = new ChatRequest(); + payload.setQuery(JsonUtils.toJsonString(list.stream().map(VocabularyBankDO::getWord).toList())); + payload.setUser("admin"); + + HashMap 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 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; @@ -52,7 +101,7 @@ public class DifyArticleClient { // 3. 构建 HTTP 请求 HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(endpoint)) - .header("Authorization", "Bearer " + anaKey) + .header("Authorization", "Bearer " + analyzeKey) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(jsonBody)) .timeout(Duration.ofSeconds(30)) // 读取超时 diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/WordExportUtil.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/WordExportUtil.java index 1621afe..169c809 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/WordExportUtil.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/utils/WordExportUtil.java @@ -50,6 +50,8 @@ public class WordExportUtil { .bind("mixedDrill", policyLessonPlanWeekday) .bind("checkList", policyLessonPlanWeekday) .bind("checkListAns", policyLessonPlanWeekday) + .bind("sentences", policyLessonPlanWeekday) + .bind("sentencesAns", policyLessonPlanWeekday) .build(); LoopRowTableRenderPolicy policyLessonPlan = new LoopRowTableRenderPolicy(); diff --git a/enlish-service/src/main/resources/config/application-dev.yml b/enlish-service/src/main/resources/config/application-dev.yml index 17ed3d5..666c7d4 100644 --- a/enlish-service/src/main/resources/config/application-dev.yml +++ b/enlish-service/src/main/resources/config/application-dev.yml @@ -35,7 +35,7 @@ templates: count: 100 data: C:\project\tess plan: - weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v3.docx + weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v4.docx weekend: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\study_plan_review_v1.docx plan_day: 7 tmp: @@ -43,6 +43,8 @@ tmp: ai: key: app-loC6IrJpj4cS54MAYp73QtGl + analyzeKey: app-hrUFcopdcpnflsvpHWRuBfCp + sentenceKey: app-Emk5YQBaD2YruRXuE5sK1vEU url: https://chat.cosonggle.com/v1/chat-messages aliyun: diff --git a/enlish-service/src/main/resources/templates/tem_study_plan_v4.docx b/enlish-service/src/main/resources/templates/tem_study_plan_v4.docx new file mode 100644 index 0000000..8840baf Binary files /dev/null and b/enlish-service/src/main/resources/templates/tem_study_plan_v4.docx differ diff --git a/enlish-service/src/test/java/com/yinlihupo/enlish/service/ai/AITest.java b/enlish-service/src/test/java/com/yinlihupo/enlish/service/ai/AITest.java index b1a46b9..c3b91cd 100644 --- a/enlish-service/src/test/java/com/yinlihupo/enlish/service/ai/AITest.java +++ b/enlish-service/src/test/java/com/yinlihupo/enlish/service/ai/AITest.java @@ -1,47 +1,35 @@ package com.yinlihupo.enlish.service.ai; -import com.yinlihupo.enlish.service.utils.DifyArticleClient; +import com.yinlihupo.enlish.service.domain.dataobject.VocabularyBankDO; +import com.yinlihupo.enlish.service.domain.mapper.VocabularyBankDOMapper; +import com.yinlihupo.enlish.service.model.bo.Sentence; +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 org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import java.io.IOException; +import java.util.List; import java.util.Map; @SpringBootTest public class AITest { @Resource - private DifyArticleClient client; + private DifyClient client; + @Resource + private VocabularyBankDOMapper vocabularyBankDOMapper; @Test public void test1() throws IOException { - try { - // 2. 第一轮对话 (没有 conversation_id) - System.out.println("--- Round 1 ---"); - String userId = "user-1001"; - DifyArticleClient.DifyResponse response1 = client.sendChat("ruler, pencil, eraser, crayon, bag, pen, book, red, green, yellow, blue, face, ear, eye, nose, mouth, duck, pig, cat, bear, dog, elephant, monkey, bird, tiger, panda, bread, juice, egg, milk", userId, null); - //System.out.println("AI 回复: " + response1.getAnswer()); - System.out.println("当前会话ID: " + response1.getConversationId()); + List vocabularyBankDOS = vocabularyBankDOMapper.selectVocabularyBankDOAllByUnitId(269); + List sentences = client.sendSentenceAnalyze(vocabularyBankDOS, "小学4年级"); -// // 3. 第二轮对话 (传入上一轮的 conversation_id 以保持记忆) -// System.out.println("\n--- Round 2 ---"); -// // 注意这里传入了 response1.getConversationId() -// DifyClient.DifyResponse response2 = client.sendChat("我刚才说了我叫什么？", userId, response1.getConversationId()); -// -// System.out.println("AI 回复: " + response2.getAnswer()); - - System.out.println("\n--- Round 2 ---"); - Map stringStringMap = StringToPlanMapUtil.parseTextToMap(response1.getAnswer()); - System.out.println(stringStringMap.get("Title")); - System.out.println(stringStringMap.get("The Passage")); - System.out.println(stringStringMap.get("Quiz")); - System.out.println(stringStringMap.get("Answer Key & Explanation")); - System.out.println(stringStringMap.get("Full Translation")); } catch (Exception e) { e.printStackTrace(); diff --git a/enlish-service/src/test/java/com/yinlihupo/enlish/service/service/exam/ExamWordsJudgeServiceTest.java b/enlish-service/src/test/java/com/yinlihupo/enlish/service/service/exam/ExamWordsJudgeServiceTest.java index 50fdea9..aa135ef 100644 --- a/enlish-service/src/test/java/com/yinlihupo/enlish/service/service/exam/ExamWordsJudgeServiceTest.java +++ b/enlish-service/src/test/java/com/yinlihupo/enlish/service/service/exam/ExamWordsJudgeServiceTest.java @@ -9,7 +9,7 @@ import com.yinlihupo.enlish.service.model.bo.CoordinatesXY; import com.yinlihupo.enlish.service.model.bo.StudentExamId; import com.yinlihupo.enlish.service.service.ExamWordsJudgeService; import com.yinlihupo.enlish.service.service.StudentService; -import com.yinlihupo.enlish.service.utils.DifyArticleClient; +import com.yinlihupo.enlish.service.utils.DifyClient; import com.yinlihupo.enlish.service.utils.PngUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -28,7 +28,7 @@ public class ExamWordsJudgeServiceTest { @Resource private StudentService studentService; @Resource - private DifyArticleClient difyArticleClient; + private DifyClient difyClient; @Resource private ExamWordsDOMapper examWordsDOMapper; @Resource @@ -64,7 +64,7 @@ public class ExamWordsJudgeServiceTest { public void selectExamWordsJudgeResult2() { String s = studentService.analyzeStudentStudy(1); try { - DifyArticleClient.DifyResponse difyResponse = difyArticleClient.sendStudentAnalyze(s); + DifyClient.DifyResponse difyResponse = difyClient.sendStudentAnalyze(s); String answer = difyResponse.getAnswer(); log.info("answer:{}", answer); } catch (Exception e) { diff --git a/enlish-vue/src/layouts/components/Header.vue b/enlish-vue/src/layouts/components/Header.vue index 30e4ecd..08342e1 100644 --- a/enlish-vue/src/layouts/components/Header.vue +++ b/enlish-vue/src/layouts/components/Header.vue @@ -59,7 +59,7 @@ aria-current="page">Home
  • - 班级 diff --git a/enlish-vue/src/pages/Login.vue b/enlish-vue/src/pages/Login.vue index 39ac83e..e275006 100644 --- a/enlish-vue/src/pages/Login.vue +++ b/enlish-vue/src/pages/Login.vue @@ -155,7 +155,7 @@ async function userLogin() { if (mode.value === 'login') { try { setToken(data.data) } catch { } ElMessage.success('登录成功') - router.push('/class') + router.push('/') } else { ElMessage.success('注册成功') mode.value = 'login' diff --git a/enlish-vue/src/pages/class.vue b/enlish-vue/src/pages/class.vue index 3876038..59fb2c4 100644 --- a/enlish-vue/src/pages/class.vue +++ b/enlish-vue/src/pages/class.vue @@ -13,7 +13,6 @@
    班级列表
    - @@ -57,10 +56,9 @@ - - - + + - + + +
    diff --git a/enlish-vue/src/router/index.js b/enlish-vue/src/router/index.js index 59a1d5b..48e63e0 100644 --- a/enlish-vue/src/router/index.js +++ b/enlish-vue/src/router/index.js @@ -10,7 +10,7 @@ import Login from '@/pages/Login.vue' // 统一在这里声明所有路由 const routes = [ { - path: '/class', + path: '/', component: Class, meta: { title: '班级'