浏览代码

feat: 课程详情页 老师登录时可查看课程下的eval和coder测试

mjh 4 年之前
父节点
当前提交
ed2c3a8c17

+ 3 - 3
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseVO.java

@@ -23,7 +23,7 @@ public class CourseVO {
 
     private String moocUrl;
 
-    private Long evalId;
+    private Integer evalId;
 
     private Integer coderId;
 
@@ -107,11 +107,11 @@ public class CourseVO {
         this.moocUrl = moocUrl;
     }
 
-    public Long getEvalId() {
+    public Integer getEvalId() {
         return evalId;
     }
 
-    public void setEvalId(Long evalId) {
+    public void setEvalId(Integer evalId) {
         this.evalId = evalId;
     }
 

+ 1 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -76,6 +76,7 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/eval/exam/all",
                         "/api/eval/exam/student",
                         "/api/eval/exam/recommend",
+                        "/api/eval/exam/teacher/course",
                         "/api/coder/exam/student",
                         "/api/coder/exam/recommend",
                         "/api/announcement",

+ 4 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Course.java

@@ -1,6 +1,7 @@
 package cn.seecoder.seecoderportalserver.domain;
 
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import io.swagger.models.auth.In;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
@@ -60,7 +61,7 @@ public class Course {
 
     @Column
 //    @NotNull
-    private Long evalId;
+    private Integer evalId;
 
     @Column
 //    @NotNull
@@ -163,11 +164,11 @@ public class Course {
         this.moocUrl = moocUrl;
     }
 
-    public Long getEvalId() {
+    public Integer getEvalId() {
         return evalId;
     }
 
-    public void setEvalId(Long evalId) {
+    public void setEvalId(Integer evalId) {
         this.evalId = evalId;
     }
 

+ 22 - 13
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -3,8 +3,6 @@ package cn.seecoder.seecoderportalserver.service;
 import cn.seecoder.seecoderportalcommon.vo.*;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
-import cn.seecoder.seecoderportalserver.security.DomainUserDetails;
-import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
@@ -12,6 +10,7 @@ import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
 import cn.seecoder.seecoderportalserver.service.Impl.CoderService;
 import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
 import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,17 +45,27 @@ public class CourseService {
             throw new CustomErrorException("当前用户无权创建课程");
         }
 
-//        Integer coderId;
-
-        // todo: 创建Coder课程
-//        JSONObject coderRes = coderService.createService(courseVO);
-//        if ((int) coderRes.get("err") == 0) {
-//            JSONObject coderCourse = (JSONObject) coderRes.get("res");
-//            coderId = (Integer) coderCourse.get("id");
-//            courseVO.setCoderId(coderId);
-//        } else {
-//            throw new CustomErrorException("Coder: " + coderRes.get("msg"));
-//        }
+        Integer coderId;
+        Integer evalId;
+
+        // 创建Coder课程
+        JSONObject coderRes = coderService.createService(courseVO);
+        if ((int) coderRes.get("err") == 0) {
+            JSONObject coderCourse = (JSONObject) coderRes.get("res");
+            coderId = (Integer) coderCourse.get("id");
+            courseVO.setCoderId(coderId);
+        } else {
+            throw new CustomErrorException("Coder: " + coderRes.get("msg"));
+        }
+        // 创建Eval课程
+        JSONObject evalRes = evalService.createService(courseVO);
+        if(evalRes.containsKey("error")){
+           throw new CustomErrorException("Eval: " + evalRes.get("error"));
+        }else {
+            JSONObject evalCourse = (JSONObject) evalRes.get("result");
+            evalId = (Integer)evalCourse.get("id");
+            courseVO.setEvalId(evalId);
+        }
         Course course = courseMapper.courseVOToCourse(courseVO);
         course.setState(ObjectState.NORMAL);
         Course result = courseRepository.save(course);

+ 25 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/CoderService.java

@@ -4,6 +4,7 @@ import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.HttpService;
 import cn.seecoder.seecoderportalserver.service.SubsystemService;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
@@ -40,7 +41,7 @@ public class CoderService implements SubsystemService {
     }
 
     @Override
-    public void deleteService() {
+    public void deleteService(CourseVO courseVO) {
 
     }
 
@@ -57,7 +58,7 @@ public class CoderService implements SubsystemService {
         System.out.println(result);
     }
 
-    public JSONObject getStudentExams(int page, int limit){
+    public JSONObject getStudentExams(int page, int limit) {
         String uri = "https://coder-server.seec.seecoder.cn/api/exam";
         String token = httpService.getToken();
         List<NameValuePair> params = new ArrayList<>();
@@ -72,12 +73,12 @@ public class CoderService implements SubsystemService {
         return JSON.parseObject(result);
     }
 
-    public JSONObject getExampleExams(int page, int limit, String status){
+    public JSONObject getExampleExams(int page, int limit, String status) {
         String uri = "https://coder-server.seec.seecoder.cn/api/unauthorizedExam";
         List<NameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("page", String.valueOf(page)));
         params.add(new BasicNameValuePair("limit", String.valueOf(limit)));
-        if(!status.equals("default")){
+        if (!status.equals("default")) {
             params.add(new BasicNameValuePair("status", status));
         }
         String result = null;
@@ -88,4 +89,24 @@ public class CoderService implements SubsystemService {
         }
         return JSON.parseObject(result);
     }
+
+    public JSONArray getTeacherExamsByCourseId(int courseId) {
+        String uri = "https://coder-server.seec.seecoder.cn/api/exam";
+        String token = httpService.getToken();
+        List<NameValuePair> params = new ArrayList<>();
+        params.add(new BasicNameValuePair("page", String.valueOf(1)));
+        params.add(new BasicNameValuePair("limit", String.valueOf(100)));
+        JSONArray result = new JSONArray();
+        try {
+            JSONArray exams = JSONObject.parseObject(httpService.sendGet(uri, params, token)).getJSONArray("res");
+            for (int i = 0; i < exams.size(); i++) {
+                if ((Integer) exams.getJSONObject(i).get("courseId") == courseId) {
+                    result.add(exams.getJSONObject(i));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
 }

+ 29 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/EvalService.java

@@ -1,8 +1,10 @@
 package cn.seecoder.seecoderportalserver.service.Impl;
 
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
+import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.service.HttpService;
 import cn.seecoder.seecoderportalserver.service.SubsystemService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
@@ -23,11 +25,23 @@ public class EvalService implements SubsystemService {
 
     @Override
     public JSONObject createService(CourseVO courseVO) {
-        return null;
+        String uri = "https://eval-server.seec.seecoder.cn/api/course";
+        String token = httpService.getToken();
+        JSONObject requestBody = new JSONObject();
+        requestBody.put("name", courseVO.getName());
+        requestBody.put("code", courseVO.getInvitationCode());
+        requestBody.put("isPublic", true);
+        String result = null;
+        try {
+            result = httpService.sendPost(uri, requestBody, token);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return JSON.parseObject(result);
     }
 
     @Override
-    public void deleteService() {
+    public void deleteService(CourseVO courseVO) {
 
     }
 
@@ -72,4 +86,17 @@ public class EvalService implements SubsystemService {
         }
         return JSONObject.parseObject(result);
     }
+
+    public JSONObject getExamsByCourseId(Integer courseId){
+        String uri = "https://eval-server.seec.seecoder.cn/api/exam/teacher/course/" + courseId;
+        String token = httpService.getToken();
+        List<NameValuePair> params = new ArrayList<>();
+        String result = null;
+        try {
+            result = httpService.sendGet(uri, params, token);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return JSONObject.parseObject(result);
+    }
 }

+ 1 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/HelperService.java

@@ -15,7 +15,6 @@ public class HelperService implements SubsystemService {
     }
 
     @Override
-    public void deleteService() {
-
+    public void deleteService(CourseVO courseVO) {
     }
 }

+ 2 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/SubsystemService.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import java.io.UnsupportedEncodingException;
 
 public interface SubsystemService {
-    JSONObject createService(CourseVO courseVO) throws Exception;
+    JSONObject createService(CourseVO courseVO);
 
-    void deleteService();
+    void deleteService(CourseVO courseVO);
 }

+ 6 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CoderController.java

@@ -2,6 +2,7 @@ package cn.seecoder.seecoderportalserver.web.rest;
 
 import cn.seecoder.seecoderportalserver.service.Impl.CoderService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,4 +28,9 @@ public class CoderController {
                                                   @RequestParam(defaultValue = "default") String status) {
         return OkResponse.of(coderService.getExampleExams(page, limit, status));
     }
+
+    @GetMapping("/exam/teacher/course")
+    public OkResponse<JSONArray> getExamsByCourseId(@RequestParam int courseId){
+        return OkResponse.of(coderService.getTeacherExamsByCourseId(courseId));
+    }
 }

+ 7 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/EvalController.java

@@ -30,7 +30,12 @@ public class EvalController {
     }
 
     @GetMapping("/exam/recommend")
-    public OkResponse<JSONArray> getExampleExams(){
-        return OkResponse.of((JSONArray) evalService.getExampleExams().get("result"));
+    public OkResponse<JSONArray> getExampleExams() {
+        return OkResponse.of(evalService.getExampleExams().getJSONArray("result"));
+    }
+
+    @GetMapping("/exam/teacher/course")
+    public OkResponse<JSONArray> getExamsByCourseId(@RequestParam Integer courseId) {
+        return OkResponse.of(evalService.getExamsByCourseId(courseId).getJSONArray("result"));
     }
 }