Merge branch 'dev-api' into dev

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/RealExamController.java

@@ -3,6 +3,8 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.sim.domain.vo.RealExamVo;
 import com.ruoyi.sim.service.impl.RealExamService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,14 +48,14 @@ public class RealExamController extends BaseController {
         return getDataTable(list);
     }
 
-    @GetMapping("/student/exam/listByUserId/{userId}")
+    @GetMapping("/student/exam/listByUserId/")
     @ApiOperation("[学生]查询userId学生考试列表")
-    public TableDataInfo listByUserId(@PathVariable("userId") Long userId) {
+    public TableDataInfo listByUserId() {
         // todo:
         RealExam q = new RealExam();
-        q.setUserId(userId);
+        q.setUserId(SecurityUtils.getUserId());
         startPage();
-        List<RealExam> list = realExamService.selectRealExamList(q);
+        List<RealExamVo> list = realExamService.list(q);
         // todo:
         return getDataTable(list);
     }
@@ -94,7 +96,7 @@ public class RealExamController extends BaseController {
         return realExamService.studentLoopPostRealExam(examId);
     }
 
-//    @GetMapping(value = "/student/{examId}")
+    //    @GetMapping(value = "/student/{examId}")
 //    @ApiOperation("[学生][轮询]获取考试详细信息")
     public AjaxResult getInfoStudent(@PathVariable("examId") Long examId) {
         return success(realExamService.selectRealExamByExamId(examId));

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/vo/RealExamVo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.sim.domain.vo;
+
+import com.ruoyi.sim.domain.RealExam;
+import com.ruoyi.sim.domain.RealExamCollection;
+
+public class RealExamVo {
+
+    private RealExam realExam;
+
+    private RealExamCollection realExamCollection;
+
+    public RealExam getRealExam() {
+        return realExam;
+    }
+
+    public void setRealExam(RealExam realExam) {
+        this.realExam = realExam;
+    }
+
+    public RealExamCollection getRealExamCollection() {
+        return realExamCollection;
+    }
+
+    public void setRealExamCollection(RealExamCollection realExamCollection) {
+        this.realExamCollection = realExamCollection;
+    }
+}

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamService.java

@@ -7,6 +7,7 @@ import java.util.Objects;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.domain.*;
+import com.ruoyi.sim.domain.vo.RealExamVo;
 import com.ruoyi.sim.domain.vo.StudentRealExamIngVo;
 import com.ruoyi.sim.domain.vo.StudentRealExamPostVo;
 import com.ruoyi.sim.domain.vo.StudentRealExamPreVo;
@@ -105,6 +106,19 @@ public class RealExamService {
     @Autowired
     private CommSendService commSendService;
 
+
+    public List<RealExamVo> list(RealExam q) {
+        List<RealExamVo> list = new ArrayList<>();
+        realExamMapper.selectRealExamList(q).forEach(re -> {
+            RealExamVo v = new RealExamVo();
+            RealExamCollection rec = realExamCollectionService.selectRealExamCollectionByExamCollectionId(re.getExamCollectionId());
+            v.setRealExam(re);
+            v.setRealExamCollection(rec);
+            list.add(v);
+        });
+        return list;
+    }
+
     public List<RealExam> listAllByStatus(String state) {
         RealExam q = new RealExam();
         q.setExamStatus(state);