Explorar o código

feat: 对接数据接口,并且按照课程分类。

mjh %!s(int64=4) %!d(string=hai) anos
pai
achega
5733fb6bf9

+ 5 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -74,19 +74,22 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/course/selection/confirm",
                         "/api/course/selection/cancel",
                         "/api/course/checkName",
-                        "/api/eval/exam/all",
                         "/api/eval/exam/student",
+                        "/api/eval/exam/student/groupByCourse",
                         "/api/eval/exam/teacher",
+                        "/api/eval/exam/teacher/groupByCourse",
                         "/api/eval/exam/recommend",
                         "/api/eval/exam/recommend/groupByCourse",
                         "/api/eval/exam/teacher/course",
                         "/api/eval/exam/student/course",
-                        "/api/coder/exam/student/all",
                         "/api/coder/exam/student",
+                        "/api/coder/exam/student/groupByCourse",
                         "/api/coder/exam/teacher",
+                        "/api/coder/exam/teacher/groupByCourse",
                         "/api/coder/exam/student/course",
                         "/api/coder/exam/teacher/course",
                         "/api/coder/exam/recommend",
+                        "/api/coder/exam/recommend/groupByCourse",
                         "/api/announcement",
                         "/api/announcement/getAllByCourseId",
                         "/api/announcement/getUnreadByUserId",

+ 5 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -208,4 +208,9 @@ public class CourseService {
         Course course = courseRepository.findCourseByEvalId(evalId).orElseThrow(CustomErrorException::courseNotFound);
         return course.getState() == ObjectState.DELETED ? null : courseMapper.courseToCourseVO(course).getId();
     }
+
+    public Boolean isCourseNameExisted(String name){
+        Course course = courseRepository.findCourseByName(name).orElse(null);
+        return course != null;
+    }
 }

+ 120 - 9
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/ExamService.java

@@ -7,6 +7,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 @Service
 public class ExamService {
     private final CourseService courseService;
@@ -19,30 +23,137 @@ public class ExamService {
         this.evalService = evalService;
     }
 
-    public JSONObject getCoderRecommendExams() {
+    public JSONArray getCoderRecommendExams() {
+        JSONArray result = new JSONArray();
+        JSONObject groupedExams = this.getCoderRecommendExamsGroupByCourse();
+        for (String key : groupedExams.keySet()) {
+            result.addAll(groupedExams.getJSONArray(key));
+        }
+        return result;
+    }
+
+    public JSONObject getCoderRecommendExamsGroupByCourse() {
         JSONObject result = new JSONObject();
-        result.put("res", new JSONArray());
         for (CourseVO courseVO : courseService.getExampleCourses()) {
+            if (courseVO.getCoderId() != null) {
+                result.put(courseVO.getName(),
+                        coderService.getRecommendExams(1, 1000, "default", courseVO.getCoderId())
+                                .getJSONObject("res").getJSONArray("content"));
+            }
+        }
+        return result;
+    }
 
+    public JSONObject getCoderExamsByStudentGroupByCourse() {
+        JSONArray exams = coderService.getPersonExams(1, 1000).getJSONArray("res");
+        JSONObject result = new JSONObject();
+        for (int i = 0; i < exams.size(); i++) {
+            JSONObject exam = exams.getJSONObject(i);
+            if (result.containsKey(exam.getString("name"))) {
+                result.getJSONArray(exam.getString("name")).add(exam);
+            } else {
+                JSONArray array = new JSONArray();
+                array.add(exam);
+                result.put(exam.getString("name"), array);
+            }
+        }
+        List<String> keys = new ArrayList<>();
+        for (String key : result.keySet()) {
+            if (!courseService.isCourseNameExisted(key)) {
+                keys.add(key);
+            }
+        }
+        for (String key : keys) {
+            result.remove(key);
+        }
+        return result;
+    }
+
+    public JSONObject getCoderExamsByTeacherGroupByCourse() {
+        JSONArray exams = coderService.getPersonExams(1, 1000).getJSONArray("res");
+        JSONObject result = new JSONObject();
+        for (int i = 0; i < exams.size(); i++) {
+            JSONObject exam = exams.getJSONObject(i);
+            if (result.containsKey(exam.getString("course"))) {
+                result.getJSONArray(exam.getString("course")).add(exam);
+            } else {
+                JSONArray array = new JSONArray();
+                array.add(exam);
+                result.put(exam.getString("course"), array);
+            }
+        }
+        List<String> keys = new ArrayList<>();
+        for (String key : result.keySet()) {
+            if (!courseService.isCourseNameExisted(key)) {
+                keys.add(key);
+            }
+        }
+        for (String key : keys) {
+            result.remove(key);
         }
         return result;
     }
 
     public JSONArray getEvalRecommendExams() {
         JSONArray result = new JSONArray();
+        JSONObject groupedExams = this.getEvalRecommendExamsGroupByCourse();
+        for (String key : groupedExams.keySet()) {
+            result.addAll(groupedExams.getJSONArray(key));
+        }
+        return result;
+    }
+
+    public JSONObject getEvalRecommendExamsGroupByCourse() {
+        JSONObject result = new JSONObject();
         for (CourseVO courseVO : courseService.getExampleCourses()) {
-            JSONObject res = evalService.getRecommendExams(courseVO.getEvalId());
-            result.addAll(res.getJSONArray("result"));
+            if (courseVO.getEvalId() != null) {
+                result.put(courseVO.getName(), evalService.getRecommendExams(courseVO.getEvalId()).getJSONArray("result"));
+            }
         }
         return result;
     }
 
-    public JSONArray getEvalRecommendExamsGroupByCourse() {
+    public JSONArray getEvalExamsByStudent(Long userId) {
         JSONArray result = new JSONArray();
-        for (CourseVO courseVO : courseService.getExampleCourses()) {
-            JSONObject res = new JSONObject();
-            res.put(courseVO.getName(), evalService.getRecommendExams(courseVO.getEvalId()).getJSONArray("result"));
-            result.add(res);
+        JSONObject groupedExams = this.getEvalExamsByStudentGroupByCourse(userId);
+        for (String key : groupedExams.keySet()) {
+            result.addAll(groupedExams.getJSONArray(key));
+        }
+        return result;
+    }
+
+    public JSONObject getEvalExamsByStudentGroupByCourse(Long userId) {
+        JSONObject result = new JSONObject();
+        List<CourseVO> studentCourses = courseService.getStudentCourses(userId);
+        for (CourseVO courseVO : studentCourses) {
+            if (courseVO.getEvalId() != null) {
+                result.put(courseVO.getName(), evalService.getStudentExamsByCourseId(courseVO.getEvalId()).getJSONArray("result"));
+            }
+        }
+        return result;
+    }
+
+    public JSONObject getEvalExamsByTeacherGroupByCourse() {
+        JSONArray exams = evalService.getTeacherExams(1000, 1, 0).getJSONObject("result").getJSONArray("examVOList");
+        JSONObject result = new JSONObject();
+        for (int i = 0; i < exams.size(); i++) {
+            JSONObject exam = exams.getJSONObject(i);
+            if (result.containsKey(exam.getJSONObject("course").getString("name"))) {
+                result.getJSONArray(exam.getJSONObject("course").getString("name")).add(exam);
+            } else {
+                JSONArray array = new JSONArray();
+                array.add(exam);
+                result.put(exam.getJSONObject("course").getString("name"), array);
+            }
+        }
+        List<String> keys = new ArrayList<>();
+        for (String key : result.keySet()) {
+            if (!courseService.isCourseNameExisted(key)) {
+                keys.add(key);
+            }
+        }
+        for (String key : keys) {
+            result.remove(key);
         }
         return result;
     }

+ 3 - 16
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/CoderService.java

@@ -45,19 +45,6 @@ public class CoderService implements SubsystemService {
 
     }
 
-    public void getCoursesByTeacher() {
-        String uri = "https://coder-server.seec.seecoder.cn/api/course";
-        String token = httpService.getToken();
-        List<NameValuePair> param = new ArrayList<>();
-        String result = null;
-        try {
-            result = httpService.sendGet(uri, param, token);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println(result);
-    }
-
     public JSONObject getPersonExams(int page, int limit) {
         String uri = "https://coder-server.seec.seecoder.cn/api/exam";
         String token = httpService.getToken();
@@ -73,8 +60,8 @@ public class CoderService implements SubsystemService {
         return JSON.parseObject(result);
     }
 
-    public JSONObject getExampleExams(int page, int limit, String status) {
-        String uri = "https://coder-server.seec.seecoder.cn/api/unauthorizedExam";
+    public JSONObject getRecommendExams(int page, int limit, String status, int courseId) {
+        String uri = "https://coder-server.seec.seecoder.cn/api/unauthorizedCourseExams/" + courseId;
         List<NameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("page", String.valueOf(page)));
         params.add(new BasicNameValuePair("limit", String.valueOf(limit)));
@@ -95,7 +82,7 @@ public class CoderService implements SubsystemService {
         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)));
+        params.add(new BasicNameValuePair("limit", String.valueOf(1000)));
         JSONArray result = new JSONArray();
         try {
             JSONArray exams = JSONObject.parseObject(httpService.sendGet(uri, params, token)).getJSONArray("res");

+ 0 - 43
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/EvalService.java

@@ -1,7 +1,6 @@
 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;
@@ -45,37 +44,6 @@ public class EvalService implements SubsystemService {
 
     }
 
-    public JSONObject getAllExams(int pageSize, int pageNum) {
-        String uri = "https://eval-server.seec.seecoder.cn/api/exam/list";
-        String token = httpService.getToken();
-        List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("pageSize", String.valueOf(pageSize)));
-        params.add(new BasicNameValuePair("pageNum", String.valueOf(pageNum)));
-        String result = null;
-        try {
-            result = httpService.sendGet(uri, params, token);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return JSONObject.parseObject(result);
-    }
-
-    public JSONObject getStudentExams(int pageSize, int pageNum, int state){
-        String uri = "https://eval-server.seec.seecoder.cn/api/exam/student/exams";
-        String token = httpService.getToken();
-        List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("pageSize", String.valueOf(pageSize)));
-        params.add(new BasicNameValuePair("pageNum", String.valueOf(pageNum)));
-        params.add(new BasicNameValuePair("state", String.valueOf(state)));
-        String result = null;
-        try {
-            result = httpService.sendGet(uri, params, token);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return JSONObject.parseObject(result);
-    }
-
     public JSONObject getTeacherExams(int pageSize, int pageNum, int state){
         String uri = "https://eval-server.seec.seecoder.cn/api/exam/teacher/exams";
         String token = httpService.getToken();
@@ -92,17 +60,6 @@ public class EvalService implements SubsystemService {
         return JSONObject.parseObject(result);
     }
 
-    public JSONObject getExampleExams(){
-        String uri = "https://eval-server.seec.seecoder.cn/api/exam/recommend";
-        String result = null;
-        try {
-            result = httpService.sendGet(uri, new ArrayList<>(), null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return JSONObject.parseObject(result);
-    }
-
     public JSONObject getTeacherExamsByCourseId(Integer courseId){
         String uri = "https://eval-server.seec.seecoder.cn/api/exam/teacher/course/" + courseId;
         String token = httpService.getToken();

+ 4 - 11
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CoderController.java

@@ -18,30 +18,23 @@ public class CoderController {
 
     @GetMapping("/exam/student")
     public OkResponse<JSONObject> getStudentExams(@RequestParam(defaultValue = "1") int page,
-                                                  @RequestParam(defaultValue = "100") int limit) {
+                                                  @RequestParam(defaultValue = "1000") int limit) {
         return OkResponse.of(coderService.getPersonExams(page, limit));
     }
 
     @GetMapping("/exam/teacher")
     public OkResponse<JSONObject> getTeacherExams(@RequestParam(defaultValue = "1") int page,
-                                                  @RequestParam(defaultValue = "100") int limit) {
+                                                  @RequestParam(defaultValue = "1000") int limit) {
         return OkResponse.of(coderService.getPersonExams(page, limit));
     }
 
-    @GetMapping("/exam/recommend")
-    public OkResponse<JSONObject> getExampleExams(@RequestParam(defaultValue = "1") int page,
-                                                  @RequestParam(defaultValue = "100") int limit,
-                                                  @RequestParam(defaultValue = "default") String status) {
-        return OkResponse.of(coderService.getExampleExams(page, limit, status));
-    }
-
     @GetMapping("/exam/teacher/course")
-    public OkResponse<JSONArray> getTeacherExamsByCourseId(@RequestParam int courseId){
+    public OkResponse<JSONArray> getTeacherExamsByCourseId(@RequestParam int courseId) {
         return OkResponse.of(coderService.getExamsByCourseId(courseId));
     }
 
     @GetMapping("/exam/student/course")
-    public OkResponse<JSONArray> getStudentExamsByCourseId(@RequestParam int courseId){
+    public OkResponse<JSONArray> getStudentExamsByCourseId(@RequestParam int courseId) {
         return OkResponse.of(coderService.getExamsByCourseId(courseId));
     }
 }

+ 4 - 23
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/EvalController.java

@@ -16,30 +16,11 @@ public class EvalController {
 
     public EvalController(EvalService evalService) {this.evalService = evalService;}
 
-    @GetMapping("/exam/all")
-    public OkResponse<JSONObject> getAllExams(@RequestParam(defaultValue = "100") int pageSize, @RequestParam(defaultValue = "1") int pageNum) {
-        return OkResponse.of((JSONObject) evalService.getAllExams(pageSize, pageNum).get("result"));
-    }
-
-    @GetMapping("/exam/student")
-    public OkResponse<JSONObject> getStudentExams(@RequestParam(defaultValue = "100") int pageSize,
-                                                  @RequestParam(defaultValue = "1") int pageNum,
-                                                  @RequestParam(value = "state") int state
-    ) {
-        return OkResponse.of((JSONObject) evalService.getStudentExams(pageSize, pageNum, state).get("result"));
-    }
-
     @GetMapping("/exam/teacher")
-    public OkResponse<JSONObject> getTeacherExams(@RequestParam(defaultValue = "100") int pageSize,
+    public OkResponse<JSONObject> getTeacherExams(@RequestParam(defaultValue = "1000") int pageSize,
                                                   @RequestParam(defaultValue = "1") int pageNum,
-                                                  @RequestParam(value = "state") int state
-    ){
-        return OkResponse.of(evalService.getTeacherExams(pageSize,pageNum,state).getJSONObject("result"));
-    }
-
-//    @GetMapping("/exam/recommend")
-    public OkResponse<JSONArray> getExampleExams() {
-        return OkResponse.of(evalService.getExampleExams().getJSONArray("result"));
+                                                  @RequestParam(value = "state") int state) {
+        return OkResponse.of(evalService.getTeacherExams(pageSize, pageNum, state).getJSONObject("result"));
     }
 
     @GetMapping("/exam/teacher/course")
@@ -48,7 +29,7 @@ public class EvalController {
     }
 
     @GetMapping("exam/student/course")
-    public OkResponse<JSONArray> getExamsByCourseId(@RequestParam int courseId){
+    public OkResponse<JSONArray> getExamsByCourseId(@RequestParam int courseId) {
         return OkResponse.of(evalService.getStudentExamsByCourseId(courseId).getJSONArray("result"));
     }
 

+ 36 - 5
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ExamController.java

@@ -1,5 +1,6 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.service.ExamService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import com.alibaba.fastjson.JSONArray;
@@ -17,10 +18,25 @@ public class ExamController {
         this.examService = examService;
     }
 
-//    @GetMapping("/coder/exam/recommend")
-//    public OkResponse<JSONObject> getCoderRecommendExams() {
-//        return OkResponse.of(examService.getCoderRecommendExams());
-//    }
+    @GetMapping("/coder/exam/recommend")
+    public OkResponse<JSONArray> getCoderRecommendExams() {
+        return OkResponse.of(examService.getCoderRecommendExams());
+    }
+
+    @GetMapping("/coder/exam/recommend/groupByCourse")
+    public OkResponse<JSONObject> getCoderRecommendExamsGroupByCourse() {
+        return OkResponse.of(examService.getCoderRecommendExamsGroupByCourse());
+    }
+
+    @GetMapping("/coder/exam/student/groupByCourse")
+    public OkResponse<JSONObject> getCoderExamsByStudentGroupByCourse() {
+        return OkResponse.of(examService.getCoderExamsByStudentGroupByCourse());
+    }
+
+    @GetMapping("/coder/exam/teacher/groupByCourse")
+    public OkResponse<JSONObject> getCoderExamsByTeacherGroupByCourse() {
+        return OkResponse.of(examService.getCoderExamsByTeacherGroupByCourse());
+    }
 
     @GetMapping("/eval/exam/recommend")
     public OkResponse<JSONArray> getEvalRecommendExams() {
@@ -28,7 +44,22 @@ public class ExamController {
     }
 
     @GetMapping("/eval/exam/recommend/groupByCourse")
-    public OkResponse<JSONArray> getEvalRecommendExamsGroupByCourse(){
+    public OkResponse<JSONObject> getEvalRecommendExamsGroupByCourse() {
         return OkResponse.of(examService.getEvalRecommendExamsGroupByCourse());
     }
+
+    @GetMapping("/eval/exam/student")
+    public OkResponse<JSONArray> getEvalExamsByStudent() {
+        return OkResponse.of(examService.getEvalExamsByStudent(SecurityUtils.getCurrentUser().getId()));
+    }
+
+    @GetMapping("/eval/exam/student/groupByCourse")
+    public OkResponse<JSONObject> getEvalExamsByStudentGroupByCourse() {
+        return OkResponse.of(examService.getEvalExamsByStudentGroupByCourse(SecurityUtils.getCurrentUser().getId()));
+    }
+
+    @GetMapping("/eval/exam/teacher/groupByCourse")
+    public OkResponse<JSONObject> getEvalExamsByTeacherGroupByCourse() {
+        return OkResponse.of(examService.getEvalExamsByTeacherGroupByCourse());
+    }
 }