移几个老师接口到前端对接

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontExamController.java

@@ -3,7 +3,6 @@ package com.ruoyi.web.controller.front;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Sets;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.dz.service.IDzControlService;
@@ -11,11 +10,9 @@ import com.ruoyi.enums.ExamineeStatus;
 import com.ruoyi.enums.PaperType;
 import com.ruoyi.ie.domain.AMarjorPlan;
 import com.ruoyi.ie.service.IAMarjorPlanService;
-import com.ruoyi.ie.service.impl.AMarjorPlanServiceImpl;
 import com.ruoyi.learn.domain.LearnExaminee;
 import com.ruoyi.learn.domain.LearnPaper;
 import com.ruoyi.learn.service.ILearnExamineeService;
-import com.ruoyi.learn.service.ILearnPaperQuestionService;
 import com.ruoyi.learn.service.ILearnPaperService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontPaperController.java

@@ -3,18 +3,21 @@ package com.ruoyi.web.controller.front;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.content.VistorContextHolder;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.AjaxResult2;
 import com.ruoyi.dz.domain.DzControl;
+import com.ruoyi.dz.domain.DzSubject;
 import com.ruoyi.dz.service.IDzControlService;
+import com.ruoyi.dz.service.IDzSubjectService;
 import com.ruoyi.enums.PaperType;
 import com.ruoyi.learn.domain.LearnPaper;
 import com.ruoyi.learn.domain.LearnTest;
 import com.ruoyi.learn.service.ILearnPaperQuestionService;
 import com.ruoyi.learn.service.ILearnPaperService;
 import com.ruoyi.learn.service.ILearnTestService;
+import com.ruoyi.web.service.LearnTeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.compress.utils.Lists;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,14 +29,18 @@ import java.util.List;
 @Api(tags = "前台-学习-试卷")
 public class FrontPaperController {
     private final IDzControlService dzControlService;
+    private final IDzSubjectService dzSubjectService;
     private final ILearnTestService testService;
     private final ILearnPaperService paperService;
+    private final LearnTeacherService learnTeacherService;
     private final ILearnPaperQuestionService paperQuestionService;
 
-    public FrontPaperController(IDzControlService dzControlService, ILearnTestService testService, ILearnPaperService paperService, ILearnPaperQuestionService paperQuestionService) {
+    public FrontPaperController(IDzControlService dzControlService, IDzSubjectService dzSubjectService, ILearnTestService testService, ILearnPaperService paperService, LearnTeacherService learnTeacherService, ILearnPaperQuestionService paperQuestionService) {
         this.dzControlService = dzControlService;
+        this.dzSubjectService = dzSubjectService;
         this.testService = testService;
         this.paperService = paperService;
+        this.learnTeacherService = learnTeacherService;
         this.paperQuestionService = paperQuestionService;
     }
 
@@ -48,16 +55,16 @@ public class FrontPaperController {
 
     @ApiOperation("02 考试科目")
     @GetMapping(value = "subject")
-    public List<JSONObject> getSubject() {
-        // TODO 生成下载科目ss
-        return Lists.newArrayList();
+    public AjaxResult2<List<DzSubject>> getSubject() {
+        DzSubject sCond = new DzSubject();
+        List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
+        return AjaxResult2.success(list);
     }
 
     @ApiOperation("03 知识点树")
     @GetMapping(value = "knownledge")
-    public List<JSONObject> getKnownledge(@ApiParam("科目ID") Long subjectId) {
-        // TODO 生成知识点
-        return Lists.newArrayList();
+    public AjaxResult getKnownledge(@ApiParam("科目ID") Long subjectId) {
+        return AjaxResult.success(learnTeacherService.getKnowledgeTree(subjectId, null));
     }
 
     @ApiOperation("04 取试卷")

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontTeacherController.java

@@ -5,6 +5,11 @@ import com.google.common.collect.Lists;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.dz.service.IDzControlService;
+import com.ruoyi.dz.service.IDzSubjectService;
+import com.ruoyi.learn.domain.LearnTest;
+import com.ruoyi.learn.service.ILearnTestService;
+import com.ruoyi.web.service.LearnTeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,18 +24,31 @@ import java.util.List;
 @RequestMapping("/front/teacher")
 @Api(tags = "前台-学习-老师")
 public class FrontTeacherController extends BaseController {
+    private final IDzControlService dzControlService;
+    private final IDzSubjectService dzSubjectService;
+    private final ILearnTestService learnTestService;
+    private final LearnTeacherService learnTeacherService;
+
+    public FrontTeacherController(IDzControlService dzControlService, IDzSubjectService dzSubjectService, ILearnTestService learnTestService, LearnTeacherService learnTeacherService) {
+        this.dzControlService = dzControlService;
+        this.dzSubjectService = dzSubjectService;
+        this.learnTestService = learnTestService;
+        this.learnTeacherService = learnTeacherService;
+    }
+
     @ApiOperation("10 查询班级列表")
     @GetMapping("classes")
     public AjaxResult getClasses()
     {
-        return AjaxResult.success();
+        return AjaxResult.success(learnTeacherService.getClasses(getUserId()));
     }
 
     @ApiOperation("10 查询批次列表")
     @GetMapping("batchs")
     public AjaxResult getBatchs()
     {
-        return AjaxResult.success();
+        List<LearnTest> list = learnTestService.selectLearnTestList(new LearnTest());
+        return AjaxResult.success(list);
     }
 
     @ApiOperation("记录-模拟卷")